Add patch to fix static build, bug #395343

Package-Manager: portage-2.2.01.20043-prefix/cvs/Darwin i386

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index dcd1aa873cb29fd0bff8db6378858924e6a9a62e..5a597b2d3fbdbfcbb1ac2e14b4eb63dd7c139ece 100644 (file)
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.187 2011/12/12 23:24:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.188 2011/12/31 12:23:58 grobian Exp $
+
+  31 Dec 2011; Fabian Groffen <grobian@gentoo.org>
+  +files/libpcre-8.21-static-build.patch, libpcre-8.21.ebuild:
+  Add patch to fix static build, bug #395343
 
   12 Dec 2011; Tim Harder <radhermit@gentoo.org> libpcre-8.20.ebuild:
   Use correct readline configure flag.

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 70783ee5d2ae2950d4d8a6e00442bb3df48751a9..2f52e80f2316ba261fd5e828a81e24a818a1552a 100644 (file)
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX libpcre-7.9-pkg-config.patch 1487 RMD160 b9e583ed8776a16cc1ec2c6dbd5c0153d6fdbf88 SHA1 57d60963fd635883a7eacdbed411405a28751fec SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70
 AUX libpcre-8.13-posix-regex.patch 1223 RMD160 413efc35a55410be9e2074166c15f08081f11644 SHA1 84e3ce23c948a2d0afe9e90e83b6ec0eaa0a9e6e SHA256 d31e0eac4c6b24d57e89e56bc16332d1d0a349a0af2a6c6031134c2d1966d2f0
+AUX libpcre-8.21-static-build.patch 1981 RMD160 4f442e3d75bd10396c34028768dcbba665c501e4 SHA1 7be4bb6a0330ad743efe1d9a5ae3b52ebf2925f0 SHA256 042bfd24a1103fa6601bcbf01a9212225c9179d768cb5feaec30f7c89d2de619
 DIST pcre-7.9.tar.bz2 861580 RMD160 e7ccae1fe3d2cf3ff3264c6e6ad3486c64fe1cec SHA1 a4a34f71313ac042455355c01ad851791971a7fa SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740
 DIST pcre-8.02.tar.bz2 956462 RMD160 5a29c3d5e61ea877a6e3ab2b9e70f426c7f34771 SHA1 2cf2f7f04988813c7ce45c43eb934f3b8b1c3b34 SHA256 a4759036d9c3e1773e8b680827b17b843f724ef9021744db92b8dd35ebac4ebd
 DIST pcre-8.12.tar.bz2 992502 RMD160 ec7978604cdf92d8dbd98e0d0c360fe35eb62021 SHA1 2219b372bff53ee29a7e44ecf5977ad15df01cea SHA256 c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725acd1aeec
@@ -15,17 +16,13 @@ EBUILD libpcre-8.12.ebuild 2055 RMD160 016b220208b92980fc9293af651dc29a27d4d51f
 EBUILD libpcre-8.13-r1.ebuild 2008 RMD160 1752965932619299f93d041a06461b843ef2a20a SHA1 959ff7bd70cca371d55ea7f7663103cb3773036d SHA256 7757d5f0cafe92b22a08ad02c68a11579478d07c754a34efb570167eb4e65af5
 EBUILD libpcre-8.13.ebuild 2041 RMD160 6a6c3b40102171812eb9e94e3164d1cb308d640f SHA1 6bc9fab9da7fc901ebc96064de9d19fe9f3f52cd SHA256 dce6fb93e8f04515f1c8a8991d9c84c70dbe5d4942aa44bc8e4470d0780e0185
 EBUILD libpcre-8.20.ebuild 2101 RMD160 3604e4a683cd95e9d3ea2520dcc36ad2137c750a SHA1 46a6cf4af0c3152dfe4c2e1f1cf5ebd195fda5a6 SHA256 86526216b1e1cea93e732b4b9539105d0552e96bd7f7e31782c9a41b77036e30
-EBUILD libpcre-8.21.ebuild 2101 RMD160 8c99f62603ef6934a1dadc2bfd1e7a023bfeea2c SHA1 43469d022da14df20fe500be070d286b5420ccdd SHA256 8240377c7bd18527acb7e1ad567537b12f0879e8376d57ee1b848e6ca721375e
-MISC ChangeLog 25021 RMD160 acdb35083699c4b2e95c2720615b5cdf84b9587e SHA1 d9b79427518237a260d831195f9a9d48b07bad28 SHA256 e4ff709c011f313988149620ddae622fb8fae37fea14e89eaee347822114cf19
+EBUILD libpcre-8.21.ebuild 2273 RMD160 34049ac0d078caafa769a48bc86f7d63ac3d1b40 SHA1 0d5c6399bf909e7986a4760359d55915f446e604 SHA256 4bbd1606a2d7893310aa94b12361dee3e1b6b226cc5635d3c9ed4683d7ea12e6
+MISC ChangeLog 25179 RMD160 ba7b6dc671851f70df0caa4ec5811dadf7a7a9c5 SHA1 ab8eb81463a268291f7db2e228010e0332fc50e5 SHA256 f607904d843199ea54e134f60f8ea9b59eb373d125e2bb8ee581f252e55ed236
 MISC metadata.xml 1067 RMD160 cc89a280b564244a38011086dc33605aa9c03ae1 SHA1 8a40ffa6b0f7a65b8637d4f99769fba480c96778 SHA256 0dded51522c3ba4fb83181b69c7cbdcf8c84cfe9e711d1a0a312693108e6541c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQEcBAEBCgAGBQJO5o0qAAoJEEqz6FtPBkyjXkUH/30F9yN3Lz2MS0f1xoNLnsTE
