svn commit: r467688 - in head/sysutils/condor: . files

[Jan Beich]

Author: jbeich
Date: Wed Apr 18 08:16:17 2018
New Revision: 467688
URL: https://svnweb.freebsd.org/changeset/ports/467688

Log:
  sysutils/condor: unbreak with boost 1.67
  
  [ 98%] Linking CXX shared library libclassad_python_user.so
  /usr/bin/ld: cannot find -lboost_python
  
  PR:		227427
  Reported by:	antoine (via exp-run)

Added:
  head/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt   (contents, props changed)
Modified:
  head/sysutils/condor/Makefile   (contents, props changed)

Modified: head/sysutils/condor/Makefile
==============================================================================
--- head/sysutils/condor/Makefile	Wed Apr 18 08:04:04 2018	(r467687)
+++ head/sysutils/condor/Makefile	Wed Apr 18 08:16:17 2018	(r467688)
@@ -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
 

Added: head/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt	Wed Apr 18 08:16:17 2018	(r467688)
@@ -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})