mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
Merge updates from master
This commit is contained in:
@@ -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 <a.horodniceanu@proton.me>
|
||||
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.horodniceanu@proton.me>
|
||||
--- a/AUTHORS
|
||||
+++ b/AUTHORS
|
||||
@@ -103,6 +103,7 @@ Andreas König <a.koenig@mind.de>
|
||||
Andreas Marienborg <andreas.marienborg@gmail.com>
|
||||
Andreas Schwab <schwab@suse.de>
|
||||
Andreas Voegele <andreas@andreasvoegele.com>
|
||||
+Andrei Horodniceanu <a.horodniceanu@proton.me>
|
||||
Andrei Yelistratov <andrew@sundale.net>
|
||||
Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
|
||||
Andrew Bettison <andrewb@zip.com.au>
|
||||
--- 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;
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
https://bugs.gentoo.org/939446
|
||||
https://sourceware.org/PR32164
|
||||
https://sourceware.org/git/?p=glibc.git;a=commit;h=7073164add3b874cf0c19ca0fb84236f6bb0985d
|
||||
|
||||
From 7073164add3b874cf0c19ca0fb84236f6bb0985d Mon Sep 17 00:00:00 2001
|
||||
From: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
||||
Date: Tue, 3 Sep 2024 14:58:33 -0400
|
||||
Subject: [PATCH] libio: Attempt wide backup free only for non-legacy code
|
||||
|
||||
_wide_data and _mode are not available in legacy code, so do not attempt
|
||||
to free the wide backup buffer in legacy code.
|
||||
|
||||
Resolves: BZ #32137 and BZ #27821
|
||||
|
||||
Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
||||
Reviewed-by: Florian Weimer <fweimer@redhat.com>
|
||||
(cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce)
|
||||
--- a/libio/genops.c
|
||||
+++ b/libio/genops.c
|
||||
@@ -819,7 +819,7 @@ _IO_unbuffer_all (void)
|
||||
/* Free up the backup area if it was ever allocated. */
|
||||
if (_IO_have_backup (fp))
|
||||
_IO_free_backup_area (fp);
|
||||
- if (fp->_mode > 0 && _IO_have_wbackup (fp))
|
||||
+ if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp))
|
||||
_IO_free_wbackup_area (fp);
|
||||
|
||||
if (! (fp->_flags & _IO_UNBUFFERED)
|
||||
--
|
||||
2.43.5
|
||||
@@ -979,6 +979,7 @@ src_prepare() {
|
||||
fi
|
||||
einfo "Applying Gentoo Glibc patchset ${patchsetname}"
|
||||
eapply "${WORKDIR}"/patches
|
||||
eapply "${FILESDIR}"/${P}-libio-legacy.patch
|
||||
einfo "Done."
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user