Compare commits

...

No commits in common. "c8-stream-5.3" and "c8" have entirely different histories.

4 changed files with 29 additions and 72 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/ExtUtils-MakeMaker-7.42.tar.gz SOURCES/ExtUtils-MakeMaker-7.34.tar.gz

View File

@ -1 +1 @@
0441553dc10430917382f132be3dfa167d77a030 SOURCES/ExtUtils-MakeMaker-7.42.tar.gz d0b625774460453a01f3da4bbf8a6f37576ff621 SOURCES/ExtUtils-MakeMaker-7.34.tar.gz

View File

@ -1,4 +1,4 @@
From 9b80126d33174059a03502521d5cb1fdc9b2c3a1 Mon Sep 17 00:00:00 2001 From 83b4921f10f9df96ec359e20489864080f7b37ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 12 Jan 2012 17:05:19 +0100 Date: Thu, 12 Jan 2012 17:05:19 +0100
Subject: [PATCH] Do not set RPATH by default Subject: [PATCH] Do not set RPATH by default
@ -14,13 +14,13 @@ See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>.
Signed-off-by: Petr Písař <ppisar@redhat.com> Signed-off-by: Petr Písař <ppisar@redhat.com>
--- ---
lib/ExtUtils/Liblist.pm | 5 ++++ lib/ExtUtils/Liblist.pm | 5 +++++
lib/ExtUtils/MM_Unix.pm | 2 +- lib/ExtUtils/MM_Unix.pm | 2 +-
lib/ExtUtils/MakeMaker.pm | 56 ++++++++++++++++++++++++++++++++++++++- lib/ExtUtils/MakeMaker.pm | 56 ++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 61 insertions(+), 2 deletions(-) 3 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index 44c4c39..3983194 100644 index 15eed3c..219e96b 100644
--- a/lib/ExtUtils/Liblist.pm --- a/lib/ExtUtils/Liblist.pm
+++ b/lib/ExtUtils/Liblist.pm +++ b/lib/ExtUtils/Liblist.pm
@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories @@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories
@ -36,10 +36,10 @@ index 44c4c39..3983194 100644
List of those libraries that are needed but can be linked in List of those libraries that are needed but can be linked in
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index a0a2ee1..dda54bb 100644 index 6233513..198f05e 100644
--- a/lib/ExtUtils/MM_Unix.pm --- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm
@@ -1074,7 +1074,7 @@ sub xs_make_dynamic_lib { @@ -1045,7 +1045,7 @@ sub xs_make_dynamic_lib {
} }
my $ld_run_path_shell = ""; my $ld_run_path_shell = "";
@ -49,13 +49,13 @@ index a0a2ee1..dda54bb 100644
} }
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 90790d4..f5459eb 100644 index 3d4913e..b52c96d 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm
@@ -317,7 +317,7 @@ sub full_setup { @@ -317,7 +317,7 @@ sub full_setup {
PERM_DIR PERM_RW PERM_RWX MAGICXS PERM_DIR PERM_RW PERM_RWX MAGICXS
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ PUREPERL_ONLY PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS - SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS
+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS + SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
@ -88,7 +88,7 @@ index 90790d4..f5459eb 100644
print "MakeMaker (v$VERSION)\n" if $Verbose; print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){ if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
check_manifest(); check_manifest();
@@ -2837,6 +2857,40 @@ precedence. A typemap in the current directory has highest @@ -2797,6 +2817,40 @@ precedence. A typemap in the current directory has highest
precedence, even if it isn't listed in TYPEMAPS. The default system precedence, even if it isn't listed in TYPEMAPS. The default system
typemap has lowest precedence. typemap has lowest precedence.
@ -130,5 +130,5 @@ index 90790d4..f5459eb 100644
Like PERLPREFIX, but only for the vendor install locations. Like PERLPREFIX, but only for the vendor install locations.
-- --
2.20.1 2.13.6

View File

@ -1,19 +1,16 @@
# Run optional test
%bcond_without perl_ExtUtils_MakeMaker_enables_optional_test
%global cpan_name ExtUtils-MakeMaker %global cpan_name ExtUtils-MakeMaker
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Epoch: 2 Epoch: 1
Version: 7.42 Version: 7.34
Release: 1%{?dist} Release: 1%{?dist}
Summary: Create a module Makefile Summary: Create a module Makefile
License: GPL+ or Artistic License: GPL+ or Artistic
URL: https://metacpan.org/release/%{cpan_name} URL: http://search.cpan.org/dist/%{cpan_name}/
Source0: https://cpan.metacpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz
# Do not set RPATH to perl shared-library modules by default. Bug #773622. # Do not set RPATH to perl shared-library modules by default. Bug #773622.
# This is copy from `perl' package. This is a distributor extension. # This is copy from `perl' package. This is a distributor extension.
Patch0: %{cpan_name}-7.36-USE_MM_LD_RUN_PATH.patch Patch0: %{cpan_name}-7.30-USE_MM_LD_RUN_PATH.patch
# Link to libperl.so explicitly. Bug #960048. # Link to libperl.so explicitly. Bug #960048.
Patch1: %{cpan_name}-7.30-Link-to-libperl-explicitly-on-Linux.patch Patch1: %{cpan_name}-7.30-Link-to-libperl-explicitly-on-Linux.patch
# Unbundle version modules # Unbundle version modules
@ -46,6 +43,7 @@ BuildRequires: perl(version)
BuildRequires: perl(warnings) BuildRequires: perl(warnings)
# If an XS module is compiled, xsubpp(1) is needed # If an XS module is compiled, xsubpp(1) is needed
BuildRequires: perl-ExtUtils-ParseXS BuildRequires: perl-ExtUtils-ParseXS
BuildRequires: sed
# Tests: # Tests:
BuildRequires: perl(AutoSplit) BuildRequires: perl(AutoSplit)
BuildRequires: perl(base) BuildRequires: perl(base)
@ -70,11 +68,9 @@ BuildRequires: perl(POSIX)
BuildRequires: perl(subs) BuildRequires: perl(subs)
BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::Harness)
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
BuildRequires: perl(Text::ParseWords)
# threads::shared not used # threads::shared not used
BuildRequires: perl(utf8) BuildRequires: perl(utf8)
# XSLoader not used # XSLoader not used
%if %{with perl_ExtUtils_MakeMaker_enables_optional_test}
# Optional tests # Optional tests
BuildRequires: perl-devel BuildRequires: perl-devel
BuildRequires: perl(B) BuildRequires: perl(B)
@ -82,7 +78,6 @@ BuildRequires: perl(ExtUtils::CBuilder)
BuildRequires: perl(PerlIO) BuildRequires: perl(PerlIO)
# Keep YAML optional # Keep YAML optional
# Keep YAML::Tiny optional # Keep YAML::Tiny optional
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(B) Requires: perl(B)
Recommends: perl(CPAN::Meta) >= 2.143240 Recommends: perl(CPAN::Meta) >= 2.143240
@ -109,18 +104,16 @@ Requires: perl(Pod::Man)
Requires: perl(POSIX) Requires: perl(POSIX)
Requires: perl(Test::Harness) Requires: perl(Test::Harness)
Recommends: perl(Time::HiRes) Recommends: perl(Time::HiRes)
Requires: perl(Text::ParseWords) # Text::ParseWords is not needed (Win32 only)
# VMS::Filespec is not needed (VMS only) # VMS::Filespec is not needed (VMS only)
# Win32 is not needed (Win32 only) # Win32 is not needed (Win32 only)
# If an XS module is compiled, xsubpp(1) is needed # If an XS module is compiled, xsubpp(1) is needed
Requires: perl-ExtUtils-ParseXS Requires: perl-ExtUtils-ParseXS
# These dependencies are weak in order to relieve building noarch
# packages from perl-devel and gcc. See bug #1547165.
# If an XS module is built, code generated from XS will be compiled and it # If an XS module is built, code generated from XS will be compiled and it
# includes Perl header files. # includes Perl header files.
Recommends: perl-devel # TODO: This dependency will be weaken in order to relieve building noarch
# If an XS module is built, the generated Makefile executes gcc. # packages from perl-devel and gcc.
Recommends: gcc Requires: perl-devel
# Do not export underspecified dependencies # Do not export underspecified dependencies
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(File::Spec\\)\s*$ %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(File::Spec\\)\s*$
@ -170,20 +163,20 @@ is an overkill for small subroutines.
%patch4 -p1 %patch4 -p1
# Remove bundled modules # Remove bundled modules
rm -rf bundled rm -rf bundled
perl -i -ne 'print $_ unless m{^bundled/}' MANIFEST sed -i -e '/^bundled\// d' MANIFEST
rm -rf t/lib/Test rm -rf t/lib/Test
perl -i -ne 'print $_ unless m{^t/lib/Test/}' MANIFEST sed -i -e '/^t\/lib\/Test\// d' MANIFEST
rm -rf lib/ExtUtils/MakeMaker/version{,.pm} rm -rf lib/ExtUtils/MakeMaker/version{,.pm}
perl -i -ne 'print $_ unless m{^lib/ExtUtils/MakeMaker/version(?:/|\.pm)}' MANIFEST sed -i -e '/^lib\/ExtUtils\/MakeMaker\/version[\/\.]/ d' MANIFEST
rm -rf lib/ExtUtils/MakeMaker/Locale.pm rm -rf lib/ExtUtils/MakeMaker/Locale.pm
perl -i -ne 'print $_ unless m{^lib/ExtUtils/MakeMaker/Locale\.pm}' MANIFEST sed -i -e '/^lib\/ExtUtils\/MakeMaker\/Locale\.pm/ d' MANIFEST
%build %build
BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
%{make_build} make %{?_smp_mflags}
%install %install
%{make_install} make pure_install DESTDIR=$RPM_BUILD_ROOT
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
@ -213,45 +206,9 @@ make test
%{_mandir}/man3/ExtUtils::MM::Utils.* %{_mandir}/man3/ExtUtils::MM::Utils.*
%changelog %changelog
* Wed Dec 18 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.42-1
- 7.42 bump
* Tue Dec 17 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.40-1
- 7.40 bump
* Wed Sep 11 2019 Petr Pisar <ppisar@redhat.com> - 2:7.38-1
- 7.38 bump
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.36-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.36-3
- Perl 5.30 re-rebuild of bootstrapped packages
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.36-2
- Perl 5.30 rebuild
* Mon Apr 29 2019 Petr Pisar <ppisar@redhat.com> - 1:7.36-1
- 7.36 bump
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.34-419
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.34-418
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:7.34-417
- Perl 5.28 re-rebuild of bootstrapped packages
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:7.34-416
- Increase release to favour standalone package
* Mon Mar 19 2018 Petr Pisar <ppisar@redhat.com> - 1:7.34-1 * Mon Mar 19 2018 Petr Pisar <ppisar@redhat.com> - 1:7.34-1
- 7.34 bump - 7.34 bump
* Wed Feb 28 2018 Petr Pisar <ppisar@redhat.com> - 1:7.32-2
- Recommend gcc and perl-devel instead of a hard dependency (bug #1547165)
* Mon Feb 19 2018 Petr Pisar <ppisar@redhat.com> - 1:7.32-1 * Mon Feb 19 2018 Petr Pisar <ppisar@redhat.com> - 1:7.32-1
- 7.32 bump - 7.32 bump