<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9efbf0afa0f4348c50473d378872fb066e07760f">https://github.com/macports/macports-ports/commit/9efbf0afa0f4348c50473d378872fb066e07760f</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 9efbf0afa0f py-meson: unbreak linking on < 10.7
</span>9efbf0afa0f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9efbf0afa0f4348c50473d378872fb066e07760f
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Aug 10 03:19:19 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-meson: unbreak linking on < 10.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See:
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/70386
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/70496
</span>---
python/py-meson/Portfile | 6 ++-
python/py-meson/files/patch-unbreak-linking.diff | 48 ++++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/Portfile b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 824f90c4a4e..1651658f7e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name py-meson
</span> # update version and revision also in the meson port
github.setup mesonbuild meson 1.5.1
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
checksums rmd160 9d8c02bf13789368f7af53c0cc66fe0ccc88c476 \
sha256 567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,10 @@ if {${subport} ne ${name}} {
</span> if {${os.platform} eq "darwin" && ${os.major} <= 10} {
patchfiles-append \
patch-meson-remove-Wl,-no_weak_imports.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/mesonbuild/meson/pull/13291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-unbreak-linking.diff
</span> }
# https://github.com/mesonbuild/meson/issues/6187
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-unbreak-linking.diff b/python/py-meson/files/patch-unbreak-linking.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..594b2d6bf10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-unbreak-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 446fd2a2bf04154b10e03638bd448bdba2bb732f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 10 Aug 2024 02:52:23 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Revert "Add -export_dynamic flag for AppleDynamicLinker"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit dfd22db4be6bfc0e64272479b51bbf314db04ac2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mesonbuild/linkers/linkers.py | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unittests/darwintests.py | 12 ------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mesonbuild/linkers/linkers.py mesonbuild/linkers/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0b8927359..103d368db 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/linkers/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/linkers/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -839,9 +839,6 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_thinlto_cache_args(self, path: str) -> T.List[str]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ["-Wl,-cache_path_lto," + path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def export_dynamic_args(self, env: 'Environment') -> T.List[str]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return self._apply_prefix('-export_dynamic')
</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;'>+ class LLVMLD64DynamicLinker(AppleDynamicLinker):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git unittests/darwintests.py unittests/darwintests.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index afc663a57..5739beca5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unittests/darwintests.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unittests/darwintests.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,18 +81,6 @@ class DarwinTests(BasePlatformTests):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.build()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.run_tests()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_apple_lto_export_dynamic(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tests that -Wl,-export_dynamic is correctly added, when export_dynamic: true is set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- On macOS, this is relevant for LTO builds only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- testdir = os.path.join(self.common_test_dir, '148 shared module resolving symbol in executable')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Ensure that it builds even with LTO enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env = {'CFLAGS': '-flto'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.init(testdir, override_envvars=env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.build()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.run_tests()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _get_darwin_versions(self, fname):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fname = os.path.join(self.builddir, fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out = subprocess.check_output(['otool', '-L', fname], universal_newlines=True)
</span></pre><pre style='margin:0'>
</pre>