[79309] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Wed Jun 8 18:03:40 PDT 2011
Revision: 79309
http://trac.macports.org/changeset/79309
Author: ryandesign at macports.org
Date: 2011-06-08 18:03:39 -0700 (Wed, 08 Jun 2011)
Log Message:
-----------
glib2-devel: update to 2.29.6
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff
Added Paths:
-----------
trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff
Removed Paths:
-------------
trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2011-06-09 00:54:24 UTC (rev 79308)
+++ trunk/dports/devel/glib2-devel/Portfile 2011-06-09 01:03:39 UTC (rev 79309)
@@ -7,8 +7,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.29.4
-revision 1
+version 2.29.6
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -29,13 +28,14 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums sha1 9cf943d611de84df7ebcf46a2492adb71f75a125 \
- rmd160 3006ee1ad11a050279d177f0910326d88529cf1f
+checksums sha1 173d6f5fea773c99b03336438db415c155e3316c \
+ rmd160 45153972fd960a9efc982dd0265eb06f3cce855a
# ${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.ac.diff \
patch-glib-2.0.pc.in.diff \
+ patch-glib_gbitlock.c.diff \
patch-glib_gunicollate.c.diff \
patch-gi18n.h.diff \
patch-gio_xdgmime_xdgmime.c.diff \
@@ -85,10 +85,6 @@
system "ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"
}
-platform darwin {
- patchfiles-append patch-child-test.c.diff
-}
-
build.args V=1
test.run yes
Deleted: trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff 2011-06-09 00:54:24 UTC (rev 79308)
+++ trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff 2011-06-09 01:03:39 UTC (rev 79309)
@@ -1,11 +0,0 @@
---- tests/child-test.c 2008-11-23 23:45:21.000000000 -0600
-+++ tests/child-test.c 2008-11-28 16:30:29.000000000 -0600
-@@ -175,7 +175,7 @@
- #ifdef G_OS_WIN32
- system ("ipconfig /all");
- #else
-- system ("/bin/true");
-+ system ("/usr/bin/true");
- #endif
-
- alive = 2;
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff 2011-06-09 00:54:24 UTC (rev 79308)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.ac.diff 2011-06-09 01:03:39 UTC (rev 79309)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2011-05-04 13:53:01.000000000 -0500
-+++ configure.ac 2011-05-06 01:45:28.000000000 -0500
-@@ -3036,18 +3036,32 @@
+--- configure.ac.orig 2011-06-04 18:05:51.000000000 -0500
++++ configure.ac 2011-06-05 18:35:38.000000000 -0500
+@@ -3031,18 +3031,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -40,7 +40,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -3059,9 +3073,15 @@
+@@ -3054,9 +3068,15 @@
cat >>$outfile <<_______EOF
@@ -59,7 +59,7 @@
_______EOF
-@@ -3089,18 +3109,33 @@
+@@ -3084,18 +3104,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -102,7 +102,7 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -3216,13 +3251,29 @@
+@@ -3211,13 +3246,29 @@
{
struct _GMutex *runtime_mutex;
union {
@@ -134,7 +134,7 @@
#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)))
-@@ -3246,7 +3297,11 @@
+@@ -3241,7 +3292,11 @@
typedef union _GSystemThread GSystemThread;
union _GSystemThread
{
@@ -147,7 +147,7 @@
double dummy_double;
void *dummy_pointer;
long dummy_long;
-@@ -3254,34 +3309,61 @@
+@@ -3249,7 +3304,9 @@
_______EOF
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -155,8 +155,9 @@
echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
+ echo "#endif" >>$outfile
fi
-
- echo >>$outfile
+ if test x"$g_gcc_atomic_ops" != xno; then
+ echo >>$outfile
+@@ -3259,27 +3316,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
@@ -222,7 +223,7 @@
#define GLIB_SYSDEF_POLLIN =$g_pollin
#define GLIB_SYSDEF_POLLOUT =$g_pollout
-@@ -3566,10 +3648,10 @@
+@@ -3564,10 +3646,10 @@
*) glib_vacopy=''
esac
Added: trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-glib_gbitlock.c.diff 2011-06-09 01:03:39 UTC (rev 79309)
@@ -0,0 +1,81 @@
+From 25a9b58e586cf677e3692d4e3c679f3898fc9e59 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Wed, 8 Jun 2011 11:18:26 +0200
+Subject: [PATCH] bitlock: don't use asm goto on older gcc
+
+asm goto was addded in gcc 4.5 so don't try to use it on gcc versions
+older than this one. This is achieved by explicitly checking gcc
+version, an alternative would be to try to compile a program using
+asm volatile in configure.
+--- glib/gbitlock.c.orig
++++ glib/gbitlock.c
+@@ -181,6 +181,12 @@ g_futex_wake (const volatile gint *address)
+ #define CONTENTION_CLASSES 11
+ static volatile gint g_bit_lock_contended[CONTENTION_CLASSES];
+
++#if (defined (i386) || defined (__amd64__))
++ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
++ #define USE_ASM_GOTO 1
++ #endif
++#endif
++
+ /**
+ * g_bit_lock:
+ * @address: a pointer to an integer
+@@ -206,7 +212,7 @@ void
+ g_bit_lock (volatile gint *address,
+ gint lock_bit)
+ {
+-#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
++#ifdef USE_ASM_GOTO
+ retry:
+ asm volatile goto ("lock bts %1, (%0)\n"
+ "jc %l[contended]"
+@@ -277,7 +283,7 @@ gboolean
+ g_bit_trylock (volatile gint *address,
+ gint lock_bit)
+ {
+-#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
++#ifdef USE_ASM_GOTO
+ gboolean result;
+
+ asm volatile ("lock bts %2, (%1)\n"
+@@ -317,7 +323,7 @@ void
+ g_bit_unlock (volatile gint *address,
+ gint lock_bit)
+ {
+-#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
++#ifdef USE_ASM_GOTO
+ asm volatile ("lock btr %1, (%0)"
+ : /* no output */
+ : "r" (address), "r" (lock_bit)
+@@ -393,7 +399,7 @@ void
+ g_return_if_fail (lock_bit < 32);
+
+ {
+-#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
++#ifdef USE_ASM_GOTO
+ retry:
+ asm volatile goto ("lock bts %1, (%0)\n"
+ "jc %l[contended]"
+@@ -463,7 +469,7 @@ gboolean
+ g_return_val_if_fail (lock_bit < 32, FALSE);
+
+ {
+-#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
++#ifdef USE_ASM_GOTO
+ gboolean result;
+
+ asm volatile ("lock bts %2, (%1)\n"
+@@ -508,7 +514,7 @@ void
+ g_return_if_fail (lock_bit < 32);
+
+ {
+-#if defined (__GNUC__) && (defined (i386) || defined (__amd64__))
++#ifdef USE_ASM_GOTO
+ asm volatile ("lock btr %1, (%0)"
+ : /* no output */
+ : "r" (address), "r" ((gsize) lock_bit)
+--
+1.7.5.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110608/2112a353/attachment.html>
More information about the macports-changes
mailing list