-Z9yfSECWmWmHx39VQxYmtaaLFQ6gVro4hhi4LeS5iGVO0b0RJZS3ZNupJtrBwsis
-CFdCVDNWKKfpQRFuS9Ik50RMVUZLEM9AtsSFVUBBOj3Yp4o/KCi3j2+sz4OFkvX/
-mPLIrj6qUKAM6BMpV1SgR7t+lSh8XZzTsKX5roFtpo/IOzACFuhjCxsN1RZDEqnE
-uUGC/0Y3bqXwFuyg5OJuAlQyxVkci2nhPXXeE70TBf4saWpoo9vOx0KzzkWc+omP
-hTMw/jsdExder6X9Cbh/R2OgDo/evqKvmiMKdE5T/QwX0fFNxYp0R0ji1H1oC3M=
-=jw1U
+iEYEARECAAYFAk7+/uMACgkQX3X2B8XHTomvYACgjV/thXhemIYXU1CinoAolMnB
+wIoAmgKCWUCgNZ1LRwo5Zgh+UmmrbGeE
+=r3nj
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libpcre/files/libpcre-8.21-static-build.patch b/dev-libs/libpcre/files/libpcre-8.21-static-build.patch
new file mode 100644 (file)
index 0000000..75a7b89
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-8.21-static-build.patch
@@ -0,0 +1,54 @@
+http://bugs.exim.org/show_bug.cgi?id=997
+http://bugs.exim.org/attachment.cgi?id=525
+https://bugs.gentoo.org/show_bug.cgi?id=395343
+
+libpcre needs curses when building pcretest
+
+--- pcre/configure.ac
++++ pcre/configure.ac
+@@ -467,7 +467,30 @@ LIBS="$OLD_LIBS"
+ 
+ AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])
+ AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])
+-AC_CHECK_LIB([readline], [readline], [HAVE_LIB_READLINE=1])
++AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lreadline"],
++  [unset ac_cv_lib_readline_readline;
++   AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltinfo"],
++    [unset ac_cv_lib_readline_readline;
++     AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lcurses"],
++      [unset ac_cv_lib_readline_readline;
++       AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncurses"],
++        [unset ac_cv_lib_readline_readline;
++       AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncursesw"],
++          [unset ac_cv_lib_readline_readline;
++         AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltermcap"],
++            [LIBREADLINE=""],
++            [-ltermcap])],
++          [-lncursesw])],
++        [-lncurses])],
++      [-lcurses])],
++    [-ltinfo])])
++AC_SUBST(LIBREADLINE)
++if test -n "$LIBREADLINE"; then
++  if test "$LIBREADLINE" != "-lreadline"; then
++    echo "-lreadline needs $LIBREADLINE"
++    LIBREADLINE="-lreadline $LIBREADLINE"
++  fi
++fi
+ 
+ # This facilitates -ansi builds under Linux
+ dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc])
+@@ -712,9 +735,11 @@ if test "$enable_pcretest_libreadline" = "yes"; then
+     echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
+     exit 1
+   fi
+-  LIBREADLINE="-lreadline"
++  if test -z "$LIBREADLINE"; then
++    echo "** Cannot --enable-pcretest-readline because readline library was not found."
++    exit 1
++  fi
+ fi
+-AC_SUBST(LIBREADLINE)
+ 
+ # Produce these files, in addition to config.h.
+ AC_CONFIG_FILES(

diff --git a/dev-libs/libpcre/libpcre-8.21.ebuild b/dev-libs/libpcre/libpcre-8.21.ebuild
index 0370ccf6dc41d23c731cf3c04ace33527797eedd..41b042c375a83fe452ca9322558151488471f0b6 100644 (file)
--- a/dev-libs/libpcre/libpcre-8.21.ebuild
+++ b/dev-libs/libpcre/libpcre-8.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.21.ebuild,v 1.1 2011/12/12 23:21:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.21.ebuild,v 1.2 2011/12/31 12:23:58 grobian Exp $
 
 EAPI="4"
 
-inherit libtool eutils toolchain-funcs flag-o-matic
+inherit autotools eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -33,7 +33,10 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
        sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
-       elibtoolize
+       epatch "${FILESDIR}"/${P}-static-build.patch
+       # m4 dir isn't packaged, breaks aclocal
+       sed -i -e '/ACLOCAL_AMFLAGS/s/-I \?m4//' Makefile.am || die
+       eautoreconf # otherwise elibtoolize
 }
 
 src_configure() {