/[packages]/cauldron/pcre/current/SOURCES/pcre-pcreposix-glibc-conflict.patch
ViewVC logotype

Diff of /cauldron/pcre/current/SOURCES/pcre-pcreposix-glibc-conflict.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 821977 by luigiwalser, Wed Oct 8 21:47:22 2014 UTC revision 821978 by neoclust, Tue May 12 23:10:16 2015 UTC
# Line 71  gcc -Wl,--as-needed t.c -L. -lx -la; ./a Line 71  gcc -Wl,--as-needed t.c -L. -lx -la; ./a
71  i wonder if ld could have a warning to detect about multiple symbols  i wonder if ld could have a warning to detect about multiple symbols
72  in DSO and so tell about possible issues with --as-needed.  in DSO and so tell about possible issues with --as-needed.
73    
74  diff -Naurp pcre-8.33/configure.ac pcre-8.33.oden/configure.ac  
75  --- pcre-8.35/configure.ac      2013-05-27 17:54:34.000000000 +0200  diff --git a/configure.ac b/configure.ac
76  +++ pcre-8.35.oden/configure.ac 2013-08-09 18:23:42.117248731 +0200  index 38d1dba..d423f0f 100644
77  @@ -20,7 +20,7 @@ m4_define(pcre_date, [2013-05-28])  --- a/configure.ac
78   m4_define(libpcre_version, [3:4:2])  +++ b/configure.ac
79   m4_define(libpcre16_version, [2:4:2])  @@ -20,7 +20,7 @@ m4_define(pcre_date, [2015-04-28])
80   m4_define(libpcre32_version, [0:4:0])   m4_define(libpcre_version, [3:5:2])
81     m4_define(libpcre16_version, [2:5:2])
82     m4_define(libpcre32_version, [0:5:0])
83  -m4_define(libpcreposix_version, [0:3:0])  -m4_define(libpcreposix_version, [0:3:0])
84  +m4_define(libpcreposix_version, [1:0:0])  +m4_define(libpcreposix_version, [1:0:0])
85   m4_define(libpcrecpp_version, [0:1:0])   m4_define(libpcrecpp_version, [0:1:0])
86    
87   AC_PREREQ(2.57)   AC_PREREQ(2.57)
88  diff -Naurp pcre-8.33/pcreposix.h pcre-8.33.oden/pcreposix.h  diff --git a/pcreposix.h b/pcreposix.h
89  --- pcre-8.33/pcreposix.h       2011-12-28 17:57:51.000000000 +0100  index 6424a74..b869da5 100644
90  +++ pcre-8.33.oden/pcreposix.h  2013-08-09 18:22:57.127944038 +0200  --- a/pcreposix.h
91  @@ -133,14 +133,19 @@ file. */  +++ b/pcreposix.h
92    @@ -132,15 +132,19 @@ file. */
93     #endif
94    
95   /* The functions */   /* The functions */
96    -
97  -PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);  -PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
98  -PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,  -PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
99  +PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int);  +PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int);
Legend:
Removed from v.821977  
changed lines
  Added in v.821978
  ViewVC Help
Powered by ViewVC 1.1.30