diff options
Diffstat (limited to 'dev-libs/libpcre2')
-rw-r--r-- | dev-libs/libpcre2/Manifest | 13 | ||||
-rw-r--r-- | dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch | 30 | ||||
-rw-r--r-- | dev-libs/libpcre2/libpcre2-10.42-r1.ebuild | 97 | ||||
-rw-r--r-- | dev-libs/libpcre2/libpcre2-10.42-r2.ebuild | 96 | ||||
-rw-r--r-- | dev-libs/libpcre2/libpcre2-10.44-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libpcre2/libpcre2-10.45.ebuild (renamed from dev-libs/libpcre2/libpcre2-10.43.ebuild) | 20 |
6 files changed, 19 insertions, 241 deletions
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest index 515363471453..9611e02f7db6 100644 --- a/dev-libs/libpcre2/Manifest +++ b/dev-libs/libpcre2/Manifest @@ -1,14 +1,9 @@ AUX libpcre2-10.10-000-Fix-multilib.patch 726 BLAKE2B 4f4c0db0f6a8a10851fa80ac6066f0b85031cbb5a55c29003cd9dd98364f32c679e66a5f905dc7713e15c85807da55fef5d1143d725c0aaf8d897a0b86d31e27 SHA512 aa3dc3148808d0e856e7d8c608342bd91b515e9924fefcfe1eec14af98ec4d6d194c0aedd559b2617145985376ca7496362a4e04c0bc35fe40983e8122c961d6 -AUX libpcre2-10.43-fix-loong-sljit.patch 1195 BLAKE2B a608f2dfd6ff5802ec978f3326e2c835322bc84f56b81406cbc3a96e90de04806ceba1b93f27c441d2d49ea12688236f94cf080ac8e7b26f794d12bb04600597 SHA512 1eefd5466bc886159825437e9af0a2cbd3cea25372a22bfbca46b13b7b169664d9207a7fe7a227aea69f637059e91d456ab0f7f461686050da01a66d4c471896 DIST libpcre2-10.44-32bit-tests.patch.xz 7024 BLAKE2B d8de8443a9ec165aa3b57384518c8bba06ded1c3d07d03d1451db07f4df13ee2514d055d4a4771162923a9845ac4694dd588ccdc773f0f3d013d7377581fe8b4 SHA512 bf8724db31b8cbdc631904cfdbcd1b2e66efa31f958a8919de0f3f03e129410e64e1274d28d0406c70b8a8ef49c3ed47712368bf9fd9ba2d3203afe4d4b104b7 -DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3 -DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7 -DIST pcre2-10.43.tar.bz2 1905255 BLAKE2B f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808 SHA512 8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9 -DIST pcre2-10.43.tar.bz2.sig 310 BLAKE2B 5625358ec542a2c808be852437ca47a4df005068759e35b95ba20a55e5d1647b0953df6684e24b6a9de1442c6d6784e45fb1665d48c904dda4ffa16154437c7d SHA512 5edb16176ea4335ab1d35f1b77837c8b6b836f346e379e6b5762e1f4463cb3fb55557fee4dc6d0e9b2084766cdba727c9503830031bb92af91f9706e11389d81 DIST pcre2-10.44.tar.bz2 1928086 BLAKE2B fb06228f8bdc5906ef4f19d7d677f1009070855149d9ad3f807cfcd164f5cb6165f96e074fedc3942226d4b29edf4b29fab6cde2f2ba58bf6da282730941412b SHA512 ee91cc10a2962bc7818b03d368df3dd31f42ea9a7260ae51483ea8cd331b7431e36e63256b0adc213cc6d6741e7c90414fd420622308c0ae3fcb5dd878591be2 DIST pcre2-10.44.tar.bz2.sig 310 BLAKE2B a03943d4b04af319ca18992188c9fdd089fc20ef35207b09f2c859ab0090401a9bc140c653ee68a542984d26c0ec59f3ba72b0f9a9d6b3ae322b0823a440a21c SHA512 12dca6fb6ac3dbbe9e3625214b333d20d4ece4c2efa73ada292b178b17ea3640b4f068f2b4da2bea15f5368213e123837dea4e988170d1c6bf5b7afe04b3f8bc -EBUILD libpcre2-10.42-r1.ebuild 2548 BLAKE2B 5cf3ec82ed64d4d7166c5297ff89a0af58e7d2ce6b1b40f2255c0284ce6302c8f1b454b02b37c69b31a19360f85c1ff0a0b752df43b15d8169e40610c6584713 SHA512 af768399128a4ab8a01ee0be69558f0e499b58566b90259047b1cc100133565af59d9968ef8cc1a325941c31a7af8524304e0bc7a62531765ec2d2ac5398b094 -EBUILD libpcre2-10.42-r2.ebuild 2468 BLAKE2B dbf69ae22fb875e56b3b04d4bd844c37a10fe4418b4d834c49c2535c2c9f3731ca79281ae1f1d8de2d83c7ea8a5b995f06f7969cb98831f06f7f76984562935d SHA512 f14ac0b1e77bb68e093efc6a9e333de644ac1d7a4ed43360034c75a5f732c2ad20aee0b657fb5a6bdb2dccb54a8342c26f238eb620a595ce927932fa178fba0b -EBUILD libpcre2-10.43.ebuild 2401 BLAKE2B 80a41329245d567e068ab47a5823bdf5d86ac4bd64d3708317ecc3ed8e1a589c8cd6a80b49f85733c727dee8d16c1651305f73fe3c212e9069a07083886a2060 SHA512 f060771572ed31b0dddb318b45e64f94bc8e0622dcbcdb139b62808107c93a8371044d1677bb070946c0e56481517d151d522f7de16e2bc94d8278bc85c3b0c5 -EBUILD libpcre2-10.44-r1.ebuild 3198 BLAKE2B 720912b684eb9e236e39954d60bcc92550c51caef4234552d91f739d683d79d9802393ff1518556e2bc4075b006526f350381709983bd12041c782e766ad1a96 SHA512 ea0139aba31eb461a035a67106812a7360969e2a3ff39a6790ccb05756eabdd863ecadc03d5e2cdfa2bfb419d47b422b504e45e905c6f8ef9bdae80bc17324f2 +DIST pcre2-10.45.tar.bz2 2072403 BLAKE2B ec8a76cb28ef6680f8655828462551baf4e48019ff01e40bda2732b43b849bd69f8321238d7fa8f6b650ec88f7229a72928ad95d57423643f995d95264f5a4db SHA512 4c1f0cf793624516d7eeb15745d6c07c9f678dd2c2b349062c6b614e88bf42262972d133576e85140dee2a882984aaf2d688953fc9c69ec7105b2daaeae89845 +DIST pcre2-10.45.tar.bz2.sig 566 BLAKE2B 21a7fc4d6a116c5fde78a8abc99445bd3ce8da70083e65b4117cec2520ed10fee810b8b82226cecb1e5649643be96bb8c89ec80f9dd907bbf95373477febc83d SHA512 ff8a0f036d98b902fa2476cf5875089685cc712294629fc385c8c84c8288674e83f278fe36141b4c109eb68a64b3e6a29d0049c799bd5ab77cf15142de3c8e20 +EBUILD libpcre2-10.44-r1.ebuild 3236 BLAKE2B 74d2b0a505c97d787eb1107c96a6f9062a8af2c2b61ce048bcf768ba17f0f243bb35e71ce93feeb45069e287bff133711ad43aeba29475532e603325148683d7 SHA512 f14cef9e2f2a50cc82cfdc478d5b505f3e16a2da6bcd328bd443e37830317d33af3691a64d45a8c8f7dd47d99a3c621c0d4a5039a94114a897e58164dee16284 +EBUILD libpcre2-10.45.ebuild 2767 BLAKE2B 16b674c20abee9863808c7fa6c9abc499ee8ce2b6b48cd669ee84dbb9bc623089b56a6d90f83832602bb3114fa0eaf521e573140cb5c2001b0ef0a31eb8c8b22 SHA512 12cc0cebadf055f0385c4cdade2af37b1a7efd70f75eb21a03fb245449cb8bb5c0be0ee67381362de7f1ac3ff2f637fa1ba57c6b7de8ea2f3672a37bfece7505 MISC metadata.xml 1088 BLAKE2B 4adc3d90d0a974c796b33195448d4a1ebaefef89f76137b3501fb2d35a05cbc78d2131742110737720d32ff239cc5c8a5df694330362a261cbbf5da3a0a285ef SHA512 d01ea4e26b1335c2fea7fb39c489411b72e777f6e4173adedb782387f34b6197fab65723071811fa9e69708909ae49091f7467cb0254b669a3d1a8320dccab16 diff --git a/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch b/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch deleted file mode 100644 index 30fe49410bd5..000000000000 --- a/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/zherczeg/sljit/commit/7a821cd714d132e46e748275a80d402beea24764 -with file path adjusted to libpcre2 layout - -From: lrzlin <54242813+lrzlin@users.noreply.github.com> -Date: Wed, 10 Jan 2024 07:13:55 +0800 -Subject: [PATCH] Add LoongArch float to integer conversion special cases - (#226) - ---- a/src/sljit/sljitConfigInternal.h -+++ b/src/sljit/sljitConfigInternal.h -@@ -198,7 +198,7 @@ extern "C" { - /* Type of public API functions. */ - /*********************************/ - --#ifndef SLJIT_API_FUNC_ATTRIBUTE -+#ifndef SLJIT_API_FUNC_ATTRIBUTE - #if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC) - /* Static ABI functions. For all-in-one programs. */ - -@@ -399,6 +399,10 @@ typedef double sljit_f64; - #define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT - #define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT - #define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_MIN_INT -+#elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH) -+#define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT -+#define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT -+#define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_ZERO - #else - #error "Result for float to integer conversion is not defined" - #endif diff --git a/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild deleted file mode 100644 index 7a0d032915a5..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc -inherit libtool multilib-minimal usr-ldscript verify-sig - -MY_P="pcre2-${PV/_rc/-RC}" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://www.pcre.org/" -if [[ ${PV} != *_rc* ]] ; then - # Only the final releases are available here. - SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 - verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )" -else - SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0/3" # libpcre2-posix.so version -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib" -REQUIRED_USE="?? ( libedit readline )" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-debug/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-philiphazel ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch -) - -src_prepare() { - default - - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - --enable-pcre2-8 - --enable-shared - $(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 valgrind) - $(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_test() { - emake check VERBOSE=yes -} - -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 pcre2-8 -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild deleted file mode 100644 index 020533611b16..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc -inherit libtool multilib-minimal verify-sig - -MY_P="pcre2-${PV/_rc/-RC}" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://www.pcre.org/" -if [[ ${PV} != *_rc* ]] ; then - # Only the final releases are available here. - SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 - verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )" -else - SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0/3" # libpcre2-posix.so version -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib" -REQUIRED_USE="?? ( libedit readline )" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-debug/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-philiphazel ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch -) - -src_prepare() { - default - - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - --enable-pcre2-8 - --enable-shared - $(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 valgrind) - $(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_test() { - emake check VERBOSE=yes -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ - install -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild index a8241ab04ee8..af9e44cfe85d 100644 --- a/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ inherit libtool multilib multilib-minimal toolchain-funcs verify-sig MY_P="pcre2-${PV/_rc/-RC}" DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://www.pcre.org/" +HOMEPAGE="https://pcre2project.github.io/pcre2/ https://www.pcre.org/" SRC_URI=" https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 diff --git a/dev-libs/libpcre2/libpcre2-10.43.ebuild b/dev-libs/libpcre2/libpcre2-10.45.ebuild index 65eaa84b3ca7..eaf3934f0986 100644 --- a/dev-libs/libpcre2/libpcre2-10.43.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.45.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc -inherit libtool multilib-minimal verify-sig +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nicholaswilson.asc +inherit libtool multilib multilib-minimal toolchain-funcs verify-sig MY_P="pcre2-${PV/_rc/-RC}" DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://www.pcre.org/" +HOMEPAGE="https://pcre2project.github.io/pcre2/ https://www.pcre.org/" SRC_URI=" https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib" REQUIRED_USE="?? ( libedit readline )" @@ -38,7 +38,7 @@ DEPEND=" " BDEPEND=" virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-philiphazel ) + verify-sig? ( sec-keys/openpgp-keys-nicholaswilson ) " MULTILIB_CHOST_TOOLS=( @@ -47,7 +47,6 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch - "${FILESDIR}"/${PN}-10.43-fix-loong-sljit.patch ) src_prepare() { @@ -89,6 +88,13 @@ multilib_src_install() { DESTDIR="${D}" \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install + + # bug #934977 + if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/libpcre2-8$(get_libname)" ]] ; then + eerror "Sanity check for libpcre2-8$(get_libname) failed." + eerror "Shared library wasn't built, possible libtool bug" + [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "libpcre2-8$(get_libname) not found in build, aborting" + fi } multilib_src_install_all() { |