[45261] trunk/dports/devel/dbus-glib

[jmr at macports.org]

Revision: 45261
          http://trac.macports.org/changeset/45261
Author:   jmr at macports.org
Date:     2009-01-12 04:20:14 -0800 (Mon, 12 Jan 2009)
Log Message:
-----------
dbus-glib: 4-way universal fixes

Modified Paths:
--------------
    trunk/dports/devel/dbus-glib/Portfile

Added Paths:
-----------
    trunk/dports/devel/dbus-glib/files/
    trunk/dports/devel/dbus-glib/files/config.h.diff
    trunk/dports/devel/dbus-glib/files/patch-configure.diff

Modified: trunk/dports/devel/dbus-glib/Portfile
===================================================================
--- trunk/dports/devel/dbus-glib/Portfile	2009-01-12 10:58:00 UTC (rev 45260)
+++ trunk/dports/devel/dbus-glib/Portfile	2009-01-12 12:20:14 UTC (rev 45261)
@@ -28,7 +28,14 @@
                 port:dbus \
                 port:gettext
 
+patchfiles      patch-configure.diff
+
 configure.args  --disable-doxygen-docs
+post-configure {
+    if {[variant_isset universal] && [lsearch -glob ${universal_archs} *64] != -1} {
+        system "cd ${worksrcpath} && patch -p0 < ${filespath}/config.h.diff"
+    }
+}
 
 test.run        yes
 test.target     check

Added: trunk/dports/devel/dbus-glib/files/config.h.diff
===================================================================
--- trunk/dports/devel/dbus-glib/files/config.h.diff	                        (rev 0)
+++ trunk/dports/devel/dbus-glib/files/config.h.diff	2009-01-12 12:20:14 UTC (rev 45261)
@@ -0,0 +1,26 @@
+--- config.h.orig	2009-01-12 22:52:59.000000000 +1100
++++ config.h	2009-01-12 23:01:07.000000000 +1100
+@@ -194,7 +194,11 @@
+ #define SIZEOF_INT 4
+ 
+ /* The size of `long', as computed by sizeof. */
++#ifdef __LP64__
+ #define SIZEOF_LONG 8
++#else
++#define SIZEOF_LONG 4
++#endif
+ 
+ /* The size of `long long', as computed by sizeof. */
+ #define SIZEOF_LONG_LONG 8
+@@ -203,7 +207,11 @@
+ #define SIZEOF_SHORT 2
+ 
+ /* The size of `void *', as computed by sizeof. */
++#ifdef __LP64__
+ #define SIZEOF_VOID_P 8
++#else
++#define SIZEOF_VOID_P 4
++#endif
+ 
+ /* The size of `__int64', as computed by sizeof. */
+ #define SIZEOF___INT64 0

Added: trunk/dports/devel/dbus-glib/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/dbus-glib/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/dbus-glib/files/patch-configure.diff	2009-01-12 12:20:14 UTC (rev 45261)
@@ -0,0 +1,24 @@
+--- configure.orig	2008-12-05 07:52:18.000000000 +1100
++++ configure	2009-01-12 23:12:39.000000000 +1100
+@@ -23135,16 +23135,16 @@
+   dbusint64_constant='(val)'
+   dbusuint64_constant='(val)'
+   ;;
+-$ac_cv_sizeof_long)
+-  dbusint64=long
+-  dbusint64_constant='(val##L)'
+-  dbusuint64_constant='(val##UL)'
+-  ;;
+ $ac_cv_sizeof_long_long)
+   dbusint64='long long'
+   dbusint64_constant='(val##LL)'
+   dbusuint64_constant='(val##ULL)'
+   ;;
++$ac_cv_sizeof_long)
++  dbusint64=long
++  dbusint64_constant='(val##L)'
++  dbusuint64_constant='(val##UL)'
++  ;;
+ $ac_cv_sizeof___int64)
+   dbusint64=__int64
+   dbusint64_constant='(val##i64)'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090112/9930c4eb/attachment.html>