From 0cac9d486798562df2d161ba9ddea8f440870f20 Mon Sep 17 00:00:00 2001 From: hongjinghao Date: Wed, 31 Jul 2024 16:20:39 +0800 Subject: [PATCH] backport update stream (cherry picked from commit dd827b7a06fde30441973ef2009ef2e4580419fd) --- backport-aarch64-ilp32-support.patch | 45 ++++++++++++++++++++++++++++ perl.spec | 8 ++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 backport-aarch64-ilp32-support.patch diff --git a/backport-aarch64-ilp32-support.patch b/backport-aarch64-ilp32-support.patch new file mode 100644 index 0000000..4e14c91 --- /dev/null +++ b/backport-aarch64-ilp32-support.patch @@ -0,0 +1,45 @@ +From 55a0aab68d5ce90ce8bb7442ba61639c49e50c1d Mon Sep 17 00:00:00 2001 +From: root +Date: Mon, 21 Sep 2020 09:45:33 +0800 +Subject: [PATCH] aarch64 ilp32 support + +Conflict:NA +Reference:https://build.opensuse.org/package/view_file/devel:ARM:Factory:Contrib:ILP32/perl/aarch64-ilp32.patch?expand=1 + +--- + hints/linux.sh | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/hints/linux.sh b/hints/linux.sh +index c749f0f..27322dc 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -311,6 +311,25 @@ sparc*) + ;; + esac + ++case $archname in ++aarch64-linux) ++ cat >try.c <<'EOM' ++/* Test for ILP32 */ ++#include ++main() { ++ int ilp32 = 0; ++ #ifdef __ILP32__ ++ ilp32 = 1; ++ #endif ++ exit(!ilp32); ++} ++EOM ++ if ${cc:-gcc} $ccflags $ldflags try.c >/dev/null 2>&1 && $run ./a.out; then ++ archname=aarch64-ilp32-linux ++ fi ++ ;; ++esac ++ + # SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than + # true libraries. The scripts cause binding against static + # version of -lgdbm which is a bad idea. So if we have 'nm' +-- +2.27.0 + diff --git a/perl.spec b/perl.spec index 3047e37..2698090 100644 --- a/perl.spec +++ b/perl.spec @@ -24,7 +24,7 @@ Name: perl License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and MIT and UCD and Public Domain and BSD Epoch: 4 Version: %{perl_version} -Release: 6 +Release: 7 Summary: A highly capable, feature-rich programming language Url: https://www.perl.org/ Source0: https://www.cpan.org/src/5.0/%{name}-%{version}.tar.xz @@ -39,6 +39,8 @@ Patch7: backport-CVE-2023-47100-CVE-2023-47038.patch Patch8: backport-CVE-2023-47039.patch Patch9: perl-5.38.0-Link-XS-modules-to-libperl.so-with-EU-MM.patch +Patch6000: backport-aarch64-ilp32-support.patch + BuildRequires: gcc bash findutils coreutils make tar procps bzip2-devel gdbm-devel perl-File-Compare perl-File-Find BuildRequires: zlib-devel perl-interpreter perl-generators %if %{with systemtap} @@ -499,6 +501,10 @@ make test_harness %{_mandir}/man3/* %changelog +* Wed Jul 31 2024 hongjinghao - 4:5.38.0-7 +- sync patch from upstream + backport-aarch64-ilp32-support.patch + * Wed Mar 20 2024 zhangzikang - 4:5.38.0-6 - Fix perl re.so undefined symbol error -- Gitee