openpkg/pcre.patch

changeset 428
f880f219c566
child 431
127559aa0c5e
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/openpkg/pcre.patch	Tue Jul 31 12:23:42 2012 +0200
     1.3 @@ -0,0 +1,42 @@
     1.4 +Index: configure
     1.5 +--- configure.orig	2011-12-11 17:22:11.000000000 +0100
     1.6 ++++ configure	2011-12-24 11:54:19.000000000 +0100
     1.7 +@@ -3596,10 +3596,6 @@
     1.8 + $as_echo "$as_me: failed program was:" >&5
     1.9 + sed 's/^/| /' conftest.$ac_ext >&5
    1.10 + 
    1.11 +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.12 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.13 +-as_fn_error 77 "C compiler cannot create executables
    1.14 +-See \`config.log' for more details" "$LINENO" 5; }
    1.15 + else
    1.16 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    1.17 + $as_echo "yes" >&6; }
    1.18 +@@ -4729,10 +4725,7 @@
    1.19 + if $ac_preproc_ok; then :
    1.20 + 
    1.21 + else
    1.22 +-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1.23 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1.24 +-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    1.25 +-See \`config.log' for more details" "$LINENO" 5; }
    1.26 ++    :
    1.27 + fi
    1.28 + 
    1.29 + ac_ext=c
    1.30 +Index: pcreposix.h
    1.31 +--- pcreposix.h.orig	2010-05-16 18:17:23.000000000 +0200
    1.32 ++++ pcreposix.h	2011-12-24 11:54:19.000000000 +0100
    1.33 +@@ -133,6 +133,12 @@
    1.34 + 
    1.35 + /* The functions */
    1.36 + 
    1.37 ++/* link-time symbol namespace conflict prevention */
    1.38 ++#define regcomp  pcreposix_regcomp
    1.39 ++#define regexec  pcreposix_regexec
    1.40 ++#define regerror pcreposix_regerror
    1.41 ++#define regfree  pcreposix_regfree
    1.42 ++
    1.43 + PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
    1.44 + PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
    1.45 +                      regmatch_t *, int);

mercurial