[135988] trunk/dports/devel/libnifalcon

[ryandesign at macports.org]

Revision: 135988
          https://trac.macports.org/changeset/135988
Author:   ryandesign at macports.org
Date:     2015-05-08 23:40:03 -0700 (Fri, 08 May 2015)
Log Message:
-----------
libnifalcon: fix build with boost >= 1.50 (#47679); use cmake.out_of_source (#47197)

Modified Paths:
--------------
    trunk/dports/devel/libnifalcon/Portfile

Added Paths:
-----------
    trunk/dports/devel/libnifalcon/files/
    trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff
    trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff
    trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff

Modified: trunk/dports/devel/libnifalcon/Portfile
===================================================================
--- trunk/dports/devel/libnifalcon/Portfile	2015-05-08 21:27:13 UTC (rev 135987)
+++ trunk/dports/devel/libnifalcon/Portfile	2015-05-09 06:40:03 UTC (rev 135988)
@@ -21,14 +21,13 @@
                 sha1    7ab7e2781a9224201da0e461e3fa34d21a8430e0 \
                 rmd160  eef75bf1834df6c1a812d0ef19399109e78cdd13
 
-depends_lib port:boost \
-            port:libusb
+# libnifalcon uses the boost static libraries.
+depends_build-append port:boost
 
-post-extract {
-    file mkdir ${worksrcpath}/build
-}
+depends_lib         port:libusb
 
-configure.args-append -G \"Unix Makefiles\" ..
+patchfiles          patch-CMakeLists.txt.diff \
+                    patch-examples-CMakeLists.txt.diff \
+                    patch-src-util-CMakeLists.txt.diff
 
-configure.dir   ${worksrcpath}/build
-build.dir       ${worksrcpath}/build
+cmake.out_of_source yes

Added: trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff	2015-05-09 06:40:03 UTC (rev 135988)
@@ -0,0 +1,13 @@
+https://github.com/qdot/libnifalcon/issues/28
+https://github.com/qdot/libnifalcon/commit/217b724a3316be6b8bc1b82c182f5cff2ff01900
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -70,7 +70,7 @@ IF(NOT Boost_FOUND)
+   MESSAGE(FATAL_ERROR "libnifalcon requires a minimum of the Boost 1.33 headers to build")
+ ENDIF(NOT Boost_FOUND)
+ 
+-FIND_PACKAGE(Boost COMPONENTS program_options thread)
++FIND_PACKAGE(Boost COMPONENTS program_options thread system)
+ 
+ ######################################################################################
+ # Project specific globals

Added: trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff	2015-05-09 06:40:03 UTC (rev 135988)
@@ -0,0 +1,12 @@
+https://github.com/qdot/libnifalcon/issues/28
+https://github.com/qdot/libnifalcon/commit/f54fba57d432fa3231619c711f5f80bf684c5173
+--- examples/CMakeLists.txt.orig
++++ examples/CMakeLists.txt
+@@ -6,6 +6,7 @@ SET(LIBNIFALCON_EXE_PO_LINK_LIBS
+   ${libnifalcon_cli_base_LIBRARY}
+   ${LIBNIFALCON_EXE_LINK_LIBS} 
+   ${Boost_PROGRAM_OPTIONS_LIBRARY}
++  ${Boost_SYSTEM_LIBRARY}
+   )
+ 
+ ######################################################################################

Added: trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff	2015-05-09 06:40:03 UTC (rev 135988)
@@ -0,0 +1,16 @@
+https://github.com/qdot/libnifalcon/pull/29
+https://github.com/qdot/libnifalcon/commit/7e98c9f2bdf936d236260176921c865f8fd1b108
+--- src/util/CMakeLists.txt.orig
++++ src/util/CMakeLists.txt
+@@ -36,6 +36,11 @@
+     ${Boost_THREAD_LIBRARY}
+     )
+ 
++  # Boost thread requires system since 1.5x
++  IF(Boost_SYSTEM_FOUND)
++    LIST(APPEND CPP_LINK_LIBS "${Boost_SYSTEM_LIBRARY}")
++  ENDIF()
++
+   SET(SRCS
+ 	"FalconDeviceBoostThread.cpp" 
+ 	"${LIBNIFALCON_INCLUDE_DIR}/falcon/util/FalconDeviceBoostThread.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150508/302e1542/attachment-0001.html>