<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f6639c8274d8a4c4dfdd3436c9c8f8925be7bde">https://github.com/macports/macports-ports/commit/9f6639c8274d8a4c4dfdd3436c9c8f8925be7bde</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f6639c8274d8a4c4dfdd3436c9c8f8925be7bde
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Dec 28 08:29:26 2022 +0700

<span style='display:block; white-space:pre;color:#404040;'>    MoarVM: fix prefix and rpath
</span>---
 lang/MoarVM/Portfile                  | 17 ++++++++++++++++-
 lang/MoarVM/files/patch-gcc.diff      | 11 +++++++++++
 lang/MoarVM/files/patch-setup.pm.diff | 22 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/MoarVM/Portfile b/lang/MoarVM/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f0711ed057..69ede509a4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/MoarVM/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/MoarVM/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,22 @@ depends_lib-append  port:dyncall \
</span>                     port:libuv
 
 patchfiles          patch-Configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-dyncall.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-dyncall.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-setup.pm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s,/usr/local,${prefix},g" ${worksrcpath}/Configure.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # The following are not built, but better have them fixed nevertheless:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s,/usr/local,${prefix},g" ${worksrcpath}/3rdparty/dyncall/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s,/usr/local,${prefix},g" ${worksrcpath}/3rdparty/dyncall/configure.rc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s,/usr/local,${prefix},g" ${worksrcpath}/3rdparty/libatomicops/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s,/usr/local,${prefix},g" ${worksrcpath}/3rdparty/libtommath/makefile.unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s,/usr/local,${prefix},g" ${worksrcpath}/3rdparty/libtommath/makefile_include.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 # Building nqp on PPC results in malloc errors (though build still succeeds):
 # malloc: *** error for object: incorrect checksum for freed object - object was probably modified after being freed.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/MoarVM/files/patch-gcc.diff b/lang/MoarVM/files/patch-gcc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d3c2e129807
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/MoarVM/files/patch-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/setup.pm.orig    2022-12-05 00:49:38.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/setup.pm 2022-12-28 07:58:36.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,7 +196,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my %TC_DARWIN = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     %TC_GNU,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    -compiler => 'clang',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    -compiler => 'gcc',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     dll => 'lib%s.dylib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/MoarVM/files/patch-setup.pm.diff b/lang/MoarVM/files/patch-setup.pm.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f83107db2ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/MoarVM/files/patch-setup.pm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/setup.pm.orig    2022-12-05 00:49:38.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/setup.pm 2022-12-28 07:54:50.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ldshared                 => '-shared @ccshared@',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     moarshared_norelocatable => '',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     moarshared_relocatable   => '',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ldrpath                  => '-Wl,-rpath,"/@libdir@"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ldrpath                  => '-Wl,-rpath,"@libdir@"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ldrpath_relocatable      => '-Wl,-z,origin,-rpath,\'$$ORIGIN/../lib\'',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     arflags => 'rcs',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -521,8 +521,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     defs                => [ qw( _ALL_SOURCE _XOPEN_SOURCE=500 _LINUX_SOURCE_COMPAT ) ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     syslibs             => [ @{$OS_POSIX{syslibs}}, qw( rt dl perfstat ) ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ldmiscflags         => '-Wl,-brtl',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ldrpath             => '-L"/@libdir@"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ldrpath_relocatable => '-L"/@libdir@"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ldrpath             => '-L"@libdir@"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ldrpath_relocatable => '-L"@libdir@"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     -thirdparty => {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         uv => { %TP_UVDUMMY, objects => '$(UV_AIX)' },
</span></pre><pre style='margin:0'>

</pre>