[49135] trunk/dports/devel/glib2/files
mcalhoun at macports.org
mcalhoun at macports.org
Fri Apr 3 23:58:08 PDT 2009
Revision: 49135
http://trac.macports.org/changeset/49135
Author: mcalhoun at macports.org
Date: 2009-04-03 23:58:08 -0700 (Fri, 03 Apr 2009)
Log Message:
-----------
glib2: Remove patchfiles not in Portfile since r49132.
Removed Paths:
-------------
trunk/dports/devel/glib2/files/patch-configure.diff
trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff
trunk/dports/devel/glib2/files/patch-gutils.c.diff
Deleted: trunk/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.diff 2009-04-04 06:54:47 UTC (rev 49134)
+++ trunk/dports/devel/glib2/files/patch-configure.diff 2009-04-04 06:58:08 UTC (rev 49135)
@@ -1,147 +0,0 @@
---- configure.orig 2008-11-23 23:50:01.000000000 -0600
-+++ configure 2008-11-25 23:59:29.000000000 -0600
-@@ -28314,28 +28314,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
-@@ -39435,7 +39418,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
-
-
-@@ -46181,10 +46168,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
-@@ -46233,7 +46223,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*) ((mutex)->static_mutex.pad)) : \\
- g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -46262,24 +46257,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))
-@@ -46288,7 +46298,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
Deleted: trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff 2009-04-04 06:54:47 UTC (rev 49134)
+++ trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff 2009-04-04 06:58:08 UTC (rev 49135)
@@ -1,11 +0,0 @@
---- glib/gutils.h.orig 2007-10-16 07:44:49.000000000 +0200
-+++ glib/gutils.h 2007-10-31 12:05:46.000000000 +0100
-@@ -96,6 +96,8 @@ G_BEGIN_DECLS
- #ifdef G_IMPLEMENT_INLINES
- # define G_INLINE_FUNC
- # undef G_CAN_INLINE
-+#elif defined (__APPLE__)
-+# define G_INLINE_FUNC static inline
- #elif defined (__GNUC__)
- # define G_INLINE_FUNC extern inline
- #elif defined (G_CAN_INLINE)
Deleted: trunk/dports/devel/glib2/files/patch-gutils.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gutils.c.diff 2009-04-04 06:54:47 UTC (rev 49134)
+++ trunk/dports/devel/glib2/files/patch-gutils.c.diff 2009-04-04 06:58:08 UTC (rev 49135)
@@ -1,10 +0,0 @@
---- glib/gutils.c.orig 2008-11-23 23:45:23.000000000 -0600
-+++ glib/gutils.c 2008-11-25 23:59:30.000000000 -0600
-@@ -51,6 +51,7 @@
- #endif
- #ifdef HAVE_CRT_EXTERNS_H
- #include <crt_externs.h> /* for _NSGetEnviron */
-+#define HAVE__NSGETENVIRON
- #endif
-
- /* implement gutils's inline functions
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090403/da0c2808/attachment-0001.html>
More information about the macports-changes
mailing list