diff options
Diffstat (limited to 'meta/recipes-support/libpcre')
-rw-r--r-- | meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch | 41 | ||||
-rw-r--r-- | meta/recipes-support/libpcre/libpcre2_10.43.bb (renamed from meta/recipes-support/libpcre/libpcre2_10.35.bb) | 35 | ||||
-rw-r--r-- | meta/recipes-support/libpcre/libpcre_8.45.bb (renamed from meta/recipes-support/libpcre/libpcre_8.44.bb) | 34 |
3 files changed, 35 insertions, 75 deletions
diff --git a/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch b/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch deleted file mode 100644 index 89b44f6aa6..0000000000 --- a/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [debian patch] - -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/libpcre2_10.35.bb b/meta/recipes-support/libpcre/libpcre2_10.43.bb index 35c019c100..fd0bd79212 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.35.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.43.bb @@ -8,11 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a06590e9bd4c229532364727aaeaf084" +LIC_FILES_CHKSUM = "file://LICENCE;md5=321a5eb46acae6b6c1ff2c7a866d836a" -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2" +SRC_URI = "${GITHUB_BASE_URI}/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" -SRC_URI[sha256sum] = "9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613" +GITHUB_BASE_URI = "https://github.com/PhilipHazel/pcre2/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/pcre2-(?P<pver>\d+(\.\d+)+)$" + +SRC_URI[sha256sum] = "e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb" CVE_PRODUCT = "pcre2" @@ -23,7 +26,7 @@ DEPENDS += "bzip2 zlib" BINCONFIG = "${bindir}/pcre2-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled github-releases EXTRA_OECONF = "\ --enable-newline-is-lf \ @@ -33,20 +36,20 @@ EXTRA_OECONF = "\ --enable-pcre2-32 \ " CFLAGS += "-D_REENTRANT" -CXXFLAGS_append_powerpc = " -lstdc++" +CXXFLAGS:append:powerpc = " -lstdc++" PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc" -SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes" -SUMMARY_pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" -SUMMARY_pcre2test = "program for testing Perl-comatible regular expressions" -SUMMARY_pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" - -FILES_libpcre2-16 = "${libdir}/libpcre2-16.so.*" -FILES_libpcre2-32 = "${libdir}/libpcre2-32.so.*" -FILES_pcre2grep = "${bindir}/pcre2grep" -FILES_pcre2grep-doc = "${mandir}/man1/pcre2grep.1" -FILES_pcre2test = "${bindir}/pcre2test" -FILES_pcre2test-doc = "${mandir}/man1/pcre2test.1" +SUMMARY:pcre2grep = "grep utility that uses perl 5 compatible regexes" +SUMMARY:pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" +SUMMARY:pcre2test = "program for testing Perl-comatible regular expressions" +SUMMARY:pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" + +FILES:libpcre2-16 = "${libdir}/libpcre2-16.so.*" +FILES:libpcre2-32 = "${libdir}/libpcre2-32.so.*" +FILES:pcre2grep = "${bindir}/pcre2grep" +FILES:pcre2grep-doc = "${mandir}/man1/pcre2grep.1" +FILES:pcre2test = "${bindir}/pcre2test" +FILES:pcre2test-doc = "${mandir}/man1/pcre2test.1" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libpcre/libpcre_8.44.bb b/meta/recipes-support/libpcre/libpcre_8.45.bb index e5471e81da..46fedbae48 100644 --- a/meta/recipes-support/libpcre/libpcre_8.44.bb +++ b/meta/recipes-support/libpcre/libpcre_8.45.bb @@ -6,15 +6,13 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ - file://fix-pcre-name-collision.patch \ +LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" -SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" +SRC_URI[sha256sum] = "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8" CVE_PRODUCT = "pcre" @@ -40,19 +38,19 @@ EXTRA_OECONF = "--enable-utf" PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc" -SUMMARY_libpcrecpp = "${SUMMARY} - C++ wrapper functions" -SUMMARY_libpcreposix = "${SUMMARY} - C wrapper functions based on the POSIX regex API" -SUMMARY_pcregrep = "grep utility that uses perl 5 compatible regexes" -SUMMARY_pcregrep-doc = "grep utility that uses perl 5 compatible regexes - docs" -SUMMARY_pcretest = "program for testing Perl-comatible regular expressions" -SUMMARY_pcretest-doc = "program for testing Perl-comatible regular expressions - docs" +SUMMARY:libpcrecpp = "${SUMMARY} - C++ wrapper functions" +SUMMARY:libpcreposix = "${SUMMARY} - C wrapper functions based on the POSIX regex API" +SUMMARY:pcregrep = "grep utility that uses perl 5 compatible regexes" +SUMMARY:pcregrep-doc = "grep utility that uses perl 5 compatible regexes - docs" +SUMMARY:pcretest = "program for testing Perl-comatible regular expressions" +SUMMARY:pcretest-doc = "program for testing Perl-comatible regular expressions - docs" -FILES_libpcrecpp = "${libdir}/libpcrecpp.so.*" -FILES_libpcreposix = "${libdir}/libpcreposix.so.*" -FILES_pcregrep = "${bindir}/pcregrep" -FILES_pcregrep-doc = "${mandir}/man1/pcregrep.1" -FILES_pcretest = "${bindir}/pcretest" -FILES_pcretest-doc = "${mandir}/man1/pcretest.1" +FILES:libpcrecpp = "${libdir}/libpcrecpp.so.*" +FILES:libpcreposix = "${libdir}/libpcreposix.so.*" +FILES:pcregrep = "${bindir}/pcregrep" +FILES:pcregrep-doc = "${mandir}/man1/pcregrep.1" +FILES:pcretest = "${bindir}/pcretest" +FILES:pcretest-doc = "${mandir}/man1/pcretest.1" BBCLASSEXTEND = "native nativesdk" @@ -72,4 +70,4 @@ do_install_ptest() { sed -i -e 's:do3=yes:do3=no:g' ${D}${PTEST_PATH}/RunTest } -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" |