Changeset 81852

Timestamp:

08/05/11 20:28:51 (4 years ago)

Author:

dports@…

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)

File:

• trunk/dports/devel/dbus/Portfile (modified) (3 diffs)

trunk/dports/devel/dbus/Portfile

@@ -44 +44 @@
                 --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 {
@@ -61 +62 @@
     }
 }
-
-platform darwin 11 {
-    configure.args-append    --disable-tests
-}
-
 
 use_parallel_build  yes
@@ -167 +163 @@
 }
 
+# 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
 }