diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest index 8497efa485..dcba31a9c9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest @@ -1,3 +1,4 @@ -DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f -DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524 -DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd +DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306 +DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec +DIST pcre2-10.38.tar.bz2 1729078 BLAKE2B 9438ff2422afaa83d5a4b2e64d5897068c35add28d66956431f9937191416d6df4903ecf35af72c788480d7def08e0ce17922e9b036698ce1bbe6cacbb799df2 SHA512 3634cb2db6ccba9720c1b69890bcd9eb7057f6a6cb6981f12b3f2d6b2bb4e75e4e5014f566045f9ba1b79edf01fa5c4d81eb333727b9462e843dfb70f3a58f95 +DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc66425b62270f6891667bde5fb00c1e779c9730df3522acbd62d11703343bf48265050c09d3754183de314baf7cddd SHA512 b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch new file mode 100644 index 0000000000..6ee5494f2b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch @@ -0,0 +1,80 @@ +Index: pcre2/ChangeLog +=================================================================== +--- pcre2/ChangeLog (revision 1314) ++++ pcre2/ChangeLog (revision 1315) +@@ -1,7 +1,14 @@ + Change Log for PCRE2 + -------------------- + ++Version 10.38-RC1 xx-xxx-2021 ++----------------------------- + ++1. Fix invalid single character repetition issues in JIT when the repetition ++is inside a capturing bracket and the bracket is preceeded by character ++literals. ++ ++ + Version 10.37 26-May-2021 + ------------------------- + +Index: pcre2/src/pcre2_jit_compile.c +=================================================================== +--- pcre2/src/pcre2_jit_compile.c (revision 1314) ++++ pcre2/src/pcre2_jit_compile.c (revision 1315) +@@ -1236,15 +1236,16 @@ + + return: current number of iterators enhanced with fast fail + */ +-static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, sljit_s32 depth, int start) ++static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, ++ sljit_s32 depth, int start, BOOL fast_forward_allowed) + { + PCRE2_SPTR begin = cc; + PCRE2_SPTR next_alt; + PCRE2_SPTR end; + PCRE2_SPTR accelerated_start; ++BOOL prev_fast_forward_allowed; + int result = 0; + int count; +-BOOL fast_forward_allowed = TRUE; + + SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA); + SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0); +@@ -1476,6 +1477,7 @@ + case OP_CBRA: + end = cc + GET(cc, 1); + ++ prev_fast_forward_allowed = fast_forward_allowed; + fast_forward_allowed = FALSE; + if (depth >= 4) + break; +@@ -1484,7 +1486,7 @@ + if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)) + break; + +- count = detect_early_fail(common, cc, private_data_start, depth + 1, count); ++ count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed); + + if (PRIVATE_DATA(cc) != 0) + common->private_data_ptrs[begin - common->start] = 1; +@@ -13657,7 +13659,7 @@ + private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw); + + if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back) +- detect_early_fail(common, common->start, &private_data_size, 0, 0); ++ detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE); + + set_private_data_ptrs(common, &private_data_size, ccend); + +Index: pcre2/src/pcre2_jit_test.c +=================================================================== +--- pcre2/src/pcre2_jit_test.c (revision 1314) ++++ pcre2/src/pcre2_jit_test.c (revision 1315) +@@ -351,6 +351,7 @@ + { MU, A, 0, 0, ".[ab]*a", "xxa" }, + { MU, A, 0, 0, ".[ab]?.", "xx" }, + { MU, A, 0, 0, "_[ab]+_*a", "_aa" }, ++ { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" }, + + /* Bracket repeats with limit. */ + { MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" }, diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch new file mode 100644 index 0000000000..936bd057a0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch @@ -0,0 +1,49 @@ +https://github.com/PhilipHazel/pcre2/pull/22 + +--- a/src/pcre2_jit_compile.c ++++ b/src/pcre2_jit_compile.c +@@ -1251,10 +1251,13 @@ SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA); + SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0); + SLJIT_ASSERT(start < EARLY_FAIL_ENHANCE_MAX); + ++next_alt = cc + GET(cc, 1); ++if (*next_alt == OP_ALT) ++ fast_forward_allowed = FALSE; ++ + do + { + count = start; +- next_alt = cc + GET(cc, 1); + cc += 1 + LINK_SIZE + ((*cc == OP_CBRA) ? IMM2_SIZE : 0); + + while (TRUE) +@@ -1512,7 +1515,7 @@ do + { + count++; + +- if (fast_forward_allowed && *next_alt == OP_KET) ++ if (fast_forward_allowed) + { + common->fast_forward_bc_ptr = accelerated_start; + common->private_data_ptrs[(accelerated_start + 1) - common->start] = ((*private_data_start) << 3) | type_skip; +@@ -1562,8 +1565,8 @@ do + else if (result < count) + result = count; + +- fast_forward_allowed = FALSE; + cc = next_alt; ++ next_alt = cc + GET(cc, 1); + } + while (*cc == OP_ALT); + +--- a/src/pcre2_jit_test.c ++++ b/src/pcre2_jit_test.c +@@ -352,6 +352,7 @@ static struct regression_test_case regression_test_cases[] = { + { MU, A, 0, 0, ".[ab]?.", "xx" }, + { MU, A, 0, 0, "_[ab]+_*a", "_aa" }, + { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" }, ++ { MU, A, 0, 0, "(?P\\d+)m|M", "4M" }, + + /* Bracket repeats with limit. */ + { MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" }, + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.34.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild similarity index 77% rename from sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.34.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild index 073c2ee568..abd807adeb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.34.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript +inherit libtool multilib-minimal usr-ldscript -PATCH_SET="${P}-patchset-01.tar.xz" +PATCH_SET="${PN}-10.36-patchset-01.tar.xz" DESCRIPTION="Perl-compatible regular expression library" HOMEPAGE="https://www.pcre.org/" @@ -24,14 +24,13 @@ if [[ -n "${PATCH_SET}" ]] ; then fi LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +SLOT="0/3" # libpcre2-posix.so version +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" REQUIRED_USE="?? ( libedit readline )" BDEPEND=" virtual/pkgconfig - userland_GNU? ( >=sys-apps/findutils-4.4.0 ) " RDEPEND=" bzip2? ( app-arch/bzip2 ) @@ -43,12 +42,19 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${P}-jit_fixes.patch" +) + MULTILIB_CHOST_TOOLS=( /usr/bin/pcre2-config ) src_prepare() { - [[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches + if [[ -d "${WORKDIR}/patches" ]] ; then + rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die + eapply "${WORKDIR}"/patches + fi default diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild new file mode 100644 index 0000000000..84077f8a1f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool multilib-minimal usr-ldscript + +PATCH_SET="${PN}-10.36-patchset-01.tar.xz" + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="https://www.pcre.org/" +MY_P="pcre2-${PV/_rc/-RC}" +if [[ ${PV} != *_rc* ]] ; then + # Only the final releases are available here. + SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 + https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 + https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" +else + SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" +fi + +if [[ -n "${PATCH_SET}" ]] ; then + SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET} + https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}" +fi + +LICENSE="BSD" +SLOT="0/3" # libpcre2-posix.so version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +REQUIRED_USE="?? ( libedit readline )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:0= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/${P}-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch ) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre2-config +) + +src_prepare() { + if [[ -d "${WORKDIR}/patches" ]] ; then + rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die + eapply "${WORKDIR}"/patches + fi + + default + + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --enable-pcre2-8 + --enable-shared + --with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT) + $(multilib_native_use_enable bzip2 pcre2grep-libbz2) + $(multilib_native_use_enable libedit pcre2test-libedit) + $(multilib_native_use_enable readline pcre2test-libreadline) + $(multilib_native_use_enable zlib pcre2grep-libz) + $(use_enable jit) + $(use_enable jit pcre2grep-jit) + $(use_enable pcre16 pcre2-16) + $(use_enable pcre32 pcre2-32) + $(use_enable static-libs static) + $(use_enable unicode) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ + install + multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.35.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.38.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.35.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.38.ebuild index 89944f501c..6f868c1cfe 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.35.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.38.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript +inherit libtool multilib-minimal usr-ldscript -PATCH_SET="${PN}-10.34-patchset-01.tar.xz" +PATCH_SET="${PN}-10.36-patchset-01.tar.xz" DESCRIPTION="Perl-compatible regular expression library" HOMEPAGE="https://www.pcre.org/" @@ -13,7 +13,8 @@ MY_P="pcre2-${PV/_rc/-RC}" if [[ ${PV} != *_rc* ]] ; then # Only the final releases are available here. SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2" + https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 + https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" else SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" fi @@ -24,14 +25,13 @@ if [[ -n "${PATCH_SET}" ]] ; then fi LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +SLOT="0/3" # libpcre2-posix.so version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" REQUIRED_USE="?? ( libedit readline )" BDEPEND=" virtual/pkgconfig - userland_GNU? ( >=sys-apps/findutils-4.4.0 ) " RDEPEND=" bzip2? ( app-arch/bzip2 ) @@ -48,7 +48,10 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { - [[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches + if [[ -d "${WORKDIR}/patches" ]] ; then + rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die + eapply "${WORKDIR}"/patches + fi default diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.39.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.39.ebuild new file mode 100644 index 0000000000..477a50daf5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.39.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool multilib-minimal usr-ldscript + +PATCH_SET="${PN}-10.36-patchset-01.tar.xz" + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="https://www.pcre.org/" +MY_P="pcre2-${PV/_rc/-RC}" +if [[ ${PV} != *_rc* ]] ; then + # Only the final releases are available here. + SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 + https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 + https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" +else + SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" +fi + +if [[ -n "${PATCH_SET}" ]] ; then + SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET} + https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}" +fi + +LICENSE="BSD" +SLOT="0/3" # libpcre2-posix.so version +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +REQUIRED_USE="?? ( libedit readline )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:0= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre2-config +) + +src_prepare() { + if [[ -d "${WORKDIR}/patches" ]] ; then + rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die + eapply "${WORKDIR}"/patches + fi + + default + + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --enable-pcre2-8 + --enable-shared + --with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT) + $(multilib_native_use_enable bzip2 pcre2grep-libbz2) + $(multilib_native_use_enable libedit pcre2test-libedit) + $(multilib_native_use_enable readline pcre2test-libreadline) + $(multilib_native_use_enable zlib pcre2grep-libz) + $(use_enable jit) + $(use_enable jit pcre2grep-jit) + $(use_enable pcre16 pcre2-16) + $(use_enable pcre32 pcre2-32) + $(use_enable static-libs static) + $(use_enable unicode) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ + install + multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/metadata.xml index 1e5257985a..0d201299bd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org @@ -25,6 +25,9 @@ gzip-compressed files (via sys-libs/zlib). + + Reflects binary compatibility for libpcre2-posix.so. + cpe:/a:pcre:pcre pcre