diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-12-31 12:23:58 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-12-31 12:23:58 +0000 |
| commit | 09ec17bf2df44f60537755c5dde0c2c2aa339fd1 (patch) | |
| tree | c95fa7fc3be2a2938a77cdbc7ff5939534a1d040 /dev-libs/libpcre | |
| parent | Drop ia64 support #345433 (diff) | |
| download | gentoo-2-09ec17bf2df44f60537755c5dde0c2c2aa339fd1.tar.gz gentoo-2-09ec17bf2df44f60537755c5dde0c2c2aa339fd1.tar.bz2 gentoo-2-09ec17bf2df44f60537755c5dde0c2c2aa339fd1.zip | |
Add patch to fix static build, bug #395343
(Portage version: 2.2.01.20043-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-libs/libpcre')
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/libpcre-8.21-static-build.patch | 54 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-8.21.ebuild | 9 |
3 files changed, 65 insertions, 4 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index dcd1aa873cb2..5a597b2d3fbd 100644 --- 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/files/libpcre-8.21-static-build.patch b/dev-libs/libpcre/files/libpcre-8.21-static-build.patch new file mode 100644 index 000000000000..75a7b897eb40 --- /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 0370ccf6dc41..41b042c375a8 100644 --- 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() { |