<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/3c09134ecc4363c6d80637797bed5fe4b5c08aba">https://github.com/macports/macports-ports/commit/3c09134ecc4363c6d80637797bed5fe4b5c08aba</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3c09134ecc4363c6d80637797bed5fe4b5c08aba
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Aug 3 09:36:05 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> meson: add MacPorts cross-files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> and modify meson to search in the
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts prefix for the files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> so far, crossfiles only for Intel arches
</span>---
devel/meson/Portfile | 13 +++++++++++++
devel/meson/files/cross/i386-darwin | 5 +++++
devel/meson/files/cross/x86_64-darwin | 5 +++++
.../patch-meson-search-prefix-for-cross-files.diff | 21 +++++++++++++++++++++
4 files changed, 44 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 298e9ddc4e7..ba7c3f5f0e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,8 @@ PortGroup github 1.0
</span>
github.setup mesonbuild meson 0.55.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.tarball_from releases
license Apache-2
categories devel python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,10 +55,21 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> # https://github.com/mesonbuild/meson/issues/6187
patchfiles-append patch-meson-32bit-apple.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# add a search path for crossfiles in our prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/data/shell-completions/bash/meson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mesonbuild/coredata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
set python_prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
ln -s ${python_prefix}/bin/meson ${destroot}${prefix}/bin/meson
ln -s ${python_prefix}/share/man/man1/meson.1 ${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install our MacPorts cross files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/meson/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/cross ${destroot}${prefix}/share/meson/
</span> }
# the following block avoids requiring users to 'sudo port select python3 python37'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/cross/i386-darwin b/devel/meson/files/cross/i386-darwin
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..11af73bbd2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/cross/i386-darwin
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[host_machine]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+system = 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu_family = 'x86'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu = 'i386'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endian = 'little'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/cross/x86_64-darwin b/devel/meson/files/cross/x86_64-darwin
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ef7bd58a990
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/cross/x86_64-darwin
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[host_machine]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+system = 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu_family = 'x86_64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu = 'x86_64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endian = 'little'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson-search-prefix-for-cross-files.diff b/devel/meson/files/patch-meson-search-prefix-for-cross-files.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8655853c250
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/shell-completions/bash/meson.orig 2020-08-03 09:20:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/shell-completions/bash/meson 2020-08-03 09:21:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,6 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cross-file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _filedir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in "$XDG_DATA_DIRS"/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPREPLY+=($(_filedir_in @@PREFIX@@/share/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in /usr/local/share/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in /usr/share/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in "$XDG_DATA_HOME"/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./mesonbuild/coredata.py.orig 2020-08-03 09:46:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./mesonbuild/coredata.py 2020-08-03 09:46:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,7 +421,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform != 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ] + os.environ.get('XDG_DATA_DIRS', '@@PREFIX@@/share:/usr/local/share:/usr/share').split(':')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for path in paths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path_to_try = os.path.join(path, 'meson', ftype, f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.isfile(path_to_try):
</span></pre><pre style='margin:0'>
</pre>