[45262] trunk/dports/devel/dbus

[jmr at macports.org]

Revision: 45262
          http://trac.macports.org/changeset/45262
Author:   jmr at macports.org
Date:     2009-01-12 04:44:50 -0800 (Mon, 12 Jan 2009)
Log Message:
-----------
dbus: fix 4-way universal issues, and remove obsolete cflag '-no-cpp-precomp'

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

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

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-01-12 12:20:14 UTC (rev 45261)
+++ trunk/dports/devel/dbus/Portfile	2009-01-12 12:44:50 UTC (rev 45262)
@@ -23,7 +23,8 @@
 
                 
 patchfiles      patch-dbus-sysdeps-unix.c.diff \
-                patch-launchd-integration-dist.diff
+                patch-launchd-integration-dist.diff \
+                patch-configure-int64.diff
 
 depends_build   port:pkgconfig
 
@@ -33,9 +34,13 @@
                 --disable-xml-docs \
                 --without-x \
                 --enable-launchd
-    
-configure.cflags-append -no-cpp-precomp
 
+post-configure {
+    if {[variant_isset universal] && [lsearch -glob ${universal_archs} *64] != -1} {
+        system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config.h.diff"
+    }
+}
+
 platform darwin 7 {
     patchfiles              patch-dbus-launch-x11.c.diff \
                             patch-dbus-sysdeps-util-unix.c.diff

Added: trunk/dports/devel/dbus/files/patch-config.h.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-config.h.diff	                        (rev 0)
+++ trunk/dports/devel/dbus/files/patch-config.h.diff	2009-01-12 12:44:50 UTC (rev 45262)
@@ -0,0 +1,26 @@
+--- config.h.orig	2009-01-12 23:33:36.000000000 +1100
++++ config.h	2009-01-12 23:36:33.000000000 +1100
+@@ -287,7 +287,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
+@@ -296,7 +300,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/files/patch-configure-int64.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-configure-int64.diff	                        (rev 0)
+++ trunk/dports/devel/dbus/files/patch-configure-int64.diff	2009-01-12 12:44:50 UTC (rev 45262)
@@ -0,0 +1,26 @@
+--- configure.orig	2009-01-12 23:27:10.000000000 +1100
++++ configure	2009-01-12 23:31:09.000000000 +1100
+@@ -23652,6 +23652,11 @@
+ $as_echo_n "checking 64-bit integer type... " >&6; }
+ 
+ case 8 in
++$ac_cv_sizeof_long_long)
++  dbusint64='long long'
++  dbusint64_constant='(val##LL)'
++  dbusuint64_constant='(val##ULL)'
++  ;;
+ $ac_cv_sizeof_int)
+   dbusint64=int
+   dbusint64_constant='(val)'
+@@ -23662,11 +23667,6 @@
+   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___int64)
+   dbusint64=__int64
+   dbusint64_constant='(val##i64)'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090112/8c6b7f34/attachment-0001.html>