diff options
| author |   Qing He <qing.he@intel.com> | 2011-03-03 19:20:25 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:12:41 +0000 |
| commit | 6a4cb991ea473a84c620b33fbb82b5ae860971a3 (patch) | |
| tree | 0ce95cf37eb29d624dba3597d8c8ac0d99d6b896 /meta/recipes-support/libpcre | |
| parent | e69b446b66ff2d798a662431e7774d905c3f25b7 (diff) | |
| download | openembedded-core-contrib-6a4cb991ea473a84c620b33fbb82b5ae860971a3.tar.gz | |
libpcre: fix the name collision with libc
fixes [YOCTO #721] [YOCTO #722]
[sgw: added patch comment, bump PR, and changed BUGID -> YOCTO]
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libpcre')
| -rw-r--r-- | meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-support/libpcre/libpcre_8.10.bb | 5 |
2 files changed, 43 insertions, 2 deletions
diff --git a/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch b/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch new file mode 100644 index 00000000000..65483531211 --- /dev/null +++ b/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch @@ -0,0 +1,40 @@ + +This patch address a namespace collision with libc. + +Although there is no "#include <regex.h>" in the source file, at +runtime, it's unintentionally linked to the libc version, the regcomp of +libc is called instead the pcre one using pcre's data structure... +that looks like a disaster. + +Can patch is from Debian (and Ubuntu 11.04alpha has it also). + +[sgw: added patch comment] +Signed-off-by: Qing He <qing.he@intel.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +--- a/pcreposix.h 2010-05-17 00:17:23.000000000 +0800 ++++ b/pcreposix.h 2009-01-15 04:32:17.000000000 +0800 +@@ -133,14 +130,19 @@ + + /* The functions */ + +-PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); +-PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, ++PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int); ++PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t, + regmatch_t *, int); +-PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t); +-PCREPOSIX_EXP_DECL void regfree(regex_t *); ++PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t); ++PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *); + + #ifdef __cplusplus + } /* extern "C" */ + #endif + ++#define regcomp pcreposix_regcomp ++#define regexec pcreposix_regexec ++#define regerror pcreposix_regerror ++#define regfree pcreposix_regfree ++ + #endif /* End of pcreposix.h */ diff --git a/meta/recipes-support/libpcre/libpcre_8.10.bb b/meta/recipes-support/libpcre/libpcre_8.10.bb index db89c89e26a..2e174933ca1 100644 --- a/meta/recipes-support/libpcre/libpcre_8.10.bb +++ b/meta/recipes-support/libpcre/libpcre_8.10.bb @@ -5,11 +5,12 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r4" +PR = "r6" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=77f9b14fe707d0376d89bc162e6c54ff" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ - file://pcre-cross.patch;patch=1" + file://pcre-cross.patch;patch=1 \ + file://fix-pcre-name-collision.patch" SRC_URI[md5sum] = "780867a700e9d4e4b9cb47aa5453e4b2" SRC_URI[sha256sum] = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480" |