Date: Mon, 26 Dec 2016 18:28:46 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429562 - in head/comms/gnuradio: . files Message-ID: <201612261828.uBQISkxC042637@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Mon Dec 26 18:28:45 2016 New Revision: 429562 URL: https://svnweb.freebsd.org/changeset/ports/429562 Log: Bump PORT_REVISION as pkg-plist has changed. Fixed build on 10.1 but in the process found a bogus pkg-plist fixed. If DOCS was defined, the plist was wrong. Also cleaned up a dependency Fixed using https://cmake.org/cmake/help/v3.0/command/link_directories.html This shouldn't be necessary: "Note that this command is rarely necessary. Library locations returned by find_package() and find_library() are absolute paths. Pass these absolute library file paths directly to the target_link_libraries() command. CMake will ensure the linker finds them." The directory path appears to be in /usr/local/libdata/pkgconfig/gsl.pc so it would appear the swig handling code neglects to respect this. I'll dig into this sometime later. PR: ports/210444 Submitted by: rozhuk.im@gmail.com Modified: head/comms/gnuradio/Makefile head/comms/gnuradio/files/patch-CMakeLists.txt head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion head/comms/gnuradio/files/patch-volk_CMakeLists.txt head/comms/gnuradio/pkg-plist Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Mon Dec 26 18:14:23 2016 (r429561) +++ head/comms/gnuradio/Makefile Mon Dec 26 18:28:45 2016 (r429562) @@ -2,7 +2,7 @@ PORTNAME= gnuradio PORTVERSION= 3.7.9.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ LOCAL/db @@ -47,6 +47,7 @@ CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="$ -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ -DENABLE_GR_CTRLPORT="YES" \ + -DLOCALBASE:STRING="${LOCALBASE}" \ -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace @@ -76,7 +77,7 @@ TESTING_DESC= Include testing support PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - ${LOCALBASE}/bin/sphinx-apidoc:textproc/py-sphinx \ + sphinx-apidoc:textproc/py-sphinx \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf Modified: head/comms/gnuradio/files/patch-CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-CMakeLists.txt Mon Dec 26 18:14:23 2016 (r429561) +++ head/comms/gnuradio/files/patch-CMakeLists.txt Mon Dec 26 18:28:45 2016 (r429562) @@ -12,6 +12,15 @@ #make sure our local CMake Modules path comes first list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) +@@ -53,7 +58,7 @@ include(GrVersion) #setup version info + # Append -O2 optimization flag for Debug builds + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2") +- ++link_directories("/usr/lib" "${LOCALBASE}/lib") + ######################################################################## + # Environment setup + ######################################################################## @@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ######################################################################## include(GrPlatform) #define LIB_SUFFIX Modified: head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion ============================================================================== --- head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion Mon Dec 26 18:14:23 2016 (r429561) +++ head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion Mon Dec 26 18:28:45 2016 (r429562) @@ -1,4 +1,4 @@ ---- grc/scripts/gnuradio-companion.orig 2016-10-02 20:26:15 UTC +--- grc/scripts/gnuradio-companion.orig 2015-12-27 18:10:58 UTC +++ grc/scripts/gnuradio-companion @@ -23,6 +23,9 @@ import sys import optparse Modified: head/comms/gnuradio/files/patch-volk_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-volk_CMakeLists.txt Mon Dec 26 18:14:23 2016 (r429561) +++ head/comms/gnuradio/files/patch-volk_CMakeLists.txt Mon Dec 26 18:28:45 2016 (r429562) @@ -1,6 +1,6 @@ ---- volk/CMakeLists.txt.orig 2016-10-08 18:42:16.000000000 -0400 -+++ volk/CMakeLists.txt 2016-10-08 18:45:51.000000000 -0400 -@@ -139,7 +139,7 @@ +--- volk/CMakeLists.txt.orig 2016-04-08 03:47:02 UTC ++++ volk/CMakeLists.txt +@@ -139,7 +139,7 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc Modified: head/comms/gnuradio/pkg-plist ============================================================================== --- head/comms/gnuradio/pkg-plist Mon Dec 26 18:14:23 2016 (r429561) +++ head/comms/gnuradio/pkg-plist Mon Dec 26 18:28:45 2016 (r429562) @@ -1228,6 +1228,18 @@ lib/libgnuradio-wxgui.so.%%MAJOR_SUB_VER lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%% lib/libvolk.so lib/libvolk.so.1.2.2 +%%PORTDOCS%%%%DOCSDIR%%/README.analog +%%PORTDOCS%%%%DOCSDIR%%/README.blocks +%%PORTDOCS%%%%DOCSDIR%%/README.channels +%%PORTDOCS%%%%DOCSDIR%%/README.dtv +%%PORTDOCS%%%%DOCSDIR%%/README.fec +%%PORTDOCS%%%%DOCSDIR%%/README.fft +%%PORTDOCS%%%%DOCSDIR%%/README.filter +%%PORTDOCS%%%%DOCSDIR%%/README.qtgui +%%PORTDOCS%%%%DOCSDIR%%/README.uhd +%%PORTDOCS%%%%DOCSDIR%%/README.vocoder +%%PORTDOCS%%%%DOCSDIR%%/xml/test_tcm.py.xml +%%PORTDOCS%%%%DOCSDIR%%/xml/test_viterbi_equalization1.py.xml %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612261828.uBQISkxC042637>