Attachment 85110 Details for Bug 68852 – Add CPPFLAGS to "shared if possible" test binaries

[patch] Add CPPFLAGS to "shared if possible" test binaries

0002-Add-CPPFLAGS-to-shared-if-possible-test-binaries.patch (text/plain), 2.94 KB, created by Simon McVittie on 2013-09-03 11:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-03 11:30:09 UTC

Size: 2.94 KB

patch

obsolete

>From 55fe1ed6e80a71c69b98cff4237540caaaaca629 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 3 Sep 2013 12:16:32 +0100
>Subject: [PATCH 2/4] Add CPPFLAGS to "shared if possible" test binaries
>
>In principle we ought to define DBUS_STATIC_BUILD in anything that's
>using libdbus-internal.la (to avoid linking failures on
>statically-linked mingw builds), and DBUS_TEST_USE_INTERNAL in any
>test that's using the non-dbus-glib code paths of test-utils.[ch]
>(to avoid the GLib requirement, although in practice, everything
>"shared if possible" requires GLib at the moment anyway).
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
>---
> test/Makefile.am | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 281b3e2..405aa1c 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -39,9 +39,11 @@ libdbus_testutils_la_LIBADD = \
> 	$(GLIB_LIBS) \
> 	$(DBUS_GLIB_LIBS) \
> 	$(NULL)
>-testutils_shared_if_possible = libdbus-testutils.la
>+testutils_shared_if_possible_cppflags = $(AM_CPPFLAGS)
>+testutils_shared_if_possible_libs = libdbus-testutils.la
> else
>-testutils_shared_if_possible = libdbus-testutils-internal.la
>+testutils_shared_if_possible_cppflags = $(static_cppflags)
>+testutils_shared_if_possible_libs = libdbus-testutils-internal.la
> endif
> 
> libdbus_testutils_internal_la_CPPFLAGS = \
>@@ -160,38 +162,44 @@ TESTS_ENVIRONMENT = \
> 	$(NULL)
> 
> manual_authz_SOURCES = manual-authz.c
>+manual_authz_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
> manual_authz_LDADD = \
>-    $(testutils_shared_if_possible) \
>+    $(testutils_shared_if_possible_libs) \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
> test_corrupt_SOURCES = corrupt.c
>+test_corrupt_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
> test_corrupt_LDADD = \
>-    $(testutils_shared_if_possible) \
>+    $(testutils_shared_if_possible_libs) \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
> test_loopback_SOURCES = loopback.c
>+test_loopback_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
> test_loopback_LDADD = \
>-    $(testutils_shared_if_possible) \
>+    $(testutils_shared_if_possible_libs) \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
> test_relay_SOURCES = relay.c
>+test_relay_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
> test_relay_LDADD = \
>-    $(testutils_shared_if_possible) \
>+    $(testutils_shared_if_possible_libs) \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
> test_dbus_daemon_SOURCES = dbus-daemon.c
>+test_dbus_daemon_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
> test_dbus_daemon_LDADD = \
>-    $(testutils_shared_if_possible) \
>+    $(testutils_shared_if_possible_libs) \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
> test_dbus_daemon_eavesdrop_SOURCES = dbus-daemon-eavesdrop.c
>+test_dbus_daemon_eavesdrop_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
> test_dbus_daemon_eavesdrop_LDADD = \
>-    $(testutils_shared_if_possible) \
>+    $(testutils_shared_if_possible_libs) \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68852: 85071 | 85072 | 85073 | 85074 | 85076 | 85077 | 85082 | 85109 | 85110 | 85240 | 85604

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.