openpkg/pcre.patch@9dacbd1d1aa2 (annotated)
openpkg/pcre.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- parent 428
- f880f219c566
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@428 | 1 | Index: configure |
| michael@428 | 2 | --- configure.orig 2011-12-11 17:22:11.000000000 +0100 |
| michael@428 | 3 | +++ configure 2011-12-24 11:54:19.000000000 +0100 |
| michael@431 | 4 | @@ -3630,10 +3630,6 @@ |
| michael@428 | 5 | $as_echo "$as_me: failed program was:" >&5 |
| michael@428 | 6 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@428 | 7 | |
| michael@428 | 8 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@428 | 9 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@428 | 10 | -as_fn_error 77 "C compiler cannot create executables |
| michael@428 | 11 | -See \`config.log' for more details" "$LINENO" 5; } |
| michael@428 | 12 | else |
| michael@428 | 13 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| michael@428 | 14 | $as_echo "yes" >&6; } |
| michael@431 | 15 | @@ -4759,10 +4759,7 @@ |
| michael@428 | 16 | if $ac_preproc_ok; then : |
| michael@428 | 17 | |
| michael@428 | 18 | else |
| michael@428 | 19 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@428 | 20 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@428 | 21 | -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
| michael@428 | 22 | -See \`config.log' for more details" "$LINENO" 5; } |
| michael@428 | 23 | + : |
| michael@428 | 24 | fi |
| michael@428 | 25 | |
| michael@428 | 26 | ac_ext=c |
| michael@428 | 27 | Index: pcreposix.h |
| michael@428 | 28 | --- pcreposix.h.orig 2010-05-16 18:17:23.000000000 +0200 |
| michael@428 | 29 | +++ pcreposix.h 2011-12-24 11:54:19.000000000 +0100 |
| michael@428 | 30 | @@ -133,6 +133,12 @@ |
| michael@428 | 31 | |
| michael@428 | 32 | /* The functions */ |
| michael@428 | 33 | |
| michael@428 | 34 | +/* link-time symbol namespace conflict prevention */ |
| michael@428 | 35 | +#define regcomp pcreposix_regcomp |
| michael@428 | 36 | +#define regexec pcreposix_regexec |
| michael@428 | 37 | +#define regerror pcreposix_regerror |
| michael@428 | 38 | +#define regfree pcreposix_regfree |
| michael@428 | 39 | + |
| michael@428 | 40 | PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); |
| michael@428 | 41 | PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, |
| michael@428 | 42 | regmatch_t *, int); |
