[70088] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Thu Jul 29 11:49:19 PDT 2010
Revision: 70088
http://trac.macports.org/changeset/70088
Author: ryandesign at macports.org
Date: 2010-07-29 11:49:18 -0700 (Thu, 29 Jul 2010)
Log Message:
-----------
glib2-devel: update to 2.25.12
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
Added Paths:
-----------
trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff
Removed Paths:
-------------
trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff
trunk/dports/devel/glib2-devel/files/patch-configure.in.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2010-07-29 18:11:14 UTC (rev 70087)
+++ trunk/dports/devel/glib2-devel/Portfile 2010-07-29 18:49:18 UTC (rev 70088)
@@ -6,7 +6,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.25.11
+version 2.25.12
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign
@@ -27,14 +27,13 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums md5 19f76d17ca65f70f9b36daf8b1e57673 \
- sha1 3794dac04e4a4c5dabf2452d1d7e98b3d0c83edb \
- rmd160 a949384227eaa7491c2fa903d84771ea3be00215
+checksums md5 c709d78fb794e0ec2090cd41dfee244a \
+ sha1 d6f61c562cd7e3afbf4bf8bc17212f62156c1ff4 \
+ rmd160 764b875d1c0cedb0eb8f2d22955f2338003f22d4
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See http://trac.macports.org/changeset/27148
-patchfiles patch-configure.in.diff \
- patch-configure.in-dtrace.diff \
+patchfiles patch-configure.ac.diff \
patch-glib-2.0.pc.in.diff \
patch-glib_gunicollate.c.diff \
patch-gi18n.h.diff \
Copied: trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff (from rev 70086, trunk/dports/devel/glib2-devel/files/patch-configure.in.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff 2010-07-29 18:49:18 UTC (rev 70088)
@@ -0,0 +1,238 @@
+--- configure.ac.orig 2010-07-27 00:31:41.000000000 -0500
++++ configure.ac 2010-07-29 13:30:43.000000000 -0500
+@@ -3000,18 +3000,32 @@
+ cat >>$outfile <<_______EOF
+ #define G_HAVE_GINT64 1 /* deprecated, always true */
+
+-${glib_extension}typedef signed $gint64 gint64;
+-${glib_extension}typedef unsigned $gint64 guint64;
++#ifdef __LP64__
++${glib_extension}typedef signed long gint64;
++${glib_extension}typedef unsigned long guint64;
+
+-#define G_GINT64_CONSTANT(val) $gint64_constant
+-#define G_GUINT64_CONSTANT(val) $guint64_constant
++#define G_GINT64_CONSTANT(val) (val##L)
++#define G_GUINT64_CONSTANT(val) (val##UL)
++#else
++${glib_extension}typedef signed long long gint64;
++${glib_extension}typedef unsigned long long guint64;
++
++#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
++#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
++#endif
+ _______EOF
+
+ if test x$gint64_format != x ; then
+ cat >>$outfile <<_______EOF
+-#define G_GINT64_MODIFIER $gint64_modifier
+-#define G_GINT64_FORMAT $gint64_format
+-#define G_GUINT64_FORMAT $guint64_format
++#ifdef __LP64__
++#define G_GINT64_MODIFIER "l"
++#define G_GINT64_FORMAT "li"
++#define G_GUINT64_FORMAT "lu"
++#else
++#define G_GINT64_MODIFIER "ll"
++#define G_GINT64_FORMAT "lli"
++#define G_GUINT64_FORMAT "llu"
++#endif
+ _______EOF
+ else
+ cat >>$outfile <<_______EOF
+@@ -3023,9 +3037,15 @@
+
+ cat >>$outfile <<_______EOF
+
+-#define GLIB_SIZEOF_VOID_P $glib_void_p
+-#define GLIB_SIZEOF_LONG $glib_long
+-#define GLIB_SIZEOF_SIZE_T $glib_size_t
++#ifdef __LP64__
++#define GLIB_SIZEOF_VOID_P 8
++#define GLIB_SIZEOF_LONG 8
++#define GLIB_SIZEOF_SIZE_T 8
++#else
++#define GLIB_SIZEOF_VOID_P 4
++#define GLIB_SIZEOF_LONG 4
++#define GLIB_SIZEOF_SIZE_T 4
++#endif
+
+ _______EOF
+
+@@ -3053,18 +3073,33 @@
+ if test -z "$glib_unknown_void_p"; then
+ cat >>$outfile <<_______EOF
+
+-#define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
+-#define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
++#ifdef __LP64__
++#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
++#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
++
++#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
++#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
++
++typedef signed long gintptr;
++typedef unsigned long guintptr;
++
++#define G_GINTPTR_MODIFIER "l"
++#define G_GINTPTR_FORMAT "li"
++#define G_GUINTPTR_FORMAT "lu"
++#else
++#define GPOINTER_TO_INT(p) ((gint) (p))
++#define GPOINTER_TO_UINT(p) ((guint) (p))
+
+-#define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
+-#define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
++#define GINT_TO_POINTER(i) ((gpointer) (i))
++#define GUINT_TO_POINTER(u) ((gpointer) (u))
+
+-typedef signed $glib_intptr_type_define gintptr;
+-typedef unsigned $glib_intptr_type_define guintptr;
++typedef signed int gintptr;
++typedef unsigned int guintptr;
+
+-#define G_GINTPTR_MODIFIER $gintptr_modifier
+-#define G_GINTPTR_FORMAT $gintptr_format
+-#define G_GUINTPTR_FORMAT $guintptr_format
++#define G_GINTPTR_MODIFIER ""
++#define G_GINTPTR_FORMAT "i"
++#define G_GUINTPTR_FORMAT "u"
++#endif
+ _______EOF
+ else
+ echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
+@@ -3180,13 +3215,29 @@
+ {
+ struct _GMutex *runtime_mutex;
+ union {
+- char pad[[$g_mutex_sizeof]];
++#ifdef __LP64__
++ char pad[[64]];
++#else
++ char pad[[44]];
++#endif
+ double dummy_double;
+ void *dummy_pointer;
+ long dummy_long;
+ } static_mutex;
+ };
+-#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
++#ifdef __LP64__
++#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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
++#endif
++#else
++#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
++#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)))
+@@ -3210,7 +3261,11 @@
+ typedef union _GSystemThread GSystemThread;
+ union _GSystemThread
+ {
+- char data[[$g_system_thread_sizeof]];
++#ifdef __LP64__
++ char data[[8]];
++#else
++ char data[[4]];
++#endif
+ double dummy_double;
+ void *dummy_pointer;
+ long dummy_long;
+@@ -3218,34 +3273,61 @@
+ _______EOF
+ if test x"$g_memory_barrier_needed" != xno; then
+ echo >>$outfile
++ echo "#ifdef __BIG_ENDIAN__" >>$outfile
+ echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
++ echo "#endif" >>$outfile
+ fi
+
+ 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))
++#ifdef __BIG_ENDIAN__
++#define GINT${bits}_TO_BE(val) ((gint${bits}) (val))
++#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
++#define GINT${bits}_TO_LE(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
++#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
++#else
++#define GINT${bits}_TO_LE(val) ((gint${bits}) (val))
++#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
++#define GINT${bits}_TO_BE(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
++#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
++#endif
+ _______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))
+-#define GULONG_TO_BE(val) ((gulong) GUINT${glongbits}_TO_BE (val))
++#ifdef __LP64__
++#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
++#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
++#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
++#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
++#else
++#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
++#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val))
++#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
++#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
++#endif
+ #define GINT_TO_LE(val) ((gint) GINT${gintbits}_TO_LE (val))
+ #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 GSIZE_TO_LE(val) ((gsize) GUINT${gsizebits}_TO_LE (val))
+-#define GSSIZE_TO_LE(val) ((gssize) GINT${gsizebits}_TO_LE (val))
+-#define GSIZE_TO_BE(val) ((gsize) GUINT${gsizebits}_TO_BE (val))
+-#define GSSIZE_TO_BE(val) ((gssize) GINT${gsizebits}_TO_BE (val))
+-#define G_BYTE_ORDER $g_byte_order
++#ifdef __LP64__
++#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
++#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
++#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
++#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
++#else
++#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val))
++#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val))
++#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val))
++#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val))
++#endif
++#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
+@@ -3530,10 +3612,10 @@
+ *) glib_vacopy=''
+ esac
+
+-if test x$glib_cv_va_val_copy = xno; then
+ glib_vacopy="\$glib_vacopy
+-#define G_VA_COPY_AS_ARRAY 1"
+-fi
++#ifdef __LP64__
++#define G_VA_COPY_AS_ARRAY 1
++#endif"
+
+ if test x$glib_cv_hasinline = xyes; then
+ glib_inline='#define G_HAVE_INLINE 1'
Deleted: trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff 2010-07-29 18:11:14 UTC (rev 70087)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff 2010-07-29 18:49:18 UTC (rev 70088)
@@ -1,43 +0,0 @@
-From: Colin Walters <walters at verbum.org>
-Date: Fri, 25 Jun 2010 09:37:06 -0400
-Subject: [PATCH] Don't attempt to build dtrace support on OS X
-
-Apparently the OS X "dtrace" command is different from the Sun one,
-which is what Linux supports. Since I don't have access to an OS X
-machine to test build patches on, simply disable dtrace on OS X
-for now.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=622697
---- configure.in.orig
-+++ configure.in
-@@ -2789,17 +2789,21 @@ AC_ARG_ENABLE([dtrace],
- have_dtrace=no
- AC_MSG_CHECKING([whether to include dtrace tracing support])
- if test "x$enable_dtrace" != xno; then
-- AC_MSG_RESULT([yes])
-- AC_CHECK_PROGS(DTRACE, dtrace)
-- if test -z "$DTRACE"; then
-- if test "x$enable_dtrace" = xyes; then
-- AC_MSG_ERROR([dtrace not found])
-+ if test x$glib_have_carbon = xyes; then
-+ AC_MSG_RESULT([no (not yet compatible with MacOS dtrace)])
-+ else
-+ AC_MSG_RESULT([yes])
-+ AC_CHECK_PROGS(DTRACE, dtrace)
-+ if test -z "$DTRACE"; then
-+ if test "x$enable_dtrace" = xyes; then
-+ AC_MSG_ERROR([dtrace not found])
-+ fi
- fi
-+ AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
-+ [if test "x$enable_dtrace" = xyes; then
-+ AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
-+ fi])
- fi
-- AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
-- [if test "x$enable_dtrace" = xyes; then
-- AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
-- fi])
- else
- AC_MSG_RESULT([no])
- fi
Deleted: trunk/dports/devel/glib2-devel/files/patch-configure.in.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.in.diff 2010-07-29 18:11:14 UTC (rev 70087)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.in.diff 2010-07-29 18:49:18 UTC (rev 70088)
@@ -1,238 +0,0 @@
---- configure.in.orig 2010-05-02 18:58:58.000000000 -0500
-+++ configure.in 2010-05-15 02:31:32.000000000 -0500
-@@ -2871,18 +2871,32 @@
- cat >>$outfile <<_______EOF
- #define G_HAVE_GINT64 1 /* deprecated, always true */
-
--${glib_extension}typedef signed $gint64 gint64;
--${glib_extension}typedef unsigned $gint64 guint64;
-+#ifdef __LP64__
-+${glib_extension}typedef signed long gint64;
-+${glib_extension}typedef unsigned long guint64;
-
--#define G_GINT64_CONSTANT(val) $gint64_constant
--#define G_GUINT64_CONSTANT(val) $guint64_constant
-+#define G_GINT64_CONSTANT(val) (val##L)
-+#define G_GUINT64_CONSTANT(val) (val##UL)
-+#else
-+${glib_extension}typedef signed long long gint64;
-+${glib_extension}typedef unsigned long long guint64;
-+
-+#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
-+#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
-+#endif
- _______EOF
-
- if test x$gint64_format != x ; then
- cat >>$outfile <<_______EOF
--#define G_GINT64_MODIFIER $gint64_modifier
--#define G_GINT64_FORMAT $gint64_format
--#define G_GUINT64_FORMAT $guint64_format
-+#ifdef __LP64__
-+#define G_GINT64_MODIFIER "l"
-+#define G_GINT64_FORMAT "li"
-+#define G_GUINT64_FORMAT "lu"
-+#else
-+#define G_GINT64_MODIFIER "ll"
-+#define G_GINT64_FORMAT "lli"
-+#define G_GUINT64_FORMAT "llu"
-+#endif
- _______EOF
- else
- cat >>$outfile <<_______EOF
-@@ -2894,9 +2908,15 @@
-
- cat >>$outfile <<_______EOF
-
--#define GLIB_SIZEOF_VOID_P $glib_void_p
--#define GLIB_SIZEOF_LONG $glib_long
--#define GLIB_SIZEOF_SIZE_T $glib_size_t
-+#ifdef __LP64__
-+#define GLIB_SIZEOF_VOID_P 8
-+#define GLIB_SIZEOF_LONG 8
-+#define GLIB_SIZEOF_SIZE_T 8
-+#else
-+#define GLIB_SIZEOF_VOID_P 4
-+#define GLIB_SIZEOF_LONG 4
-+#define GLIB_SIZEOF_SIZE_T 4
-+#endif
-
- _______EOF
-
-@@ -2924,18 +2944,33 @@
- if test -z "$glib_unknown_void_p"; then
- cat >>$outfile <<_______EOF
-
--#define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
--#define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
-+#ifdef __LP64__
-+#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
-+#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
-+
-+#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
-+#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
-+
-+typedef signed long gintptr;
-+typedef unsigned long guintptr;
-+
-+#define G_GINTPTR_MODIFIER "l"
-+#define G_GINTPTR_FORMAT "li"
-+#define G_GUINTPTR_FORMAT "lu"
-+#else
-+#define GPOINTER_TO_INT(p) ((gint) (p))
-+#define GPOINTER_TO_UINT(p) ((guint) (p))
-
--#define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
--#define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
-+#define GINT_TO_POINTER(i) ((gpointer) (i))
-+#define GUINT_TO_POINTER(u) ((gpointer) (u))
-
--typedef signed $glib_intptr_type_define gintptr;
--typedef unsigned $glib_intptr_type_define guintptr;
-+typedef signed int gintptr;
-+typedef unsigned int guintptr;
-
--#define G_GINTPTR_MODIFIER $gintptr_modifier
--#define G_GINTPTR_FORMAT $gintptr_format
--#define G_GUINTPTR_FORMAT $guintptr_format
-+#define G_GINTPTR_MODIFIER ""
-+#define G_GINTPTR_FORMAT "i"
-+#define G_GUINTPTR_FORMAT "u"
-+#endif
- _______EOF
- else
- echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -3051,13 +3086,29 @@
- {
- struct _GMutex *runtime_mutex;
- union {
-- char pad[[$g_mutex_sizeof]];
-+#ifdef __LP64__
-+ char pad[[64]];
-+#else
-+ char pad[[44]];
-+#endif
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
- } static_mutex;
- };
--#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
-+#ifdef __LP64__
-+#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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#endif
-+#else
-+#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
-+#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)))
-@@ -3081,7 +3132,11 @@
- typedef union _GSystemThread GSystemThread;
- union _GSystemThread
- {
-- char data[[$g_system_thread_sizeof]];
-+#ifdef __LP64__
-+ char data[[8]];
-+#else
-+ char data[[4]];
-+#endif
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
-@@ -3089,34 +3144,61 @@
- _______EOF
- if test x"$g_memory_barrier_needed" != xno; then
- echo >>$outfile
-+ echo "#ifdef __BIG_ENDIAN__" >>$outfile
- echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
-+ echo "#endif" >>$outfile
- fi
-
- 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))
-+#ifdef __BIG_ENDIAN__
-+#define GINT${bits}_TO_BE(val) ((gint${bits}) (val))
-+#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
-+#define GINT${bits}_TO_LE(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
-+#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
-+#else
-+#define GINT${bits}_TO_LE(val) ((gint${bits}) (val))
-+#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
-+#define GINT${bits}_TO_BE(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
-+#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
-+#endif
- _______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))
--#define GULONG_TO_BE(val) ((gulong) GUINT${glongbits}_TO_BE (val))
-+#ifdef __LP64__
-+#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
-+#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
-+#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
-+#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
-+#else
-+#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
-+#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val))
-+#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
-+#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
-+#endif
- #define GINT_TO_LE(val) ((gint) GINT${gintbits}_TO_LE (val))
- #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 GSIZE_TO_LE(val) ((gsize) GUINT${gsizebits}_TO_LE (val))
--#define GSSIZE_TO_LE(val) ((gssize) GINT${gsizebits}_TO_LE (val))
--#define GSIZE_TO_BE(val) ((gsize) GUINT${gsizebits}_TO_BE (val))
--#define GSSIZE_TO_BE(val) ((gssize) GINT${gsizebits}_TO_BE (val))
--#define G_BYTE_ORDER $g_byte_order
-+#ifdef __LP64__
-+#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
-+#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
-+#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
-+#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
-+#else
-+#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val))
-+#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val))
-+#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val))
-+#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val))
-+#endif
-+#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
-@@ -3401,10 +3483,10 @@
- *) glib_vacopy=''
- esac
-
--if test x$glib_cv_va_val_copy = xno; then
- glib_vacopy="\$glib_vacopy
--#define G_VA_COPY_AS_ARRAY 1"
--fi
-+#ifdef __LP64__
-+#define G_VA_COPY_AS_ARRAY 1
-+#endif"
-
- if test x$glib_cv_hasinline = xyes; then
- glib_inline='#define G_HAVE_INLINE 1'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100729/4fac7088/attachment-0001.html>
More information about the macports-changes
mailing list