Add patches that are deleted during the upgrade
This commit is contained in:
dongyuzhen
parent
e713e89ca4
commit
43e44dabcf
60
change-lib-to-lib64.patch
Normal file
60
change-lib-to-lib64.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From 49abb326542984cecc5e61b3b66822b52cdc34e7 Mon Sep 17 00:00:00 2001
|
||||
From: openEuler Buildteam <buildteam@openeuler.org>
|
||||
Date: Mon, 30 Dec 2019 14:49:06 +0800
|
||||
Subject: [PATCH] change lib to lib64
|
||||
|
||||
---
|
||||
Configure | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Configure b/Configure
|
||||
index cc74bdc..0e7441d 100755
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -7229,8 +7229,8 @@ esac'
|
||||
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
|
||||
case "$installstyle" in
|
||||
'') case "$prefix" in
|
||||
- *perl*) dflt='lib';;
|
||||
- *) dflt='lib/perl5' ;;
|
||||
+ *perl*) dflt='lib64';;
|
||||
+ *) dflt='lib64/perl5' ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$installstyle" ;;
|
||||
@@ -7296,8 +7296,8 @@ esac
|
||||
: /opt/perl/lib/perl5... would be redundant.
|
||||
: The default "style" setting is made in installstyle.U
|
||||
case "$installstyle" in
|
||||
-*lib/perl5*) set dflt privlib lib/$package/$version ;;
|
||||
-*) set dflt privlib lib/$version ;;
|
||||
+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
|
||||
+*) set dflt privlib lib64/$version ;;
|
||||
esac
|
||||
eval $prefixit
|
||||
$cat <<EOM
|
||||
@@ -7544,8 +7544,8 @@ siteprefixexp="$ansexp"
|
||||
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
|
||||
case "$sitelib" in
|
||||
'') case "$installstyle" in
|
||||
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
|
||||
- *) dflt=$siteprefix/lib/site_$prog/$version ;;
|
||||
+ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
|
||||
+ *) dflt=$siteprefix/lib64/site_$prog/$version ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$sitelib"
|
||||
@@ -7963,8 +7963,8 @@ case "$vendorprefix" in
|
||||
'')
|
||||
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
|
||||
case "$installstyle" in
|
||||
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
|
||||
- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
|
||||
+ *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
|
||||
+ *) dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$vendorlib"
|
||||
--
|
||||
2.27.0
|
||||
|
||||
26
disable-rpath-by-default.patch
Normal file
26
disable-rpath-by-default.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 3a98cffd49b91e1b26846bb9a06446353a217b57 Mon Sep 17 00:00:00 2001
|
||||
From: openEuler Buildteam <buildteam@openeuler.org>
|
||||
Date: Mon, 30 Dec 2019 14:57:15 +0800
|
||||
Subject: [PATCH] disable rpath by default
|
||||
|
||||
---
|
||||
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
||||
index 977b50e..ac5cdb5 100644
|
||||
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
||||
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
||||
@@ -1077,9 +1077,6 @@ sub xs_make_dynamic_lib {
|
||||
}
|
||||
|
||||
my $ld_run_path_shell = "";
|
||||
- if ($self->{LD_RUN_PATH} ne "") {
|
||||
- $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
|
||||
- }
|
||||
|
||||
push @m, sprintf <<'MAKE', $ld_run_path_shell, $ldrun, $dlsyms_arg, $ldfrom, $self->xs_obj_opt('$@'), $libs, $exportlist;
|
||||
%s$(LD) %s $(LDDLFLAGS) %s %s $(OTHERLDFLAGS) %s $(MYEXTLIB) \
|
||||
--
|
||||
2.27.0
|
||||
|
||||
16
perl.spec
16
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: 2
|
||||
Release: 3
|
||||
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
|
||||
@ -32,9 +32,11 @@ Source0: https://www.cpan.org/src/5.0/%{name}-%{version}.tar.xz
|
||||
Patch1: perl-5.22.1-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch
|
||||
Patch2: perl-5.16.3-create_libperl_soname.patch
|
||||
Patch3: perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch
|
||||
Patch4: perl-5.34.0-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects-only-from-.patch
|
||||
Patch5: perl-5.35.1-Fix-GDBM_File-to-compile-with-version-1.20-and-earli.patch
|
||||
Patch6: perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch
|
||||
Patch4: perl-5.34.0-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects-only-from-.patch
|
||||
Patch5: perl-5.35.1-Fix-GDBM_File-to-compile-with-version-1.20-and-earli.patch
|
||||
Patch6: perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch
|
||||
Patch7: change-lib-to-lib64.patch
|
||||
Patch8: disable-rpath-by-default.patch
|
||||
|
||||
Patch6000: backport-CVE-2021-36770.patch
|
||||
|
||||
@ -499,6 +501,12 @@ make test_harness
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 01 2022 dongyuzhen <dongyuzhen@h-partners.com> 4:5.34.0-3
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:Add patches that are deleted during the upgrade
|
||||
|
||||
* Tue Mar 29 2022 zhouwenpei<zhouwenpei1@h-partners.com> 4:5.34.0-2
|
||||
- Type:NA
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user