<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/646f31e1eeac69ae9ea0c986ca81d7bb04ef24ef">https://github.com/macports/macports-ports/commit/646f31e1eeac69ae9ea0c986ca81d7bb04ef24ef</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 646f31e1eeac69ae9ea0c986ca81d7bb04ef24ef
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Feb 10 21:22:35 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: fix universal
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - strip one flag meson doesn't accept
</span><span style='display:block; white-space:pre;color:#404040;'> - disable one test that fails (wrongly I think) on BigSur intel when configuring arm64 slice
</span><span style='display:block; white-space:pre;color:#404040;'> - remove the editing of config.h that doesn't apply on arm64 and shouldn't be needed with the muniveral Portgroup
</span>---
devel/glib2-devel/Portfile | 24 +++++++++++++++++++---
.../patch-glib2-allow-frexpl-test-to-pass.diff | 12 +++++++++++
2 files changed, 33 insertions(+), 3 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 4bb00193481..15bdf4808a8 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;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
# Please keep the glib2 and glib2-devel ports as similar as possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +45,9 @@ patchfiles libintl.patch \
</span> patch-meson_build-meson_options-appinfo.diff \
patch-meson-build-python-path.diff \
universal.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this test fails (I believe wrongly) when configuring arm64 on Intel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-glib2-allow-frexpl-test-to-pass.diff
</span>
depends_build-append bin:xmllint:libxml2 \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,6 +84,17 @@ configure.perl /usr/bin/perl
</span> configure.python ${prefix}/bin/python3.9
configure.env-append PERL_PATH=${configure.perl}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # strip the automatic setting of host, meson does not accept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(${my_arch}) ""
</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;'>+
</span> post-patch {
reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +102,12 @@ post-patch {
</span> reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ed - ${build.dir}/config.h < ${filespath}/config.h.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this edit does not, for some reason, apply against the build-arm64 config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and should not be needed if we're using the muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needs testing on 32 bit systems to be certain of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# system "ed - ${build.dir}/config.h < ${filespath}/config.h.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span>
build.args-append --verbose
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib2-allow-frexpl-test-to-pass.diff b/devel/glib2-devel/files/patch-glib2-allow-frexpl-test-to-pass.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..716903bb0df
</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-glib2-allow-frexpl-test-to-pass.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/gnulib/gl_cv_func_frexpl_works/meson.build.orig glib/gnulib/gl_cv_func_frexpl_works/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 303ec63..50e614e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gnulib/gl_cv_func_frexpl_works/meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gnulib/gl_cv_func_frexpl_works/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (host_system.startswith ('aix') or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_system.startswith ('beos') or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- host_system.startswith ('darwin') or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_system.startswith ('irix'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_cv_func_frexpl_works = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_cv_func_frexpl_broken_beyond_repair = true
</span></pre><pre style='margin:0'>
</pre>