commit: f3a9792fdf7bcdf559adc43f563cc4886c208cee
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 6 05:38:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 22:49:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a9792f
dev-libs/libpcre2: remove usr-ldscript support
Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.
The functionality is, despite being called "split-usr", not really about
split-usr at all.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...bpcre2-10.43_rc1.ebuild => libpcre2-10.42-r2.ebuild} | 17 ++++++++++-------
dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild | 3 +--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
similarity index 75%
copy from dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
copy to dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
index f12355bd6b9e..881a0b37bcba 100644
--- a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
@@ -4,21 +4,26 @@
EAPI=7
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal usr-ldscript verify-sig
+inherit libtool multilib-minimal verify-sig
MY_P="pcre2-${PV/_rc/-RC}"
DESCRIPTION="Perl-compatible regular expression library"
HOMEPAGE="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
- verify-sig? (
https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig
)"
+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 ~ia64 ~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 ~ia64 ~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 )"
@@ -43,7 +48,6 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
"${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch
- "${FILESDIR}"/${PN}-10.43-fix-loong-sljit.patch
)
src_prepare() {
@@ -85,7 +89,6 @@ multilib_src_install() {
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() {
diff --git a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
b/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
index f12355bd6b9e..426be94c00e7 100644
--- a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal usr-ldscript verify-sig
+inherit libtool multilib-minimal verify-sig
MY_P="pcre2-${PV/_rc/-RC}"
@@ -85,7 +85,6 @@ multilib_src_install() {
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() {
