| 1 |
grobian 11/12/31 12:23:58 |
| 2 |
|
| 3 |
Added: libpcre-8.21-static-build.patch |
| 4 |
Log: |
| 5 |
Add patch to fix static build, bug #395343 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.20043-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libpcre/files/libpcre-8.21-static-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/files/libpcre-8.21-static-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/files/libpcre-8.21-static-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libpcre-8.21-static-build.patch |
| 16 |
=================================================================== |
| 17 |
http://bugs.exim.org/show_bug.cgi?id=997 |
| 18 |
http://bugs.exim.org/attachment.cgi?id=525 |
| 19 |
https://bugs.gentoo.org/show_bug.cgi?id=395343 |
| 20 |
|
| 21 |
libpcre needs curses when building pcretest |
| 22 |
|
| 23 |
--- pcre/configure.ac |
| 24 |
+++ pcre/configure.ac |
| 25 |
@@ -467,7 +467,30 @@ LIBS="$OLD_LIBS" |
| 26 |
|
| 27 |
AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1]) |
| 28 |
AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1]) |
| 29 |
-AC_CHECK_LIB([readline], [readline], [HAVE_LIB_READLINE=1]) |
| 30 |
+AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lreadline"], |
| 31 |
+ [unset ac_cv_lib_readline_readline; |
| 32 |
+ AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltinfo"], |
| 33 |
+ [unset ac_cv_lib_readline_readline; |
| 34 |
+ AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lcurses"], |
| 35 |
+ [unset ac_cv_lib_readline_readline; |
| 36 |
+ AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncurses"], |
| 37 |
+ [unset ac_cv_lib_readline_readline; |
| 38 |
+ AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncursesw"], |
| 39 |
+ [unset ac_cv_lib_readline_readline; |
| 40 |
+ AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltermcap"], |
| 41 |
+ [LIBREADLINE=""], |
| 42 |
+ [-ltermcap])], |
| 43 |
+ [-lncursesw])], |
| 44 |
+ [-lncurses])], |
| 45 |
+ [-lcurses])], |
| 46 |
+ [-ltinfo])]) |
| 47 |
+AC_SUBST(LIBREADLINE) |
| 48 |
+if test -n "$LIBREADLINE"; then |
| 49 |
+ if test "$LIBREADLINE" != "-lreadline"; then |
| 50 |
+ echo "-lreadline needs $LIBREADLINE" |
| 51 |
+ LIBREADLINE="-lreadline $LIBREADLINE" |
| 52 |
+ fi |
| 53 |
+fi |
| 54 |
|
| 55 |
# This facilitates -ansi builds under Linux |
| 56 |
dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc]) |
| 57 |
@@ -712,9 +735,11 @@ if test "$enable_pcretest_libreadline" = "yes"; then |
| 58 |
echo "** Cannot --enable-pcretest-readline because readline/history.h was not found." |
| 59 |
exit 1 |
| 60 |
fi |
| 61 |
- LIBREADLINE="-lreadline" |
| 62 |
+ if test -z "$LIBREADLINE"; then |
| 63 |
+ echo "** Cannot --enable-pcretest-readline because readline library was not found." |
| 64 |
+ exit 1 |
| 65 |
+ fi |
| 66 |
fi |
| 67 |
-AC_SUBST(LIBREADLINE) |
| 68 |
|
| 69 |
# Produce these files, in addition to config.h. |
| 70 |
AC_CONFIG_FILES( |
Archives