From 8c2278288c4d10dfe8a80210801b49766df022ef Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Sep 2024 07:12:29 +0000 Subject: [PATCH] dev-lang/perl: Sync with Gentoo It's from Gentoo commit 0e727a3a16bc2abfd39386f10821d3e5ce89c45a. --- ...ix-compilation-in-eprefix-bug-939014.patch | 51 +++++++++++++++++++ .../dev-lang/perl/perl-5.38.2-r3.ebuild | 2 +- .../dev-lang/perl/perl-5.38.2-r5.ebuild | 2 +- .../dev-lang/perl/perl-5.38.2-r6.ebuild | 2 +- .../dev-lang/perl/perl-5.40.0.ebuild | 6 ++- 5 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch new file mode 100644 index 0000000000..3362947876 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch @@ -0,0 +1,51 @@ +https://bugs.gentoo.org/939014 +https://github.com/Perl/perl5/pull/22569 + +From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001 +From: Andrei Horodniceanu +Date: Wed, 4 Sep 2024 12:46:44 +0300 +Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale + +Signed-off-by: Andrei Horodniceanu +--- a/AUTHORS ++++ b/AUTHORS +@@ -103,6 +103,7 @@ Andreas König + Andreas Marienborg + Andreas Schwab + Andreas Voegele ++Andrei Horodniceanu + Andrei Yelistratov + Andrej Borsenkow + Andrew Bettison +--- a/locale.c ++++ b/locale.c +@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + * categories into our internal indices. */ + if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) { + ++# ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT + /* Use this array, initialized by a config.h constant */ + int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT; + STATIC_ASSERT_STMT( C_ARRAY_LENGTH(lc_all_category_positions) +@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + map_LC_ALL_position_to_index[i] = + get_category_index(lc_all_category_positions[i]); + } ++# else ++ /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and ++ * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on ++ * systems with only a C locale during ./Configure. Assume that this ++ * can only happen as part of some sort of bootstrapping so allow ++ * compilation to succeed by ignoring correctness. ++ */ ++ for (unsigned int i = 0; ++ i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index); ++ i++) ++ { ++ map_LC_ALL_position_to_index[i] = 0; ++ } ++# endif ++ + } + + LOCALE_UNLOCK; diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r3.ebuild index ed241260b8..68f4571a01 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r3.ebuild @@ -56,7 +56,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then - 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r5.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r5.ebuild index 37a04465b8..ee0436a5d6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r5.ebuild @@ -56,7 +56,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then - 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r6.ebuild index 51b567eba9..832d06a4cf 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r6.ebuild @@ -56,7 +56,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then - 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild index cd9a0e1fd6..0a6d5010c8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild @@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then - 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath" @@ -81,6 +81,10 @@ PDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${P}-fix-compilation-in-eprefix-bug-939014.patch" +) + # bug 390719, bug 523624 # virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker