Attachment 50117 Details for Bug 40003 – [1/2] Fix linking of libdbus-testutils.la with Automake targeting Windows

[patch] [1/2] Fix linking of libdbus-testutils.la with Automake targeting Windows

0001-Fix-linking-of-libdbus-testutils.la-with-Automake-ta.patch (text/plain), 1.14 KB, created by Simon McVittie on 2011-08-11 03:39:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-08-11 03:39:16 UTC

Size: 1.14 KB

patch

obsolete

>From e2adbfa5855047b70eb03a85b9dc575386f784a7 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 5 Aug 2011 13:14:54 +0100
>Subject: [PATCH 1/3] Fix linking of libdbus-testutils.la with Automake
> targeting Windows
>
>This regressed in commit 9875480ed - libdbus-testutils.la needs static
>linking too.
>---
> test/Makefile.am |   12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 7adb823..a870d3d 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -13,6 +13,13 @@ AM_CPPFLAGS = \
> # improve backtraces from test stuff
> AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
> 
>+static_cppflags = \
>+	$(AM_CPPFLAGS) \
>+	-DDBUS_STATIC_BUILD \
>+	$(NULL)
>+
>+libdbus_testutils_la_CPPFLAGS = \
>+	$(static_cppflags)
> libdbus_testutils_la_SOURCES = \
> 	test-utils.c \
> 	test-utils.h \
>@@ -65,11 +72,6 @@ endif !DBUS_BUILD_TESTS
> 
> noinst_PROGRAMS= $(TEST_BINARIES)
> 
>-static_cppflags = \
>-	$(AM_CPPFLAGS) \
>-	-DDBUS_STATIC_BUILD \
>-	$(NULL)
>-
> test_service_CPPFLAGS = $(static_cppflags)
> test_service_LDADD = libdbus-testutils.la
> test_names_CPPFLAGS = $(static_cppflags)
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 40003: 50117 | 50118

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.