diff --git a/1001-Adapt-Configure-to-GCC-version.patch b/1001-Adapt-Configure-to-GCC-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..14a1e9953fc69a723c8099fbabdc0853c39d7afd --- /dev/null +++ b/1001-Adapt-Configure-to-GCC-version.patch @@ -0,0 +1,77 @@ +From 3730c664d51f0533a128307c2aa807102f9faadc Mon Sep 17 00:00:00 2001 +From: songmingliang +Date: Tue, 19 Apr 2022 18:23:08 +0800 +Subject: [PATCH] Adapt Configure to GCC version 10 + +--- + Configure | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Configure b/Configure +index 9aa5dcc..ee85821 100755 +--- a/Configure ++++ b/Configure +@@ -4674,7 +4674,7 @@ $cat >try.c </dev/null 2>&1 + then + # Interactive Systems (ISC) POSIX mode. +@@ -5484,7 +5484,7 @@ default|recommended) + ;; + esac + case "$gccversion" in +- 1*) ;; ++ 1.*) ;; + 2.[0-8]*) ;; + ?*) set strict-aliasing -fno-strict-aliasing + eval $checkccflag +@@ -5602,7 +5602,7 @@ case "$cppflags" in + ;; + esac + case "$gccversion" in +-1*) cppflags="$cppflags -D__GNUC__" ++1.*) cppflags="$cppflags -D__GNUC__" + esac + case "$mips_type" in + '');; +@@ -23613,7 +23613,7 @@ fi + + : add -D_FORTIFY_SOURCE if feasible and not already there + case "$gccversion" in +-[4567].*) case "$optimize$ccflags" in ++[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in + *-O*) case "$ccflags$cppsymbols" in + *_FORTIFY_SOURCE=*) # Don't add it again. + echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4 +-- +2.27.0 + diff --git a/perl.spec b/perl.spec index b97a3d532d32d8d36a036bec255f707b5d8d3298..7322d1d5378c903543ba9a74742a16770e89c9b3 100644 --- a/perl.spec +++ b/perl.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global perl_version 5.26.3 %global perl_epoch 4 %global perl_arch_stem -thread-multi @@ -81,7 +82,7 @@ License: GPL+ or Artistic Epoch: %{perl_epoch} Version: %{perl_version} # release number must be even higher, because dual-lived modules will be broken otherwise -Release: 421%{?dist} +Release: 421%{anolis_release}%{?dist} Summary: Practical Extraction and Report Language Url: http://www.perl.org/ Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2 @@ -324,6 +325,11 @@ Patch201: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.pa # Update some of the bundled modules # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions +# Begin: Anolis customized patches +# backport patch from upstream +Patch1001: 1001-Adapt-Configure-to-GCC-version.patch +# End: Anolis customized patches + BuildRequires: bash BuildRequires: bzip2-devel BuildRequires: coreutils @@ -2933,6 +2939,8 @@ Perl extension for Version Objects %patch200 -p1 %patch201 -p1 +%patch1001 -p1 + %if !%{defined perl_bootstrap} # Local patch tracking perl -x patchlevel.h \ @@ -5280,6 +5288,9 @@ popd # Old changelog entries are preserved in CVS. %changelog +* Tue Apr 19 2022 Weitao Zhou - 4:5.26.3-421.0.1 +- Adapt Configure to GCC version 10 + * Mon Oct 18 2021 Jitka Plesnikova - 4:5.26.3-421 - Fix a memory leak when compiling a regular expression with a non-word class (bug #2014981)