<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/647feebef5341be57a195f156a8290f09ac6725c">https://github.com/macports/macports-ports/commit/647feebef5341be57a195f156a8290f09ac6725c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 647feebef53 ismrmrd: fixups
</span>647feebef53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 647feebef5341be57a195f156a8290f09ac6725c
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Jan 30 19:04:22 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> ismrmrd: fixups
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove Werror to fix build on newer systems
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/66632
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> while here:
</span><span style='display:block; white-space:pre;color:#404040;'> - fix testing
</span><span style='display:block; white-space:pre;color:#404040;'> - use rpaths during the build to allow the proper libraries to be found when testing
</span><span style='display:block; white-space:pre;color:#404040;'> - these are rewritten on installation to full paths
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - links to zlib so declare a lib dep on that
</span><span style='display:block; white-space:pre;color:#404040;'> /opt/local/lib/libismrmrd.1.13.1.dylib:
</span><span style='display:block; white-space:pre;color:#404040;'> /opt/local/lib/libismrmrd.1.13.dylib (compatibility version 1.13.0, current version 1.13.1)
</span><span style='display:block; white-space:pre;color:#404040;'> /opt/local/lib/libhdf5.310.dylib (compatibility version 311.0.0, current version 311.0.0)
</span><span style='display:block; white-space:pre;color:#404040;'> /opt/local/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.13)
</span><span style='display:block; white-space:pre;color:#404040;'> /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1319.0.0)
</span><span style='display:block; white-space:pre;color:#404040;'> /opt/local/lib/libpugixml.1.dylib (compatibility version 1.0.0, current version 1.13.0)
</span><span style='display:block; white-space:pre;color:#404040;'> /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 1300.36.0)
</span>---
science/ismrmrd/Portfile | 22 +++++++++++++---------
science/ismrmrd/files/patch-ismrmrd-no-werror.diff | 13 +++++++++++++
2 files changed, 26 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ismrmrd/Portfile b/science/ismrmrd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70806c34df9..4c22575941b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ismrmrd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ismrmrd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup conflicts_build 1.0
</span> PortGroup boost 1.0
github.setup ismrmrd ismrmrd 1.13.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science
maintainers {eborisch @eborisch} openmaintainer
license permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,8 @@ compiler.cxx_standard 2011
</span>
depends_lib-append port:hdf5 \
port:fftw-3-single \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pugixml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
depends_build-append path:bin/doxygen:doxygen \
path:bin/dot:graphviz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +37,18 @@ configure.args-append -DUSE_SYSTEM_PUGIXML=ON
</span>
build.target-append doc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix testing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.dir ${cmake.build_dir}/tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ./test_ismrmrd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles pugixml.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles pugixml.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ismrmrd-no-werror.diff
</span>
post-patch {
foreach pat {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +57,6 @@ post-patch {
</span> "/^DOT_IMAGE_FORMAT/s/png/svg/"
} { reinplace -E $pat doc/Doxyfile.in }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Otherwise looks for the not-yet-installed libraries in ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s#COMMAND#COMMAND DYLD_LIBRARY_PATH=${cmake.build_dir}#" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Patch for updated interface for current pugixml; remove private copies
reinplace "/result/s/load/load_string/" utilities/ismrmrd_test_xml.cpp
foreach pugifile { pugixml.hpp pugixml.cpp pugiconfig.hpp } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ismrmrd/files/patch-ismrmrd-no-werror.diff b/science/ismrmrd/files/patch-ismrmrd-no-werror.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..85595e7a5c6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ismrmrd/files/patch-ismrmrd-no-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-01-30 18:30:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-01-30 18:30:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,8 +65,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --- VERSIONING (begin) ----
</span></pre><pre style='margin:0'>
</pre>