Skip to content

Commit

Permalink
WIP: rpm packaging
Browse files Browse the repository at this point in the history
Signed-off-by: Brenden Blanco <[email protected]>
  • Loading branch information
Brenden Blanco committed Jul 3, 2015
1 parent 3c8c6de commit 439a9f3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if(LIB64)
set(LIBSUFFIX 64)
endif()

if(NOT PYTHON_ONLY)
find_package(BISON)
find_package(FLEX)
find_package(LLVM REQUIRED CONFIG)
Expand Down Expand Up @@ -42,6 +43,7 @@ ENDFOREACH()

set(CMAKE_C_FLAGS "-Wall")
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
endif()

add_subdirectory(scripts)
add_subdirectory(src)
Expand Down
6 changes: 5 additions & 1 deletion scripts/bpf_demo.ks.erb
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,19 @@ chmod +x /usr/local/bin/bpf-llvm-setup
cat > /usr/local/bin/bcc-setup <<'DELIM__'
#!/bin/bash
set -e -x

git clone https://github.com/svinota/pyroute2.git
(cd pyroute2; make install)

numcpu=$(grep -c ^processor /proc/cpuinfo)

git clone https://github.com/iovisor/bcc.git
mkdir bcc/build/
cd bcc/build/
git checkout bblanco_dev
export PATH=/opt/local/llvm/bin:$PATH
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
make -j$numcpu
make test
DELIM__
chmod +x /usr/local/bin/bcc-setup

Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR})

if(NOT PYTHON_ONLY)
add_subdirectory(cc)
endif()
add_subdirectory(python)

0 comments on commit 439a9f3

Please sign in to comment.