<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/dd581384e1a6801e78847f413d0ea290d3a2dc4e">https://github.com/macports/macports-ports/commit/dd581384e1a6801e78847f413d0ea290d3a2dc4e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dd581384e1a6801e78847f413d0ea290d3a2dc4e
</span>Author: Gregorio Litenstein <g.litenstein@gmail.com>
AuthorDate: Sun Nov 17 14:30:11 2019 -0300
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: fix python detection in a cleaner way
</span>---
devel/glib2-devel/Portfile | 4 ++-
.../files/patch-meson-build-python-path.diff | 17 ++++++++++++
devel/glib2-devel/files/universal.patch | 31 +++++++++++++++++++---
3 files changed, 48 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81de83a0ad2..d7e143db425 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,7 @@ patchfiles libintl.patch \
</span> patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
patch-meson_build-meson_options-appinfo.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-build-python-path.diff \
</span> universal.patch
depends_build-append bin:xmllint:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +81,10 @@ configure.python ${prefix}/bin/python3.7
</span> configure.env-append PERL_PATH=${configure.perl}
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
</span> reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
</span> }
post-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-meson-build-python-path.diff b/devel/glib2-devel/files/patch-meson-build-python-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5f0aba55065
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GLib2 tries to find "python3" and if it can't find it, it will go for "python"; if port select wasn't explicitly run, this will likely end-up with Python 2.7. As a fallback, meson can use whatever python it's running on if the argument to find_installation is empty.
</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;'>+--- meson.build.orig 2019-11-21 00:41:53.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-21 00:44:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1992,9 +1992,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = import('python').find_installation('')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # used for '#!/usr/bin/env <name>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python_name = 'python3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python_name = '@PYTHON@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version = python.language_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version_req = '>=3.4'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/universal.patch b/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 032cbcdaec1..eaeaa0c853d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@ Allow universal builds. This is only part of the solution; the config.h.ed
</span> script is the other part. If new variables appear in the configure script
that are affected by endianness or bitness, remember to handle them both
here and in config.h.ed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/glibconfig.h.in.orig 2019-10-21 14:18:40.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/glibconfig.h.in 2019-11-14 19:01:01.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/glibconfig.h.in.orig 2019-11-17 14:17:08.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/glibconfig.h.in 2019-11-17 14:15:42.000000000 -0300
</span> @@ -58,21 +58,43 @@
#define G_HAVE_GINT64 1 /* deprecated, always true */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ here and in config.h.ed.
</span>
@g_have_iso_c_varargs@
@g_have_iso_cxx_varargs@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,34 +196,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,34 +196,75 @@
</span> #mesondefine G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
#mesondefine G_ATOMIC_LOCK_FREE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,6 +216,31 @@ here and in config.h.ed.
</span> +#else
+#define G_BYTE_ORDER G_LITTLE_ENDIAN
+#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@glib_is_powerpc@
</span>
#define GLIB_SYSDEF_POLLIN =@g_pollin@
#define GLIB_SYSDEF_POLLOUT =@g_pollout@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-11-17 14:26:49.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-17 14:27:32.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,17 +1584,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glibconfig_conf.set(d[1], val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# We need a more robust approach here...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glib_memory_barrier_needed = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif host_cpu_family.startswith('sparc') or host_cpu_family.startswith('alpha') or host_cpu_family.startswith('powerpc') or host_cpu_family == 'ia64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glib_memory_barrier_needed = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- warning('Unknown host cpu: ' + host_cpu_family)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glib_memory_barrier_needed = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-glibconfig_conf.set('G_ATOMIC_OP_MEMORY_BARRIER_NEEDED', glib_memory_barrier_needed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glib_is_powerpc = '#if (defined(__PPC__) || defined(__PPC64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(_ARCH_PPC) || defined(_ARCH_PPC64))\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1\n#else\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#endif'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glibconfig_conf.set('glib_is_powerpc', glib_is_powerpc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need to decide at configure time if GLib will use real atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # operations ("lock free") or emulated ones with a mutex. This is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>