diff options
| author |   Angelo Arrifano <miknix@gentoo.org> | 2010-05-26 14:38:02 +0000 |
|---|---|---|
| committer | Angelo Arrifano <miknix@gentoo.org> | 2010-05-26 14:38:02 +0000 |
| commit | b9d5de2cfa8535f87ef7af4cdc542d2d122f52a7 (patch) | |
| tree | c1d4c1a7a5bc76d992c007c277b4b0eb44a6a9ba /gpe-base | |
| parent | Fix dependencies. (diff) | |
| download | gentoo-2-b9d5de2cfa8535f87ef7af4cdc542d2d122f52a7.tar.gz gentoo-2-b9d5de2cfa8535f87ef7af4cdc542d2d122f52a7.tar.bz2 gentoo-2-b9d5de2cfa8535f87ef7af4cdc542d2d122f52a7.zip | |
With USE="doc", the build scripts where trying to link
against system's eventdb instead of built one \#320035 .
This commit fixes this.
- Looks like people reads this afterall :)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'gpe-base')
| -rw-r--r-- | gpe-base/libeventdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gpe-base/libeventdb/files/libeventdb-0.90-doclinkerfix.patch | 19 | ||||
| -rw-r--r-- | gpe-base/libeventdb/libeventdb-0.90.ebuild | 7 |
3 files changed, 32 insertions, 4 deletions
diff --git a/gpe-base/libeventdb/ChangeLog b/gpe-base/libeventdb/ChangeLog index f96f0f4c0f6e..8523ae434f81 100644 --- a/gpe-base/libeventdb/ChangeLog +++ b/gpe-base/libeventdb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gpe-base/libeventdb -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/libeventdb/ChangeLog,v 1.6 2009/08/26 15:51:45 miknix Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gpe-base/libeventdb/ChangeLog,v 1.7 2010/05/26 14:38:02 miknix Exp $ + + 26 May 2010; Angelo Arrifano <miknix@gentoo.org> libeventdb-0.90.ebuild, + +files/libeventdb-0.90-doclinkerfix.patch: + With USE="doc", the build scripts where trying to link + against system's eventdb instead of built one #320035 . + This commit fixes this. 26 Aug 2009; Angelo Arrifano <miknix@gentoo.org> libeventdb-0.90.ebuild: Remove redundant IUSE expansion diff --git a/gpe-base/libeventdb/files/libeventdb-0.90-doclinkerfix.patch b/gpe-base/libeventdb/files/libeventdb-0.90-doclinkerfix.patch new file mode 100644 index 000000000000..c19b0b8d8a74 --- /dev/null +++ b/gpe-base/libeventdb/files/libeventdb-0.90-doclinkerfix.patch @@ -0,0 +1,19 @@ +--- Makefile.am.old 2010-05-26 16:20:39.707669705 +0200 ++++ Makefile.am 2010-05-26 16:20:43.684334783 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = doc ++SUBDIRS = . doc + + lib_LTLIBRARIES = libeventdb.la + +--- doc/Makefile.am.old 2010-05-26 15:56:00.021149920 +0200 ++++ doc/Makefile.am 2010-05-26 16:26:44.577631439 +0200 +@@ -33,7 +33,7 @@ + # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib + # contains GtkObjects/GObjects and you want to document signals and properties. + CFLAGS = @EVENTDB_CFLAGS@ +-LDFLAGS = @EVENTDB_LIBS@ -leventdb ++LDFLAGS = @EVENTDB_LIBS@ ../libeventdb.la + + # If you need to override some of the declarations, place them in this file + # and uncomment this line. diff --git a/gpe-base/libeventdb/libeventdb-0.90.ebuild b/gpe-base/libeventdb/libeventdb-0.90.ebuild index e3133919d98c..6c60a1529e78 100644 --- a/gpe-base/libeventdb/libeventdb-0.90.ebuild +++ b/gpe-base/libeventdb/libeventdb-0.90.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/libeventdb/libeventdb-0.90.ebuild,v 1.7 2009/08/26 15:51:45 miknix Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/libeventdb/libeventdb-0.90.ebuild,v 1.8 2010/05/26 14:38:02 miknix Exp $ GPE_TARBALL_SUFFIX="bz2" @@ -30,6 +30,9 @@ src_unpack() { epatch "${FILESDIR}"/libeventdb-unbreak-LIVE-macro.patch + # Wrong linker logic, fixes bug #320035 . + epatch "${FILESDIR}"/${P}-doclinkerfix.patch + if ! use doc; then sed -i -e 's;SUBDIRS = doc;SUBDIRS = ;' Makefile.am \ || die "sed failed" |