[47055] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Fri Feb 20 21:06:33 PST 2009
Revision: 47055
http://trac.macports.org/changeset/47055
Author: ryandesign at macports.org
Date: 2009-02-20 21:06:32 -0800 (Fri, 20 Feb 2009)
Log Message:
-----------
glib2-devel:
* update to 2.19.6
* fix universal issues by using muniversal portgroup; see #17042
* no longer use -funroll-loops; see #18384
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
Added Paths:
-----------
trunk/dports/devel/glib2-devel/files/config.cache
Removed Paths:
-------------
trunk/dports/devel/glib2-devel/files/patch-configure.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2009-02-21 04:52:01 UTC (rev 47054)
+++ trunk/dports/devel/glib2-devel/Portfile 2009-02-21 05:06:32 UTC (rev 47055)
@@ -1,10 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
name glib2-devel
set my_name glib
-version 2.19.3
+version 2.19.6
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign
@@ -28,9 +29,9 @@
# ftp://ftp.gtk.org/pub/${my_name}/${branch}/
checksums \
- md5 8c209e5ed7864cf38bd9f48db6631d1b \
- sha1 c67056bb797cd36ea23805ba93f301785cfc7807 \
- rmd160 f114c6a1901bed76d96392e6c2b609f181400895
+ md5 d78ebdcb6a9bbd7cce1f396501037f9b \
+ sha1 6b39ba2b1d702ada6da900410d2ef99191c5efe1 \
+ rmd160 47b58160f6ada1cfe75a723778400a8aee7f3c0b
patchfiles \
patch-glib-2.0.pc.in.diff \
@@ -51,7 +52,6 @@
-bind_at_load
configure.cflags-append \
- -funroll-loops \
-fstrict-aliasing
configure.args \
@@ -61,6 +61,36 @@
configure.perl ${prefix}/bin/perl
configure.env-append PERL_PATH=${configure.perl}
+set merger_dont_diff ${prefix}/lib/glib-2.0/include/glibconfig.h
+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,18 +98,9 @@
platform darwin {
patchfiles-append \
- patch-child-test.c.diff \
- patch-configure.diff
+ patch-child-test.c.diff
}
-platform powerpc {
- if {[variant_isset universal]} {
- post-configure {
- reinplace {s|^#define G_ATOMIC_POWERPC 1$|#undef G_ATOMIC_POWERPC|} ${worksrcpath}/config.h
- }
- }
-}
-
test.run yes
test.target check
Added: trunk/dports/devel/glib2-devel/files/config.cache
===================================================================
--- trunk/dports/devel/glib2-devel/files/config.cache (rev 0)
+++ trunk/dports/devel/glib2-devel/files/config.cache 2009-02-21 05:06:32 UTC (rev 47055)
@@ -0,0 +1,4 @@
+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getpwuid_r=yes
+ac_cv_func_posix_getgrgid_r=yes
Deleted: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2009-02-21 04:52:01 UTC (rev 47054)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2009-02-21 05:06:32 UTC (rev 47055)
@@ -1,147 +0,0 @@
---- configure.orig 2008-12-01 13:10:35.000000000 -0600
-+++ configure 2008-12-01 20:20:27.000000000 -0600
-@@ -28551,28 +28551,11 @@
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
- $as_echo "$ac_cv_c_bigendian" >&6; }
-- case $ac_cv_c_bigendian in #(
-- yes)
- cat >>confdefs.h <<\_ACEOF
-+#ifdef __BIG_ENDIAN__
- #define WORDS_BIGENDIAN 1
-+#endif
- _ACEOF
--;; #(
-- no)
-- ;; #(
-- universal)
--
--cat >>confdefs.h <<\_ACEOF
--#define AC_APPLE_UNIVERSAL_BUILD 1
--_ACEOF
--
-- ;; #(
-- *)
-- { { $as_echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--$as_echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-- { (exit 1); exit 1; }; } ;;
-- esac
-
- if test x$ac_cv_c_bigendian = xuniversal ; then
- cat >conftest.$ac_ext <<_ACEOF
-@@ -39672,7 +39655,11 @@
- $as_echo "$glib_cv_byte_contents_gmutex" >&6; }
-
- cat >>confdefs.h <<_ACEOF
--#define GLIB_BYTE_CONTENTS_GMUTEX $glib_cv_byte_contents_gmutex
-+#ifdef __BIG_ENDIAN__
-+#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-+#else
-+#define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-+#endif
- _ACEOF
-
-
-@@ -46419,10 +46406,13 @@
- _______EOF
- fi
-
-- case x$g_stack_grows in
-- xyes) echo "#define G_HAVE_GROWING_STACK 1" >>$outfile ;;
-- *) echo "#define G_HAVE_GROWING_STACK 0" >>$outfile ;;
-- esac
-+ cat >>$outfile <<_______EOF
-+#ifdef __BIG_ENDIAN__
-+#define G_HAVE_GROWING_STACK 1
-+#else
-+#define G_HAVE_GROWING_STACK 0
-+#endif
-+_______EOF
-
-
- echo >>$outfile
-@@ -46471,7 +46461,12 @@
- long dummy_long;
- } static_mutex;
- };
--#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
-+#ifdef __BIG_ENDIAN__
-+#define G_STATIC_MUTEX_INIT { NULL, { { 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#else
-+#define G_STATIC_MUTEX_INIT { NULL, { { -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#endif
-+
- #define g_static_mutex_get_mutex(mutex) \\
- (g_thread_use_default_impl ? ((GMutex*)(gpointer) ((mutex)->static_mutex.pad)) : \\
- g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -46500,24 +46495,39 @@
- void *dummy_pointer;
- long dummy_long;
- };
--_______EOF
-- if test x"$g_memory_barrier_needed" != xno; then
-- echo >>$outfile
-- echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
-- fi
-+#ifdef __BIG_ENDIAN__
-+#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1
-+#define GINT16_TO_BE(val) ((gint16) (val))
-+#define GUINT16_TO_BE(val) ((guint16) (val))
-+#define GINT16_TO_LE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
-+#define GUINT16_TO_LE(val) (GUINT16_SWAP_LE_BE (val))
-+#define GINT32_TO_BE(val) ((gint32) (val))
-+#define GUINT32_TO_BE(val) ((guint32) (val))
-+#define GINT32_TO_LE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
-+#define GUINT32_TO_LE(val) (GUINT32_SWAP_LE_BE (val))
-+#define GINT64_TO_BE(val) ((gint64) (val))
-+#define GUINT64_TO_BE(val) ((guint64) (val))
-+#define GINT64_TO_LE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
-+#define GUINT64_TO_LE(val) (GUINT64_SWAP_LE_BE (val))
-+
-+#else
-+
-+#define GINT16_TO_LE(val) ((gint16) (val))
-+#define GUINT16_TO_LE(val) ((guint16) (val))
-+#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
-+#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
-+#define GINT32_TO_LE(val) ((gint32) (val))
-+#define GUINT32_TO_LE(val) ((guint32) (val))
-+#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
-+#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
-+#define GINT64_TO_LE(val) ((gint64) (val))
-+#define GUINT64_TO_LE(val) ((guint64) (val))
-+#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
-+#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
-+
-+#endif
-
-- echo >>$outfile
-- g_bit_sizes="16 32 64"
-- for bits in $g_bit_sizes; do
-- cat >>$outfile <<_______EOF
--#define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
--#define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
--#define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
--#define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
--_______EOF
-- done
-
-- cat >>$outfile <<_______EOF
- #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
- #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
- #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
-@@ -46526,7 +46536,11 @@
- #define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val))
- #define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val))
- #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
--#define G_BYTE_ORDER $g_byte_order
-+#ifdef __BIG_ENDIAN__
-+#define G_BYTE_ORDER G_BIG_ENDIAN
-+#else
-+#define G_BYTE_ORDER G_LITTLE_ENDIAN
-+#endif
-
- #define GLIB_SYSDEF_POLLIN =$g_pollin
- #define GLIB_SYSDEF_POLLOUT =$g_pollout
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090220/fd6ec971/attachment.html>
More information about the macports-changes
mailing list