!19 support for i686 and remove perl-devel

From: @weiwei_150212
Reviewed-by: @overweight
Signed-off-by: @overweight

backport-aarch64-ilp32-support.patch

@@ -0,0 +1,40 @@
+From 55a0aab68d5ce90ce8bb7442ba61639c49e50c1d Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Mon, 21 Sep 2020 09:45:33 +0800
+Subject: [PATCH] aarch64 ilp32 support
+https://build.opensuse.org/package/view_file/devel:ARM:Factory:Contrib:ILP32/perl/aarch64-ilp32.patch?expand=1
+---
+ hints/linux.sh | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/hints/linux.sh b/hints/linux.sh
+index 3f38ea0..19dd165 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -298,6 +298,23 @@ sparc*)
+ 	;;
+ esac
+ 
++case $archname in
++	arch64-linux)
++	cat >try.c <<'EOM'
++#include <stdlib.h>
++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.23.0
+

backport-perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch

@@ -0,0 +1,65 @@
+From 9644657c4 10326749fd321d9c24944ec25afad2f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 20 Jun 2013 15:22:53 +0200
+Subject: [PATCH] Install libperl.so to shrpdir on Linux
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reason:Install libperl.so to shrpdir on Linux
+Conflict:NA
+Reference:https://src.fedoraproject.org/rpms/perl/blob/master/f/perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Configure   | 7 ++++---
+ Makefile.SH | 2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Configure b/Configure
+index 2f30261..825496e 100755
+--- a/Configure
++++ b/Configure
+@@ -8762,7 +8762,9 @@ esac
+ 
+ # Detect old use of shrpdir via undocumented Configure -Dshrpdir
+ case "$shrpdir" in
+-'') ;;
++'') 
++shrpdir=$archlibexp/CORE
++;;
+ *)	$cat >&4 <<EOM
+ WARNING:  Use of the shrpdir variable for the installation location of
+ the shared $libperl is not supported.  It was never documented and
+@@ -8792,7 +8794,6 @@ esac
+ # Add $xxx to ccdlflags.
+ # If we can't figure out a command-line option, use $shrpenv to
+ # set env LD_RUN_PATH.  The main perl makefile uses this.
+-shrpdir=$archlibexp/CORE
+ xxx=''
+ tmp_shrpenv=''
+ if "$useshrplib"; then
+@@ -8807,7 +8808,7 @@ if "$useshrplib"; then
+ 		xxx="-Wl,-R$shrpdir"
+ 		;;
+ 	bsdos|linux|irix*|dec_osf|gnu*|haiku)
+-		xxx="-Wl,-rpath,$shrpdir"
++		# We want standard path
+ 		;;
+ 	hpux*)
+ 		# hpux doesn't like the default, either.
+diff --git a/Makefile.SH b/Makefile.SH
+index 7733a32..a481183 100755
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -288,7 +288,7 @@ ranlib = $ranlib
+ # installman commandline.
+ bin = $installbin
+ scriptdir = $scriptdir
+-shrpdir = $archlibexp/CORE
++shrpdir = $shrpdir
+ privlib = $installprivlib
+ man1dir = $man1dir
+ man1ext = $man1ext
+-- 
+1.8.1.4

perl.spec

@@ -18,7 +18,7 @@ Name:           perl
 License:        (GPL+ or Artistic) and (GPLv2+ or Artistic) and MIT and UCD and Public Domain and BSD
 Epoch:          4
 Version:        5.28.3
-Release:        4
+Release:        5
 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
@@ -54,15 +54,21 @@ Patch25:        perl-132683-don-t-try-to-convert-PL_sv_placeholder-i.patch
 # PATCH-FIX-OPENEULER
 # In 2020, a year of 70 starts to mean 2070. So cpan/Time-Local/t/Local.t test
 Patch27:        Fix-time-local-tests-in-2020.patch
