Ticket #17042: glib2-2.19.6-muniversal.diff

files/config.cache

@@ +1 @@
+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getpwuid_r=yes
+ac_cv_func_posix_getgrgid_r=yes

Portfile

@@ -1 +1 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               muniversal 1.0
 
 name                    glib2-devel
 set my_name             glib
-version                 2.19.3
+version                 2.19.6
+#version                 2.19.8
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 maintainers             ryandesign
@@ -28 +30 @@
 #    ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
 checksums \
-    md5     8c209e5ed7864cf38bd9f48db6631d1b \
-    sha1    c67056bb797cd36ea23805ba93f301785cfc7807 \
-    rmd160  f114c6a1901bed76d96392e6c2b609f181400895
+    md5     d78ebdcb6a9bbd7cce1f396501037f9b \
+    sha1    6b39ba2b1d702ada6da900410d2ef99191c5efe1 \
+    rmd160  47b58160f6ada1cfe75a723778400a8aee7f3c0b
+#    md5     b2898de261b212dcc1244b624ed756a5 \
+#    sha1    79016e45baed8ccb0f57174274e3dc00483d27bd \
+#    rmd160  a6c6c00885ae808767dbc51b71d55cad3c24a9f9
 
 patchfiles \
     patch-glib-2.0.pc.in.diff \
@@ -51 +56 @@
     -bind_at_load
 
 configure.cflags-append \
-    -funroll-loops \
     -fstrict-aliasing
 
 configure.args \
@@ -61 +65 @@
 configure.perl    ${prefix}/bin/perl
 configure.env-append  PERL_PATH=${configure.perl}
 
+if {[variant_isset universal]} {
+    # Answers to questions configure can't determine without running a program.
+    configure.args-append       --config-cache
+    # So it will find glib-genmarshal when cross-compiling.
+    if {"powerpc" == ${os.arch}} {
+        set build_arch ppc
+    } else {
+        set build_arch ${os.arch}
+    }
+    configure.env-append        PATH=${workpath}/${build_arch}/gobject:$env(PATH)
+    build.env-append            PATH=${workpath}/${build_arch}/gobject:$env(PATH)
+    pre-extract {
+        # ${workpath}/${build_arch}/gobject/glib-genmarshal must exist before a
+        # cross-compiled configure phase runs, so ${build_arch} must be configured
+        # first.
+        if {${build_arch} != [lindex ${universal_archs} 0]} {
+            ui_msg "When building a universal binary of ${name} on ${build_arch}, ${build_arch} must appear first in the list of universal_archs in ${prefix}/etc/macports/macports.conf"
+            return -code error "incompatible universal_archs order"
+        }
+    }
+    post-extract {
+        # Answers to questions configure can't determine without running a program.
+        copy ${filespath}/config.cache ${worksrcpath}
+        # So it will find glib-genmarshal during configure before it has been built.
+        touch ${worksrcpath}/gobject/glib-genmarshal
+        file attributes ${worksrcpath}/gobject/glib-genmarshal -permissions +x
+    }
+}
+
 post-patch {
     reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
     reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
@@ -68 +101 @@
 
 platform darwin {
     patchfiles-append \
-        patch-child-test.c.diff \
-        patch-configure.diff
-}
-
-platform powerpc {
-    if {[variant_isset universal]} {
-        post-configure {
-            reinplace {s|^#define G_ATOMIC_POWERPC 1$|#undef G_ATOMIC_POWERPC|} ${worksrcpath}/config.h
-        }
-    }
+        patch-child-test.c.diff
 }
 
 test.run                yes