diff options
Diffstat (limited to 'dev-libs/dbus-glib')
| -rw-r--r-- | dev-libs/dbus-glib/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/dbus-glib/dbus-glib-0.78.ebuild | 8 | ||||
| -rw-r--r-- | dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch | 2 | ||||
| -rw-r--r-- | dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch | 58 |
4 files changed, 72 insertions, 4 deletions
diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog index f5c6fdb4aab5..a4b3bccb841a 100644 --- a/dev-libs/dbus-glib/ChangeLog +++ b/dev-libs/dbus-glib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/dbus-glib # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.44 2008/12/27 16:05:59 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.45 2008/12/30 19:18:01 cardoe Exp $ + + 30 Dec 2008; Doug Goldstein <cardoe@gentoo.org> + files/dbus-glib-0.78-as-needed.patch, + +files/dbus-glib-0.78-fix-building-tests.patch, dbus-glib-0.78.ebuild: + fix building tests in parallel make situations. upstream bug #19325. + Update --as-needed patch to follow upstream's patch. 27 Dec 2008; Doug Goldstein <cardoe@gentoo.org> dbus-glib-0.78.ebuild: add gtk-doc-am to DEPEND so that automake successfully runs diff --git a/dev-libs/dbus-glib/dbus-glib-0.78.ebuild b/dev-libs/dbus-glib/dbus-glib-0.78.ebuild index d17c9854ebe6..709ecb50f0ef 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.78.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.78.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.78.ebuild,v 1.2 2008/12/27 16:05:59 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.78.ebuild,v 1.3 2008/12/30 19:18:01 cardoe Exp $ inherit eutils multilib autotools bash-completion @@ -30,6 +30,10 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-introspection.patch epatch "${FILESDIR}"/${P}-as-needed.patch + + # submitted upstream to bug #19325 + epatch "${FILESDIR}"/${P}-fix-building-tests.patch + eautoreconf } @@ -41,7 +45,7 @@ src_compile() { $(use_enable debug checks) \ $(use_enable debug asserts) \ $(use_enable test tests) \ - $(use_with test test-socket-dir ${T}/dbus-test-socket) \ + $(use_with test test-socket-dir "${T}"/dbus-test-socket) \ --with-system-pid-file=/var/run/dbus.pid \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-session-socket-dir=/tmp \ diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch b/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch index 01b92968f03e..b7b24083f394 100644 --- a/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch +++ b/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch @@ -6,7 +6,7 @@ diff -ur dbus-glib-0.78.orig/dbus/Makefile.am dbus-glib-0.78/dbus/Makefile.am dbus_bash_completion_helper_SOURCES = \ dbus-bash-completion-helper.c -dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la -+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat ++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch b/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch new file mode 100644 index 000000000000..081c9daf84d4 --- /dev/null +++ b/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch @@ -0,0 +1,58 @@ +From 0cec05aa65a4803b0217f35af539ee2369903364 Mon Sep 17 00:00:00 2001 +From: Doug Goldstein <cardoe@gentoo.org> +Date: Tue, 30 Dec 2008 14:10:15 -0500 +Subject: [PATCH] fix building of tests + +Fix parallel make issues when building tests. Additionally fixes +potential cases where the test can be built against the system copy +instead of the currently building copy of libdbus-glib. Fix convenience +library linking against expat so it builds. + +Signed-off-by: Doug Goldstein <cardoe@gentoo.org> +--- + dbus/Makefile.am | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/dbus/Makefile.am b/dbus/Makefile.am +index 5998587..c6c9ebf 100644 +--- a/dbus/Makefile.am ++++ b/dbus/Makefile.am +@@ -72,7 +72,7 @@ libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ + dbus-gparser.c \ + dbus-gparser.h + +-libdbus_gtool_la_LIBADD = $(DBUS_LIBS) ++libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat + + bin_PROGRAMS=dbus-binding-tool + +@@ -82,7 +82,7 @@ dbus_binding_tool_SOURCES = \ + dbus-glib-tool.h \ + dbus-glib-tool.c + +-dbus_binding_tool_LDADD= libdbus-gtool.la libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat ++dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat + + ## we just rebuilt these manually and check them into cvs; easier than + ## convincing automake/make to do this properly +@@ -104,7 +104,7 @@ CLEANFILES += dbus-bash-completion.sh + + dbus_bash_completion_helper_SOURCES = \ + dbus-bash-completion-helper.c +-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la ++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la + + + EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in +@@ -126,7 +126,7 @@ TESTS=dbus-glib-test + dbus_glib_test_SOURCES= \ + dbus-gtest-main.c + +-dbus_glib_test_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la ++dbus_glib_test_LDADD= $(builddir)/libdbus-glib-1.la + + else + ### not building tests +-- +1.6.0.6 + |