diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-04-18 08:16:17 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-04-18 08:16:17 +0000 |
| commit | bab1c38c3746cec66755594eb5930844c86b589a (patch) | |
| tree | 5868cc1a70226d158e9ab4c64f349e9b8e9aef84 /sysutils/condor | |
| parent | 17c7d44864a56d0b9868074e90928a6d40da546d (diff) | |
Notes
Diffstat (limited to 'sysutils/condor')
| -rw-r--r-- | sysutils/condor/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile index 882a614b0338..a51db98e161a 100644 --- a/sysutils/condor/Makefile +++ b/sysutils/condor/Makefile @@ -41,6 +41,7 @@ CXXFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}:${LOCALBASE}/lib:/usr/lib:/lib -fPIC CMAKE_ARGS= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \ -DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \ + -DPYTHON_BOOST_LIB:STRING=${PY_BOOST_LIB} \ -DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \ -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so diff --git a/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt b/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt new file mode 100644 index 000000000000..86fff6ae10f6 --- /dev/null +++ b/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt @@ -0,0 +1,16 @@ +--- src/python-bindings/CMakeLists.txt.orig 2017-07-06 19:22:42 UTC ++++ src/python-bindings/CMakeLists.txt +@@ -108,11 +108,13 @@ else() + set ( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/lib64 ) + set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG) + ++ if (NOT PYTHON_BOOST_LIB) + if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3") + set ( PYTHON_BOOST_LIB boost_python3 ) + else() + set ( PYTHON_BOOST_LIB boost_python ) + endif() ++ endif(NOT PYTHON_BOOST_LIB) + + include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE}) + link_directories(${BOOST_LD}) |