Changeset 117735 for trunk/dports
- Timestamp:
- Mar 10, 2014, 1:22:27 PM (10 years ago)
- Location:
- trunk/dports/science/gnuradio
- Files:
-
- 1 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dports/science/gnuradio/Portfile
r117706 r117735 23 23 if {${subport} eq ${name}} { 24 24 25 version 3.7.2.1 26 revision 2 25 version 3.7.3 27 26 28 27 long_description ${description}: \ … … 36 35 37 36 checksums \ 38 rmd160 14a04753ce6185daa92ebcb6619df9c130a70757\39 sha256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c8037 rmd160 f4f8d707694ac8524025ccd4cfb3e47fd3a17204 \ 38 sha256 1c71d1819a67bac4148c619fc2a7d2c0ea0b0d08aa4660a11d65ab7b713b5231 40 39 41 40 patchfiles-append \ … … 90 89 This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again. 91 90 92 version 3.7. 3_2014030791 version 3.7.4_20140308 93 92 94 93 conflicts gnuradio-legacy gnuradio gnuradio-next … … 96 95 fetch.type git 97 96 git.url http://git.gnuradio.org/git/gnuradio.git 98 git.branch 24dc96ad6c445f905af9bc3eba1c56e97e3c429d97 git.branch 69dcaa75b629af4ebc465a073f54af84b7c75a11 99 98 100 99 livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master … … 109 108 This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again. 110 109 111 version 3.8.0_2014030 7110 version 3.8.0_20140308 112 111 113 112 conflicts gnuradio-legacy gnuradio gnuradio-devel … … 115 114 fetch.type git 116 115 git.url http://git.gnuradio.org/git/gnuradio.git 117 git.branch 06dab56378a89e39e14ff8ebf66745eee0955b31116 git.branch aedd3caf18f161a22323fc6533463ec554e94c37 118 117 119 118 livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next … … 151 150 152 151 patchfiles-append patch-cmake-expand.devel.diff 153 154 # temporary patch to fix Doxygen building155 156 patchfiles-append patch-CMakeLists.txt.devel.diff157 152 158 153 } -
trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff
r117181 r117735 372 372 --- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig 373 373 +++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt 374 @@ -18, 79 +18,36@@374 @@ -18,80 +18,38 @@ 375 375 # Boston, MA 02110-1301, USA. 376 376 … … 380 380 ######################################################################## 381 381 -include(GrPython) 382 - 382 383 383 -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py " 384 384 -#!${PYTHON_EXECUTABLE} … … 423 423 -# Invoke macro to generate various sources 424 424 -######################################################################## 425 -expand_h(abs_XX ss ii ff) 425 426 -expand_h(add_XX ss ii cc) 426 427 -expand_h(add_const_XX bb ss ii ff cc) … … 451 452 -expand_h(vector_source_X b s i f c) 452 453 +include(GrMiscUtils) 454 +GR_EXPAND_X_H(blocks abs_XX ss ii ff) 453 455 +GR_EXPAND_X_H(blocks add_XX ss ii cc) 454 456 +GR_EXPAND_X_H(blocks add_const_XX bb ss ii ff cc) … … 483 485 --- gr-blocks/lib/CMakeLists.txt.orig 484 486 +++ gr-blocks/lib/CMakeLists.txt 485 @@ -23,10 0 +23,36@@487 @@ -23,101 +23,37 @@ 486 488 include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake) 487 489 … … 554 556 # Invoke macro to generate various sources 555 557 ######################################################################## 558 -expand_cc_h_impl(abs_XX ss ii ff) 556 559 -expand_cc_h_impl(add_XX ss ii cc) 557 560 -expand_cc_h_impl(add_const_XX bb ss ii ff cc) … … 582 585 -expand_cc_h_impl(vector_source_X b s i f c) 583 586 +include(GrMiscUtils) 587 +GR_EXPAND_X_CC_H_IMPL(blocks abs_XX ss ii ff) 584 588 +GR_EXPAND_X_CC_H_IMPL(blocks add_XX ss ii cc) 585 589 +GR_EXPAND_X_CC_H_IMPL(blocks add_const_XX bb ss ii ff cc) … … 858 862 - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) 859 863 - endforeach(sig) 860 - 864 - 861 865 - #create a command to generate the files 862 866 - add_custom_command( … … 925 929 - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) 926 930 - endforeach(sig) 927 - 931 - 928 932 - #create a command to generate the source files 929 933 - add_custom_command( … … 943 947 - ${root} ${root}.h.t ${ARGN} 944 948 - ) 945 - 949 - 946 950 - #make source files depends on headers to force generation 947 951 - set_source_files_properties(${expanded_files_cc} 948 952 - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}" 949 953 - ) 950 - 954 - 951 955 - #install rules for the generated cc files 952 - list(APPEND generated_sources ${expanded_files_cc}) 953 - list(APPEND generated_headers ${expanded_files_h}) 956 - list(APPEND generated_sources ${expanded_files_cc}) 957 - list(APPEND generated_headers ${expanded_files_h}) 954 958 -endmacro(expand_cc) 955 959 -
Note: See TracChangeset
for help on using the changeset viewer.