[81852] trunk/dports/devel/dbus/Portfile

[dports at macports.org]

Revision: 81852
          http://trac.macports.org/changeset/81852
Author:   dports at macports.org
Date:     2011-08-05 20:28:51 -0700 (Fri, 05 Aug 2011)
Log Message:
-----------
dbus: disable tests unless the +test variant is specified, because the
tests link against dbus-glib which depends on this port. Fixes
universal build when non-universal dbus-glib is installed (#30088; see
also #30409)

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

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2011-08-06 01:21:39 UTC (rev 81851)
+++ trunk/dports/devel/dbus/Portfile	2011-08-06 03:28:51 UTC (rev 81852)
@@ -43,7 +43,8 @@
                 --enable-launchd \
                 --with-launchd-agent-dir=${prefix}/Library/LaunchAgents \
                 --with-session-socket-dir=/tmp \
-                --with-test-socket-dir=/tmp
+                --with-test-socket-dir=/tmp \
+                --disable-tests
 
 pre-configure {
     # Value must be set in pre-configure because dbus_user may change in variant.
@@ -61,11 +62,6 @@
     }
 }
 
-platform darwin 11 {
-    configure.args-append    --disable-tests
-}
-
-
 use_parallel_build  yes
 
 test.run        yes
@@ -166,7 +162,10 @@
     }
 }
 
+# XXX Building with tests enabled causes dbus to link with dbus-glib,
+# which it shouldn't do because that port depends on this one: see #30088
 variant test description {enable tests} {
+    configure.args-delete   --disable-tests
     configure.args-append   --enable-tests
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110805/dedaa0e9/attachment.html>