<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65aa209d22e3364cf7194ca8ef82b8818ca19388">https://github.com/macports/macports-ports/commit/65aa209d22e3364cf7194ca8ef82b8818ca19388</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 65aa209d22e icu: fix rpath mess
</span>65aa209d22e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 65aa209d22e3364cf7194ca8ef82b8818ca19388
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sun May 21 10:29:04 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    icu: fix rpath mess
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/67428
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/67433
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/unicode-org/icu/pull/2467
</span>---
 devel/icu/Portfile                          |  6 ++++--
 devel/icu/files/patch-config-mh-darwin.diff | 32 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12e40546272..9b67f79b829 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ set my_name         icu
</span> #  port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | xargs port info --name --subport | cut -d : -f 2 | tr ',' ' ' | grep -v '\-\-' | tr ' ' '\n' | sort -u
 
 version             73.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> epoch               1
 subport             ${name}-docs         { revision 0 }
 subport             ${name}-lx           { revision 0 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +74,8 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span>     # use full pathnames to libraries in tools
     patchfiles-append   patch-i18n-formatted_string_builder.h.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # fix rpath mess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-config-mh-darwin.diff
</span> 
     compiler.cxx_standard   2011
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +87,7 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> 
     configure.args      --disable-layoutex \
                         --disable-samples \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --enable-rpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        --disable-rpath \
</span>                         --enable-static
 
     configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/patch-config-mh-darwin.diff b/devel/icu/files/patch-config-mh-darwin.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..739f85b2307
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/files/patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+With rpath disabled, the install_name is wrongly missing the path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+With rpath enabled, the install_name is wrongly missing @rpath.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/mh-darwin.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/mh-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,9 +30,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Compiler switches to embed a library name and version information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(ENABLE_RPATH),YES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @rpath/$(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
</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;'>+ ## Compiler switch to embed a runtime search path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/mh-darwin-ppc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/mh-darwin-ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,9 +30,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Compiler switches to embed a library name and version information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(ENABLE_RPATH),YES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @rpath/$(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
</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;'>+ ## Compiler switch to embed a runtime search path
</span></pre><pre style='margin:0'>

</pre>