summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-07-12 15:36:37 +0000
committerJustin Lecher <jlec@gentoo.org>2013-07-12 15:36:37 +0000
commitf895d64ca2ea49a588f3d516dd81f62da8c92ef0 (patch)
treee5aa102e6e6d4cfb0d32e393e3434a79ecc3fe75 /dev-libs/quazip
parentppc, ppc64, x86 keywords added, bug #465136 (diff)
downloadgentoo-2-f895d64ca2ea49a588f3d516dd81f62da8c92ef0.tar.gz
gentoo-2-f895d64ca2ea49a588f3d516dd81f62da8c92ef0.tar.bz2
gentoo-2-f895d64ca2ea49a588f3d516dd81f62da8c92ef0.zip
dev-libs/quazip: Fix parallel build, #476630; prepend LD_LIBRARY_PATH during testing to test new lib, #476634
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'dev-libs/quazip')
-rw-r--r--dev-libs/quazip/ChangeLog7
-rw-r--r--dev-libs/quazip/files/quazip-0.5.1-prll.patch11
-rw-r--r--dev-libs/quazip/quazip-0.5.1-r1.ebuild8
3 files changed, 22 insertions, 4 deletions
diff --git a/dev-libs/quazip/ChangeLog b/dev-libs/quazip/ChangeLog
index fa3884b91a41..c6f214fa0c2a 100644
--- a/dev-libs/quazip/ChangeLog
+++ b/dev-libs/quazip/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/quazip
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/ChangeLog,v 1.27 2013/07/11 17:02:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/ChangeLog,v 1.28 2013/07/12 15:36:37 jlec Exp $
+
+ 12 Jul 2013; Justin Lecher <jlec@gentoo.org> quazip-0.5.1-r1.ebuild,
+ +files/quazip-0.5.1-prll.patch:
+ Fix parallel build, #476630; prepend LD_LIBRARY_PATH during testing to test
+ new lib, #476634
11 Jul 2013; Justin Lecher <jlec@gentoo.org> quazip-0.5.1-r1.ebuild:
Enable testsuite
diff --git a/dev-libs/quazip/files/quazip-0.5.1-prll.patch b/dev-libs/quazip/files/quazip-0.5.1-prll.patch
new file mode 100644
index 000000000000..48c55023838a
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.5.1-prll.patch
@@ -0,0 +1,11 @@
+ quazip.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/quazip.pro b/quazip.pro
+index 28aa9ab..62a22bd 100644
+--- a/quazip.pro
++++ b/quazip.pro
+@@ -1,2 +1,3 @@
+ TEMPLATE=subdirs
+ SUBDIRS=quazip qztest
++qztest.depends=quazip
diff --git a/dev-libs/quazip/quazip-0.5.1-r1.ebuild b/dev-libs/quazip/quazip-0.5.1-r1.ebuild
index b872f56a7340..48ef5e9c25e0 100644
--- a/dev-libs/quazip/quazip-0.5.1-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.5.1-r1.ebuild,v 1.4 2013/07/11 17:02:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.5.1-r1.ebuild,v 1.5 2013/07/12 15:36:37 jlec Exp $
EAPI=5
@@ -28,7 +28,9 @@ HTML_DOCS=( doc/html/. )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.4-zlib.patch
- "${FILESDIR}"/${P}-zlib.patch )
+ "${FILESDIR}"/${P}-zlib.patch
+ "${FILESDIR}"/${P}-prll.patch
+)
src_prepare() {
sed \
@@ -41,7 +43,7 @@ src_prepare() {
src_test() {
cd qztest || die
- ./qztest || die
+ LD_LIBRARY_PATH="${S}"/${PN} ./qztest || die
}
src_install() {