| 1 |
cardoe 08/12/30 19:18:01 |
| 2 |
|
| 3 |
Modified: dbus-glib-0.78-as-needed.patch |
| 4 |
Added: dbus-glib-0.78-fix-building-tests.patch |
| 5 |
Log: |
| 6 |
fix building tests in parallel make situations. upstream bug #19325. Update --as-needed patch to follow upstream's patch. |
| 7 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: dbus-glib-0.78-as-needed.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- dbus-glib-0.78-as-needed.patch 23 Dec 2008 22:27:11 -0000 1.1 |
| 23 |
+++ dbus-glib-0.78-as-needed.patch 30 Dec 2008 19:18:01 -0000 1.2 |
| 24 |
@@ -6,7 +6,7 @@ |
| 25 |
dbus_bash_completion_helper_SOURCES = \ |
| 26 |
dbus-bash-completion-helper.c |
| 27 |
-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la |
| 28 |
-+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat |
| 29 |
++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la |
| 30 |
|
| 31 |
|
| 32 |
EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: dbus-glib-0.78-fix-building-tests.patch |
| 42 |
=================================================================== |
| 43 |
From 0cec05aa65a4803b0217f35af539ee2369903364 Mon Sep 17 00:00:00 2001 |
| 44 |
From: Doug Goldstein <cardoe@g.o> |
| 45 |
Date: Tue, 30 Dec 2008 14:10:15 -0500 |
| 46 |
Subject: [PATCH] fix building of tests |
| 47 |
|
| 48 |
Fix parallel make issues when building tests. Additionally fixes |
| 49 |
potential cases where the test can be built against the system copy |
| 50 |
instead of the currently building copy of libdbus-glib. Fix convenience |
| 51 |
library linking against expat so it builds. |
| 52 |
|
| 53 |
Signed-off-by: Doug Goldstein <cardoe@g.o> |
| 54 |
--- |
| 55 |
dbus/Makefile.am | 8 ++++---- |
| 56 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 57 |
|
| 58 |
diff --git a/dbus/Makefile.am b/dbus/Makefile.am |
| 59 |
index 5998587..c6c9ebf 100644 |
| 60 |
--- a/dbus/Makefile.am |
| 61 |
+++ b/dbus/Makefile.am |
| 62 |
@@ -72,7 +72,7 @@ libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ |
| 63 |
dbus-gparser.c \ |
| 64 |
dbus-gparser.h |
| 65 |
|
| 66 |
-libdbus_gtool_la_LIBADD = $(DBUS_LIBS) |
| 67 |
+libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat |
| 68 |
|
| 69 |
bin_PROGRAMS=dbus-binding-tool |
| 70 |
|
| 71 |
@@ -82,7 +82,7 @@ dbus_binding_tool_SOURCES = \ |
| 72 |
dbus-glib-tool.h \ |
| 73 |
dbus-glib-tool.c |
| 74 |
|
| 75 |
-dbus_binding_tool_LDADD= libdbus-gtool.la libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat |
| 76 |
+dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat |
| 77 |
|
| 78 |
## we just rebuilt these manually and check them into cvs; easier than |
| 79 |
## convincing automake/make to do this properly |
| 80 |
@@ -104,7 +104,7 @@ CLEANFILES += dbus-bash-completion.sh |
| 81 |
|
| 82 |
dbus_bash_completion_helper_SOURCES = \ |
| 83 |
dbus-bash-completion-helper.c |
| 84 |
-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la |
| 85 |
+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la |
| 86 |
|
| 87 |
|
| 88 |
EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in |
| 89 |
@@ -126,7 +126,7 @@ TESTS=dbus-glib-test |
| 90 |
dbus_glib_test_SOURCES= \ |
| 91 |
dbus-gtest-main.c |
| 92 |
|
| 93 |
-dbus_glib_test_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la |
| 94 |
+dbus_glib_test_LDADD= $(builddir)/libdbus-glib-1.la |
| 95 |
|
| 96 |
else |
| 97 |
### not building tests |
| 98 |
-- |
| 99 |
1.6.0.6 |
Archives