From e50b5437442567bdc9e2ebb97f6f0eaa9f36b112 Mon Sep 17 00:00:00 2001 From: hongjinghao Date: Fri, 12 Jul 2024 10:18:10 +0000 Subject: [PATCH 1/4] add configure. Signed-off-by: hongjinghao --- configure | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 configure diff --git a/configure b/configure new file mode 100644 index 0000000..0d8221b --- /dev/null +++ b/configure @@ -0,0 +1,24 @@ +if test -f "$rsrc/MANIFEST"; then + echo "First let's make sure your kit is complete. Checking..." >&4 + awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | \ + (split -l 50 2>/dev/null || split -50) + rm -f missing + tmppwd=`pwd` + + for filelist in x??; do + (cd "$rsrc"; ls `cat "$tmppwd/$filelist"`) + done + echo "write missing" >&4 + for filelist in x??; do + cd "$tmppwd/$rsrc"; + for file in `cat "$tmppwd/$filelist"`; do + if [ ! -e $file ]; then + echo "$file" >> "$tmppwd/missing" + fi + done + done + cd "$tmppwd" + + if test -s missing; then + cat missing >&4 + cat >&4 <<'EOM' \ No newline at end of file -- Gitee From 973996effa1348d9c34728fa0096b4f23b48c0da Mon Sep 17 00:00:00 2001 From: hongjinghao Date: Fri, 12 Jul 2024 10:19:21 +0000 Subject: [PATCH 2/4] update configure. Signed-off-by: hongjinghao --- configure | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/configure b/configure index 0d8221b..4edac49 100644 --- a/configure +++ b/configure @@ -1,14 +1,3 @@ -if test -f "$rsrc/MANIFEST"; then - echo "First let's make sure your kit is complete. Checking..." >&4 - awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | \ - (split -l 50 2>/dev/null || split -50) - rm -f missing - tmppwd=`pwd` - - for filelist in x??; do - (cd "$rsrc"; ls `cat "$tmppwd/$filelist"`) - done - echo "write missing" >&4 for filelist in x??; do cd "$tmppwd/$rsrc"; for file in `cat "$tmppwd/$filelist"`; do @@ -17,8 +6,4 @@ if test -f "$rsrc/MANIFEST"; then fi done done - cd "$tmppwd" - - if test -s missing; then - cat missing >&4 - cat >&4 <<'EOM' \ No newline at end of file + cd "$tmppwd" \ No newline at end of file -- Gitee From e97b2be5aa26e2c34b328122fc9ba0c403dc9c62 Mon Sep 17 00:00:00 2001 From: hongjinghao Date: Fri, 12 Jul 2024 10:20:58 +0000 Subject: [PATCH 3/4] update configure. Signed-off-by: hongjinghao --- configure | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 4edac49..186f73a 100644 --- a/configure +++ b/configure @@ -6,4 +6,11 @@ fi done done - cd "$tmppwd" \ No newline at end of file + cd "$tmppwd" + + if test -s missing; then + echo "These file is not exists:" + cat missing >&4 + cat >&4 <<'EOM' + +THIS PACKAGE SEEMS TO BE INCOMPLETE. \ No newline at end of file -- Gitee From b02398adb1bcf0ccb1cc6cf6d136f29f49ee8975 Mon Sep 17 00:00:00 2001 From: hongjinghao Date: Wed, 31 Jul 2024 16:14:20 +0800 Subject: [PATCH 4/4] backport update stream --- 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..0c2b8be 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.6 +- 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