openpkg/pcre.patch

Tue, 28 Aug 2012 18:28:45 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 18:28:45 +0200
changeset 528
3b08e6396b45
parent 428
f880f219c566
permissions
-rw-r--r--

Massively update from 5.1 to 5.5 release, completely changing from
autotools to cmake build configuration along with the corresponding
corrections. Correct some less important problems like typical german
english mistakes, as well as use parallel make for faster builds with
SMP and multicore architectures. Warning, the 5.5 releases of MySQL
seem to be equally bug ridden as the 5.1 are, for example building
the NDBCluster storage engine fails.

     1 Index: configure
     2 --- configure.orig	2011-12-11 17:22:11.000000000 +0100
     3 +++ configure	2011-12-24 11:54:19.000000000 +0100
     4 @@ -3630,10 +3630,6 @@
     5  $as_echo "$as_me: failed program was:" >&5
     6  sed 's/^/| /' conftest.$ac_ext >&5
     8 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     9 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    10 -as_fn_error 77 "C compiler cannot create executables
    11 -See \`config.log' for more details" "$LINENO" 5; }
    12  else
    13    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    14  $as_echo "yes" >&6; }
    15 @@ -4759,10 +4759,7 @@
    16  if $ac_preproc_ok; then :
    18  else
    19 -  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    20 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    21 -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    22 -See \`config.log' for more details" "$LINENO" 5; }
    23 +    :
    24  fi
    26  ac_ext=c
    27 Index: pcreposix.h
    28 --- pcreposix.h.orig	2010-05-16 18:17:23.000000000 +0200
    29 +++ pcreposix.h	2011-12-24 11:54:19.000000000 +0100
    30 @@ -133,6 +133,12 @@
    32  /* The functions */
    34 +/* link-time symbol namespace conflict prevention */
    35 +#define regcomp  pcreposix_regcomp
    36 +#define regexec  pcreposix_regexec
    37 +#define regerror pcreposix_regerror
    38 +#define regfree  pcreposix_regfree
    39 +
    40  PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
    41  PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
    42                       regmatch_t *, int);

mercurial