[107395] trunk/dports/science/gnuradio

27 Jun 2013

Revision: 107395
          https://trac.macports.org/changeset/107395
Author:   michaelld@macports.org
Date:     2013-06-26 19:30:12 -0700 (Wed, 26 Jun 2013)
Log Message:
-----------
gnuradio: add patch files.

Added Paths:
-----------
    trunk/dports/science/gnuradio/files/
    trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff
    trunk/dports/science/gnuradio/files/patch-path-order.diff

Added: trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff
===================================================================

--- trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff	2013-06-27 02:30:12 UTC (rev 107395)
@@ -0,0 +1,15 @@
+diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
+index 17ed65e..2b5ce09 100644
+--- a/gr-wavelet/lib/CMakeLists.txt
++++ b/gr-wavelet/lib/CMakeLists.txt
+@@ -71,10 +71,4 @@ list(APPEND wavelet_libs
+ 
+ add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources})
+ target_link_libraries(gnuradio-wavelet ${wavelet_libs})
+-
+-# we need -no-as-needed or else -lgslcblas gets stripped out on newer version of gcc
+-if(CMAKE_COMPILER_IS_GNUCC)
+-    SET_TARGET_PROPERTIES(gnuradio-wavelet PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")
+-endif(CMAKE_COMPILER_IS_GNUCC)
+-
+ GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel")

Added: trunk/dports/science/gnuradio/files/patch-path-order.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-path-order.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-path-order.diff	2013-06-27 02:30:12 UTC (rev 107395)
@@ -0,0 +1,138 @@
+diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
+index b9bf0bb..eb2dce3 100644
+--- a/cmake/Modules/GrSwig.cmake
++++ b/cmake/Modules/GrSwig.cmake
+@@ -118,8 +118,8 @@ macro(GR_SWIG_MAKE name)
+     find_package(PythonLibs)
+     list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
+     list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
+-    list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+-    list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
++    list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_SOURCE_DIR})
++    list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_BINARY_DIR})
+ 
+     #determine include dependencies for swig file
+     execute_process(
+diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
+index c9e2806..48f4445 100644
+--- a/gr-audio/lib/CMakeLists.txt
++++ b/gr-audio/lib/CMakeLists.txt
+@@ -20,18 +20,6 @@
+ ########################################################################
+ # Setup the include and linker paths
+ ########################################################################
+-include_directories(
+-    ${CMAKE_CURRENT_SOURCE_DIR}
+-    ${GR_AUDIO_INCLUDE_DIRS}
+-    ${GNURADIO_CORE_INCLUDE_DIRS}
+-    ${GRUEL_INCLUDE_DIRS}
+-    ${Boost_INCLUDE_DIRS}
+-)
+-
+-link_directories(${Boost_LIBRARY_DIRS})
+-
+-include_directories(${LOG4CPP_INCLUDE_DIRS})
+-link_directories(${LOG4CPP_LIBRARY_DIRS})
+ 
+ list(APPEND gr_audio_libs gnuradio-core ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
+ list(APPEND gr_audio_sources gr_audio_registry.cc)
+@@ -44,7 +32,8 @@ find_package(ALSA)
+ 
+ if(ALSA_FOUND)
+ 
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/alsa ${ALSA_INCLUDE_DIRS})
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/alsa)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${ALSA_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${ALSA_LIBRARIES})
+     list(APPEND gr_audio_sources
+         ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gri_alsa.cc
+@@ -62,7 +51,8 @@ find_package(OSS)
+ 
+ if(OSS_FOUND)
+ 
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/oss ${OSS_INCLUDE_DIRS})
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/oss)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${OSS_INCLUDE_DIRS})
+     list(APPEND gr_audio_sources
+         ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_source.cc
+         ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_sink.cc
+@@ -79,7 +69,8 @@ find_package(Jack)
+ 
+ if(JACK_FOUND)
+ 
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jack ${JACK_INCLUDE_DIRS})
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/jack)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${JACK_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${JACK_LIBRARIES})
+     add_definitions(${JACK_DEFINITIONS})
+     list(APPEND gr_audio_sources
+@@ -100,7 +91,7 @@ CHECK_INCLUDE_FILE_CXX(AudioToolbox/AudioToolbox.h AUDIO_TOOLBOX_H)
+ 
+ if(AUDIO_UNIT_H AND AUDIO_TOOLBOX_H)
+ 
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/osx)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/osx)
+     list(APPEND gr_audio_libs
+         "-framework AudioUnit"
+         "-framework CoreAudio"
+@@ -121,7 +112,8 @@ find_package(Portaudio)
+ 
+ if(PORTAUDIO_FOUND)
+ 
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS})
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/portaudio)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${PORTAUDIO_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
+     add_definitions(${PORTAUDIO_DEFINITIONS})
+     list(APPEND gr_audio_sources
+@@ -138,7 +130,8 @@ endif(PORTAUDIO_FOUND)
+ ########################################################################
+ if(WIN32)
+ 
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/windows)
++    list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${PORTAUDIO_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs winmm.lib)
+     list(APPEND gr_audio_sources
+         ${CMAKE_CURRENT_SOURCE_DIR}/windows/audio_windows_source.cc
+@@ -162,8 +155,28 @@ if(WIN32)
+ endif(WIN32)
+ 
+ ########################################################################
++# deal with paths
++########################################################################
++
++include_directories(
++    ${GR_AUDIO_INCLUDE_DIRS_BEFORE}
++    ${CMAKE_CURRENT_SOURCE_DIR}
++    ${GR_AUDIO_INCLUDE_DIRS}
++    ${GNURADIO_CORE_INCLUDE_DIRS}
++    ${GRUEL_INCLUDE_DIRS}
++    ${Boost_INCLUDE_DIRS}
++    ${GR_AUDIO_INCLUDE_DIRS_AFTER}
++)
++
++link_directories(${Boost_LIBRARY_DIRS})
++
++include_directories(${LOG4CPP_INCLUDE_DIRS})
++link_directories(${LOG4CPP_LIBRARY_DIRS})
++
++########################################################################
+ # Setup library
+ ########################################################################
++
+ add_library(gnuradio-audio SHARED ${gr_audio_sources})
+ target_link_libraries(gnuradio-audio ${gr_audio_libs})
+ GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
+diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
+index 3e8c516..627135a 100644
+--- a/gruel/CMakeLists.txt
++++ b/gruel/CMakeLists.txt
+@@ -37,7 +37,6 @@ include(GrMiscUtils)
+ GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/include
+     ${CMAKE_CURRENT_BINARY_DIR}/src/include
+-    ${Boost_INCLUDE_DIRS}
+ )
+ 
+ ########################################################################

    

michaelld＠macports.org

tags

participants (1)