<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87591c10dc6987d22cd8c372eb405787cf59c7db">https://github.com/macports/macports-ports/commit/87591c10dc6987d22cd8c372eb405787cf59c7db</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 87591c10dc6987d22cd8c372eb405787cf59c7db
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Apr 1 18:46:15 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> volk: use prior volk-devel patches and variants on new release
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Might address: trac.macports.org/ticket/56193
</span>---
science/volk/Portfile | 103 ++++++++++++++++++++------------------------------
1 file changed, 41 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c05df4..e5743a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,7 @@ platforms darwin
</span> if {${name} eq ${subport}} {
github.setup gnuradio volk 1.4 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums \
rmd160 cf9e7a2a6d981871cc3321135f2f97fa872da94f \
sha256 369dffa2ad16c0439f72bdb6d948d91a66cc274388e3bb343e1c19348dcb0ead \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,19 +48,19 @@ subport volk-devel {
</span> long_description ${long_description} ${subport} \
provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix include_directories ordering so-as to pick up project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # headers before external headers. allows for in-place building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # while a prior version is already installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix include_directories ordering so-as to pick up project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# headers before external headers. allows for in-place building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# while a prior version is already installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix C++11 for internal use only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-clang.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix C++11 for internal use only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-cxx11.diff
</span>
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,47 +81,38 @@ configure.ldflags-delete -L${prefix}/lib
</span> # specify the Python dependencies; these are checked for at configure,
# then used for building, but not at runtime.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # release must use Python 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # select Python to use; default to 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# select Python to use; default to 2.7
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select one of the variants +python27 , +python34 , +python35, or +python36 .\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "34"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "35"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "36"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the variants +python27 , +python34 , +python35, or +python36 .\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set PythonVersionNoDot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "34"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "35"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "36"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
# required Python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,22 +120,9 @@ set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
</span> depends_lib-append \
port:python${PythonVersionNoDot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# dependencies currently depend on port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dependencies for release only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PythonVersionNoDot}-cheetah
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add dependencies for devel only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PythonVersionNoDot}-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PythonVersionNoDot}-mako
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-mako
</span>
# override default version string to be MacPorts-specific
# git / "devel" only for now
</pre><pre style='margin:0'>
</pre>