Attachment 134535 Details for Bug 103015 – dbus: Clarify why we are not just adding the resource file to SOURCES

[patch] dbus: Clarify why we are not just adding the resource file to SOURCES

0002-dbus-Clarify-why-we-are-not-just-adding-the-resource.patch (text/plain), 1.02 KB, created by Simon McVittie on 2017-09-28 12:23:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-09-28 12:23:20 UTC

Size: 1.02 KB

patch

obsolete

>From 1178f4f4f4dceb79b37e70cc109aa41a85833402 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Thu, 28 Sep 2017 13:18:11 +0100
>Subject: [PATCH 2/3] dbus: Clarify why we are not just adding the resource
> file to SOURCES
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/Makefile.am | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/dbus/Makefile.am b/dbus/Makefile.am
>index 8248e72e..064d4152 100644
>--- a/dbus/Makefile.am
>+++ b/dbus/Makefile.am
>@@ -47,12 +47,17 @@ SUFFIXES = .rc
> .rc.o:
> 	$(WINDRES) $< -o $@
> 
>+# We can't just put versioninfo.rc in SOURCES and let Automake infer
>+# how to make versioninfo.o, because libtool wants libtool objects (.lo),
>+# not plain COFF objects (.o). Add it to the linker command explicitly
>+# instead.
> dbus_res = versioninfo.o
>+EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res)
> dbus_res_ldflag = -Wl,$(dbus_res)
>+
> no_undefined = -no-undefined
> export_symbols =
> 
>-EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res)
> intllibs =
> 
> else
>-- 
>2.14.2
>

Actions: View | Splinter Review

Attachments on bug 103015: 134523 | 134534 | 134535 | 134536 | 134537 | 134544 | 134545 | 134546 | 134565 | 134695 | 134696 | 134703 | 134704 | 134716 | 134719 | 134882 | 134883 | 134885 | 134886 | 134887 | 134909 | 134910 | 134911 | 134913 | 134924

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.