summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2015-04-06 11:16:50 +0000
committerSergey Popov <pinkbyte@gentoo.org>2015-04-06 11:16:50 +0000
commit663f97f94ff5a305a0ee4aad128347d416c2c611 (patch)
tree13aad6ded9a6089643924c1532149e5450a3e3e4 /dev-cpp/commoncpp2
parentFix build with tcl-8.6, bug #452034. Drop old. (diff)
downloadgentoo-2-663f97f94ff5a305a0ee4aad128347d416c2c611.tar.gz
gentoo-2-663f97f94ff5a305a0ee4aad128347d416c2c611.tar.bz2
gentoo-2-663f97f94ff5a305a0ee4aad128347d416c2c611.zip
Fix parallel build, wrt bug #492658
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)
Diffstat (limited to 'dev-cpp/commoncpp2')
-rw-r--r--dev-cpp/commoncpp2/ChangeLog8
-rw-r--r--dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild7
-rw-r--r--dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch11
3 files changed, 21 insertions, 5 deletions
diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 90c3ed5c98c4..99fcec330cf0 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/commoncpp2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.59 2014/03/01 22:24:51 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.60 2015/04/06 11:16:50 pinkbyte Exp $
+
+ 06 Apr 2015; Sergey Popov <pinkbyte@gentoo.org> commoncpp2-1.8.1-r1.ebuild,
+ +files/1.8.1-parallel-build.patch:
+ Fix parallel build, wrt bug #492658
01 Mar 2014; Michał Górny <mgorny@gentoo.org> commoncpp2-1.8.0.ebuild,
commoncpp2-1.8.1-r1.ebuild:
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild
index b206ad6c9a26..53353ef39988 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild,v 1.3 2014/03/01 22:24:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild,v 1.4 2015/04/06 11:16:50 pinkbyte Exp $
EAPI="5"
@@ -27,7 +27,8 @@ src_prepare() {
"${FILESDIR}/1.8.1-configure_detect_netfilter.patch" \
"${FILESDIR}/1.8.0-glibc212.patch" \
"${FILESDIR}/1.8.1-autoconf-update.patch" \
- "${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
+ "${FILESDIR}/1.8.1-fix-buffer-overflow.patch" \
+ "${FILESDIR}/1.8.1-parallel-build.patch"
eautoreconf
}
diff --git a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch b/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
new file mode 100644
index 000000000000..f131ee1c2c01
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -47,6 +47,7 @@
+
+ if EXTRAS
+ libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
++libccext2_la_DEPENDENCIES = libccgnu2.la
+ libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+
+ if GETOPT_LONG
+