From: Charlie Shepherd <masterdriverz@gentoo.org>
Date: Sat, 27 Jan 2007 20:03:36 +0000 (+0000)
Subject: Force building of static libs; bug 164099
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f699cd7c680de4f4732b509cfd7ee4db0001ccf;p=gentoo.git

Force building of static libs; bug 164099
Package-Manager: portage-2.1.2_rc4-r3
---

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index bbdd228478e5..e46133b464b1 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.85 2007/01/27 11:53:28 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.86 2007/01/27 20:03:36 masterdriverz Exp $
+
+  27 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  libpcre-7.0.ebuild:
+  Force building of static libs; bug 164099
 
 *libpcre-7.0 (27 Jan 2007)
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 85a61d3826c0..ecd1c6fe54b5 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -20,14 +20,14 @@ EBUILD libpcre-6.6.ebuild 1483 RMD160 2e07e5f300b42cfd2ab00e790fcce9241126bab8 S
 MD5 4966238e05d0d206a86b82e59cb65fe8 libpcre-6.6.ebuild 1483
 RMD160 2e07e5f300b42cfd2ab00e790fcce9241126bab8 libpcre-6.6.ebuild 1483
 SHA256 d1e75f4ba7237562c9f6369b3c6135e96b4d0109aae94f96243ad66702f1f310 libpcre-6.6.ebuild 1483
-EBUILD libpcre-7.0.ebuild 1170 RMD160 6fcab052cf727e511da30f89faf2b1e32b6b3e46 SHA1 8c002495b8362d07e4f9316af1130ab92819fe2b SHA256 e6d8235867daff58706fd141341ad7547abdb732166ac420cd86502731c64d17
-MD5 87d143166293f484306a32798a78cac6 libpcre-7.0.ebuild 1170
-RMD160 6fcab052cf727e511da30f89faf2b1e32b6b3e46 libpcre-7.0.ebuild 1170
-SHA256 e6d8235867daff58706fd141341ad7547abdb732166ac420cd86502731c64d17 libpcre-7.0.ebuild 1170
-MISC ChangeLog 10729 RMD160 64bfd1ebe5f0a8dc43a6666ef551075246a14227 SHA1 463292f47953c99cde115773fa438bcc903d7765 SHA256 2ac7615c574a1486a7533cdbf1bf549d44ef5dafbe5dbaf8290dc5c153f09d84
-MD5 fdea906942927e6048ab39c45ca4d980 ChangeLog 10729
-RMD160 64bfd1ebe5f0a8dc43a6666ef551075246a14227 ChangeLog 10729
-SHA256 2ac7615c574a1486a7533cdbf1bf549d44ef5dafbe5dbaf8290dc5c153f09d84 ChangeLog 10729
+EBUILD libpcre-7.0.ebuild 1256 RMD160 12d5b6ff71b62223ca7417f2730d2606a25688b9 SHA1 b44373ffa619960a0b56b9c173e3fbc20441698c SHA256 bdba7243ac34c53c3123b40e47951ca052d8e790fc4a808cccb302937ff6037f
+MD5 1200d6f78d6652745759c887b2060ba9 libpcre-7.0.ebuild 1256
+RMD160 12d5b6ff71b62223ca7417f2730d2606a25688b9 libpcre-7.0.ebuild 1256
+SHA256 bdba7243ac34c53c3123b40e47951ca052d8e790fc4a808cccb302937ff6037f libpcre-7.0.ebuild 1256
+MISC ChangeLog 10855 RMD160 662e64f7b795d1be361e28ff6cb4b0e3e22cfe41 SHA1 63d09b861fdf70cca7e376acc28b94fcc608dc9c SHA256 8bf3f6c10033e087d6da8e6fb84affb255dadf8979688bdbd83a494591ae8cca
+MD5 b367bcd1aa2c6fbe9771d06a695d9ccf ChangeLog 10855
+RMD160 662e64f7b795d1be361e28ff6cb4b0e3e22cfe41 ChangeLog 10855
+SHA256 8bf3f6c10033e087d6da8e6fb84affb255dadf8979688bdbd83a494591ae8cca ChangeLog 10855
 MISC metadata.xml 221 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a SHA1 083b4c4186b97766a77a282179eb387403ffbd71 SHA256 2effb4fe4513bd8d65e088ec41cd470c52003e4b66feb7cf7a5247aaa894345f
 MD5 d6863e368bff32cb8dca1b8062fbc321 metadata.xml 221
 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a metadata.xml 221
diff --git a/dev-libs/libpcre/libpcre-7.0.ebuild b/dev-libs/libpcre/libpcre-7.0.ebuild
index 012e86d2acb1..1d9d1298bc0c 100644
--- a/dev-libs/libpcre/libpcre-7.0.ebuild
+++ b/dev-libs/libpcre/libpcre-7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.0.ebuild,v 1.1 2007/01/27 11:53:28 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.0.ebuild,v 1.2 2007/01/27 20:03:36 masterdriverz Exp $
 
 inherit libtool eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~x86"
-IUSE="doc unicode static"
+IUSE="doc unicode"
 
 DEPEND="dev-util/pkgconfig"
 RDEPEND=""
@@ -37,7 +37,9 @@ src_compile() {
 		myconf="--enable-utf8 --enable-unicode-properties"
 	fi
 
-	econf ${myconf} $(use_enable static) || die "econf failed"
+	# Enable building of static libs too - grep and others
+	# depend on them being built: bug 164099
+	econf ${myconf} --enable-static || die "econf failed"
 	emake all libpcrecpp.la || die "emake failed"
 }