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 | 55e8b4882298ba0885ceb2f2e728f733a6f05099 (patch) | |
| tree | af2d6f57ac5ae73de715c0baa261094943e5c4d5 /gpe-base | |
| parent | Fix dependencies. (diff) | |
| download | historical-55e8b4882298ba0885ceb2f2e728f733a6f05099.tar.gz historical-55e8b4882298ba0885ceb2f2e728f733a6f05099.tar.bz2 historical-55e8b4882298ba0885ceb2f2e728f733a6f05099.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 :)
Package-Manager: portage-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/Manifest | 5 | ||||
| -rw-r--r-- | gpe-base/libeventdb/files/libeventdb-0.90-doclinkerfix.patch | 19 | ||||
| -rw-r--r-- | gpe-base/libeventdb/libeventdb-0.90.ebuild | 7 |
4 files changed, 35 insertions, 6 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/Manifest b/gpe-base/libeventdb/Manifest index 7770297b102c..aa2036a9894d 100644 --- a/gpe-base/libeventdb/Manifest +++ b/gpe-base/libeventdb/Manifest @@ -1,5 +1,6 @@ +AUX libeventdb-0.90-doclinkerfix.patch 699 RMD160 b382260c3edd960fa48de75265c0db809c5de896 SHA1 9beaa4c3b66d60aa53e1c31a7509e2fcb47e7ef6 SHA256 435a49a17c4bd726712290e71695d85ce067a740636295e3115fd4942c534654 AUX libeventdb-unbreak-LIVE-macro.patch 475 RMD160 314d4adecd0ebc8c00d87787218cc511d3b179b4 SHA1 a74bd82bdb025e1897caa8f3942919827d33218a SHA256 07cddbf972db5f56bc20df4f2e7a5212d3298398f469884e8a65fbd0e9000e82 DIST libeventdb-0.90.tar.bz2 272040 RMD160 192d2626f147205ccc21d211921392c6a7239118 SHA1 481a6e86da2455750992bc20f30e37fd9e00b784 SHA256 b3bc81803e890514e9e0ed491c05af701dfc58e985b071a4a408ba99dd858180 -EBUILD libeventdb-0.90.ebuild 872 RMD160 fb8dfcc17a32098dfd0f18c4aa4411e53e2cd348 SHA1 84692b12dd4a5a19727994aee0b6d7e45d930493 SHA256 adeb12b09c01f71d9760e4af67b57e6221ee90201d385feb6daa2d1fc03cd881 -MISC ChangeLog 1024 RMD160 2e87aa360a1b8e070f9845374d6d8f886d41bddd SHA1 f21e8b74b0be483fb3376b6efbe6f28d1e2a8922 SHA256 671d4f0e534d1e6f743404db43bfc6f66675de6c5d1b2b979d8b04a798740369 +EBUILD libeventdb-0.90.ebuild 962 RMD160 6377bc6926b8863e9659f998f45cd43ddb9150c0 SHA1 2741807f13a085212a9115674d03c74fc38acd47 SHA256 1a9cad1484c557cb5b8422d3548bb6abbe27e299ea616864425786590ea6bda5 +MISC ChangeLog 1286 RMD160 f4e1aa243d96185cd0844da449e28faf47aa5d6d SHA1 0e3c8885ec2e8ee4cee19f4a21dd230f2e3109b4 SHA256 a8e35dc8c2c64bc90be708ad79905eea02a16a2300a55010b9032fb67d284d74 MISC metadata.xml 214 RMD160 bca5b2208a68a7a7a84355f818a615e04dcb3ca8 SHA1 d0f048fbc4c361e89505f6edb1ddda27bbc7d73e SHA256 7b5eab127a5e896980df3a9aa01494e608a8a701ae9c5478255bff89d46410af 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" |