+Patch28:        backport-perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch
+
+
+%ifarch aarch64_ilp32
+Patch29:      backport-aarch64-ilp32-support.patch
+%endif
 
 BuildRequires:  gcc bash findutils coreutils make tar procps bzip2-devel gdbm-devel
 BuildRequires:  zlib-devel systemtap-sdt-devel perl-interpreter perl-generators gdb
 
 Requires:       perl-libs = %{epoch}:%{version}-%{release}
 Requires:       perl(:MODULE_COMPAT_5.28.0) perl-version perl-threads perl-threads-shared perl-parent
-Requires:       perl-devel = %{epoch}:%{version}-%{release} system-rpm-config
+Requires:       system-rpm-config
 Requires:       perl-Unicode-Collate perl-Unicode-Normalize perl-Time-Local perl-Time-HiRes
-Requires:       perl-Thread-Queue perl-Text-Tabs+Wrap perl-Test-Simple perl-Test-Harness perl-devel
+Requires:       perl-Thread-Queue perl-Text-Tabs+Wrap perl-Test-Simple perl-Test-Harness
 Requires:       perl-Text-Balanced perl-Text-ParseWords perl-Term-ANSIColor perl-Term-Cap
 Requires:       perl-Socket perl-podlators perl-Scalar-List-Utils perl-perlfaq perl-constant
 Requires:       perl-Digest-SHA perl-Digest perl-Digest-MD5 perl-Devel-PPPort perl-Carp perl-Env
@@ -140,13 +146,19 @@ sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST
         -Dldflags="$RPM_LD_FLAGS" -Dccdlflags="-Wl,--enable-new-dtags $RPM_LD_FLAGS" \
         -Dlddlflags="-shared $RPM_LD_FLAGS" -Dshrpdir="%{_libdir}" \
         -DDEBUGGING=-g -Dversion=%{version} -Dmyhostname=localhost \
-        -Dperladmin=root@localhost -Dcc='%{__cc}' -Dprefix=%{_prefix} \
+        -Dperladmin=root@localhost -Dcc=gcc -Dprefix=%{_prefix} \
         -Dvendorprefix=%{_prefix} -Dsiteprefix=%{_prefix}/local \
         -Dsitelib="%{_prefix}/local/share/perl5" -Dprivlib="%{perl_datadir}" \
         -Dsitearch="%{_prefix}/local/%{_lib}/perl5" \
         -Dvendorlib="%{perl_vendor_datadir}" -Darchlib="%{perl_libdir}" \
         -Dvendorarch="%{perl_vendor_libdir}" -Darchname="%{_arch}-%{_os}-thread-multi" \
+        %ifarch i686
+        -Dlibpth="/usr/local/lib /lib %{_prefix}/lib" \
+        %elifarch aarch64_ilp32
+        -Dlibpth="/usr/local/libilp32 /libilp32 %{_prefix}/libilp32" \
+        %else
         -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \
+        %endif
         -Duseshrplib -Dusethreads -Duseithreads -Ui_ndbm -Di_gdbm \
         -Dusedtrace='/usr/bin/dtrace' -Ubincompat5005 -Dusesitecustomize \
         -Duselargefiles -Dd_semctl_semun -Di_db -Duse64bitint \
@@ -155,6 +167,9 @@ sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST
         -Dd_gethostent_r_proto -Ud_endhostent_r_proto -Ud_sethostent_r_proto \
         -Ud_endprotoent_r_proto -Ud_setprotoent_r_proto \
         -Ud_endservent_r_proto -Ud_setservent_r_proto \
+        %ifarch aarch64_ilp32
+        -Duse64bitint \
+        %endif
 
 BUILD_BZIP2=0
 BZIP2_LIB=%{_libdir}
@@ -499,6 +514,12 @@ make test_harness
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 12 2021 tianwei <tianwei12@huawei.com> - 4:5.28.3-5
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:support for i686 and remove perl-devel from perl
+
 * Fri Jan 8 2021 tianwei <tianwei12@huawei.com> - 4:5.28.3-4
 - Type:enhancement
 - ID:NA