diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0c626b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/ExtUtils-MakeMaker-6.82.tar.gz diff --git a/.perl516-perl-ExtUtils-MakeMaker.metadata b/.perl516-perl-ExtUtils-MakeMaker.metadata new file mode 100644 index 0000000..b2831c8 --- /dev/null +++ b/.perl516-perl-ExtUtils-MakeMaker.metadata @@ -0,0 +1 @@ +7b11f33d5d533ca1f1d3af05d251deeb418bb9f9 SOURCES/ExtUtils-MakeMaker-6.82.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index ce46a88..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -\ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch b/SOURCES/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch new file mode 100644 index 0000000..1f81024 --- /dev/null +++ b/SOURCES/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch @@ -0,0 +1,52 @@ +From 2e21a89c677737d87f8c279537791e0f795817b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 2 Jul 2013 10:28:15 +0200 +Subject: [PATCH 2/2] Link to libperl explicitly on Linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + + + +Signed-off-by: Petr Písař +--- + lib/ExtUtils/MM_Unix.pm | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm +index 003c9ae..fd2ef8c 100644 +--- a/lib/ExtUtils/MM_Unix.pm ++++ b/lib/ExtUtils/MM_Unix.pm +@@ -31,6 +31,7 @@ BEGIN { + $Is{IRIX} = $^O eq 'irix'; + $Is{NetBSD} = $^O eq 'netbsd'; + $Is{Interix} = $^O eq 'interix'; ++ $Is{Linux} = $^O eq 'linux'; + $Is{SunOS4} = $^O eq 'sunos'; + $Is{Solaris} = $^O eq 'solaris'; + $Is{SunOS} = $Is{SunOS4} || $Is{Solaris}; +@@ -933,7 +934,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO + + my $libs = '$(LDLOADLIBS)'; + +- if (($Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') { ++ if (($Is{Linux} || $Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') { + # Use nothing on static perl platforms, and to the flags needed + # to link against the shared libperl library on shared perl + # platforms. We peek at lddlflags to see if we need -Wl,-R +@@ -942,6 +943,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO + $libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl'; + } elsif ($Config{'lddlflags'} =~ /-R/) { + $libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl'; ++ } else { ++ if ($ENV{PERL_CORE}) { ++ $libs .= ' -L$(PERL_INC)'; ++ } ++ $libs .= ' -lperl'; + } + } + +-- +1.8.3.1 + diff --git a/SOURCES/ExtUtils-MakeMaker-6.82-USE_MM_LD_RUN_PATH.patch b/SOURCES/ExtUtils-MakeMaker-6.82-USE_MM_LD_RUN_PATH.patch new file mode 100644 index 0000000..1de28f2 --- /dev/null +++ b/SOURCES/ExtUtils-MakeMaker-6.82-USE_MM_LD_RUN_PATH.patch @@ -0,0 +1,136 @@ +From 8cdd24ede62bb89dd6dd5ea3373ae21569502b11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 12 Jan 2012 17:05:19 +0100 +Subject: [PATCH] Do not set RPATH by default +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Former behavior can be forced by setting USE_MM_LD_RUN_PATH +environment variable to 1. + +This is copy from `perl' package. +See . + +Signed-off-by: Petr Písař +--- + lib/ExtUtils/Liblist.pm | 5 ++++ + lib/ExtUtils/MM_Unix.pm | 2 +- + lib/ExtUtils/MakeMaker.pm | 58 +++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 62 insertions(+), 3 deletions(-) + +diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm +index d396c1f..aa74457 100644 +--- a/lib/ExtUtils/Liblist.pm ++++ b/lib/ExtUtils/Liblist.pm +@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories + in LDLOADLIBS. It is passed as an environment variable to the process + that links the shared library. + ++Fedora extension: This generation of LD_RUN_PATH is disabled by default. ++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH ++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH ++environment variable). ++ + =head2 BSLOADLIBS + + 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 +index 9ba094e..b951fa9 100644 +--- a/lib/ExtUtils/MM_Unix.pm ++++ b/lib/ExtUtils/MM_Unix.pm +@@ -946,7 +946,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO + } + + my $ld_run_path_shell = ""; +- if ($self->{LD_RUN_PATH} ne "") { ++ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) { + $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; + } + +diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm +index 55c9181..e9be4a6 100644 +--- a/lib/ExtUtils/MakeMaker.pm ++++ b/lib/ExtUtils/MakeMaker.pm +@@ -281,7 +281,7 @@ sub full_setup { + PERL_SRC PERM_DIR PERM_RW PERM_RWX + PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC + PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ +- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG ++ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG + XS_VERSION clean depend dist dynamic_lib linkext macro realclean + tool_autosplit + +@@ -431,7 +431,27 @@ sub new { + # PRINT_PREREQ is RedHatism. + if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { + $self->_PRINT_PREREQ; +- } ++ } ++ ++ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation ++ if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) ++ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) ++ ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) ++ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ ) ++ ) ++ ) ++ ) ++ { ++ my $v = $1; ++ if( $v ) ++ { ++ $v = ($v=~/=([01])$/)[0]; ++ }else ++ { ++ $v = 1; ++ }; ++ $self->{USE_MM_LD_RUN_PATH}=$v; ++ }; + + print "MakeMaker (v$VERSION)\n" if $Verbose; + if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ +@@ -2603,6 +2623,40 @@ precedence. A typemap in the current directory has highest + precedence, even if it isn't listed in TYPEMAPS. The default system + typemap has lowest precedence. + ++=item USE_MM_LD_RUN_PATH ++ ++boolean ++The Fedora perl MakeMaker distribution differs from the standard ++upstream release in that it disables use of the MakeMaker generated ++LD_RUN_PATH by default, UNLESS this attribute is specified , or the ++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run. ++ ++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH ++to the concatenation of every -L ld(1) option directory in which a -l ld(1) ++option library is found, which is used as the ld(1) -rpath option if none ++is specified. This means that, if your application builds shared libraries ++and your MakeMaker application links to them, that the absolute paths of the ++libraries in the build tree will be inserted into the RPATH header of all ++MakeMaker generated binaries, and that such binaries will be unable to link ++to these libraries if they do not still reside in the build tree directories ++(unlikely) or in the system library directories (/lib or /usr/lib), regardless ++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and ++ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib, ++ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH ++is set to include /some_directory_other_than_usr_lib, because RPATH overrides ++LD_LIBRARY_PATH. ++ ++So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for ++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH ++environment variable during the build to generate an RPATH for the binaries. ++ ++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command ++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH ++for every link command. ++ ++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the ++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. ++ + =item VENDORPREFIX + + Like PERLPREFIX, but only for the vendor install locations. +-- +1.8.3.1 + diff --git a/SPECS/perl-ExtUtils-MakeMaker.spec b/SPECS/perl-ExtUtils-MakeMaker.spec new file mode 100644 index 0000000..9a67366 --- /dev/null +++ b/SPECS/perl-ExtUtils-MakeMaker.spec @@ -0,0 +1,151 @@ +%{?scl:%scl_package perl-%{cpan_name}} +%{!?scl:%global pkg_name %{name}} + +%global cpan_name ExtUtils-MakeMaker +%global cpan_version 6.82 + +Name: %{?scl_prefix}perl-%{cpan_name} +Version: %(echo '%{cpan_version}' | tr _ .) +Release: 2%{?dist} +Summary: Create a module Makefile +License: GPL+ or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/%{cpan_name}/ +Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{cpan_version}.tar.gz +# Do not set RPATH to perl shared-library modules by default. Bug #773622. +# This is copy from `perl' package. This is distributor extension. +Patch0: %{cpan_name}-6.82-USE_MM_LD_RUN_PATH.patch +# Link to libperl.so explicitly. Bug #960048. Not valid for RHSCL perl516 +Patch1: %{cpan_name}-6.80-Link-to-libperl-explicitly-on-Linux.patch +BuildArch: noarch +BuildRequires: %{?scl_prefix}perl +# Makefile.Pl uses ExtUtils::MakeMaker from ./lib +BuildRequires: %{?scl_prefix}perl(Carp) +BuildRequires: %{?scl_prefix}perl(Config) +BuildRequires: %{?scl_prefix}perl(Cwd) +BuildRequires: %{?scl_prefix}perl(Exporter) +BuildRequires: %{?scl_prefix}perl(File::Basename) +BuildRequires: %{?scl_prefix}perl(File::Path) +BuildRequires: %{?scl_prefix}perl(File::Spec) >= 0.8 +BuildRequires: %{?scl_prefix}perl(lib) +BuildRequires: %{?scl_prefix}perl(strict) +BuildRequires: %{?scl_prefix}perl(vars) +BuildRequires: %{?scl_prefix}perl(warnings) +# Unbundled +BuildRequires: %{?scl_prefix}perl(File::Copy::Recursive) +# Tests: +BuildRequires: %{?scl_prefix}perl(AutoSplit) +BuildRequires: %{?scl_prefix}perl(CPAN::Meta) +BuildRequires: %{?scl_prefix}perl(Data::Dumper) +BuildRequires: %{?scl_prefix}perl(DynaLoader) +BuildRequires: %{?scl_prefix}perl(ExtUtils::Command) +BuildRequires: %{?scl_prefix}perl(ExtUtils::Install) +BuildRequires: %{?scl_prefix}perl(ExtUtils::Installed) +BuildRequires: %{?scl_prefix}perl(ExtUtils::Manifest) +BuildRequires: %{?scl_prefix}perl(File::Find) +BuildRequires: %{?scl_prefix}perl(File::Temp) +BuildRequires: %{?scl_prefix}perl(Getopt::Long) +BuildRequires: %{?scl_prefix}perl(IO::File) +BuildRequires: %{?scl_prefix}perl(less) +BuildRequires: %{?scl_prefix}perl(Parse::CPAN::Meta) +BuildRequires: %{?scl_prefix}perl(Pod::Man) +BuildRequires: %{?scl_prefix}perl(POSIX) +BuildRequires: %{?scl_prefix}perl(Test::Harness) +BuildRequires: %{?scl_prefix}perl(Test::More) +BuildRequires: %{?scl_prefix}perl(version) +# Optional tests +BuildRequires: %{?scl_prefix}perl(ExtUtils::CBuilder) +%{?scl:%global perl_version %(scl enable %{scl} 'eval "`perl -V:version`"; echo $version')} +%{!?scl:%global perl_version %(eval "`perl -V:version`"; echo $version)} +Requires: %{?scl_prefix}perl(:MODULE_COMPAT_%{perl_version}) +# CPAN::Meta is optional +Requires: %{?scl_prefix}perl(Data::Dumper) +Requires: %{?scl_prefix}perl(DynaLoader) +Requires: %{?scl_prefix}perl(ExtUtils::Command) +Requires: %{?scl_prefix}perl(ExtUtils::Install) +Requires: %{?scl_prefix}perl(ExtUtils::Manifest) +# ExtUtils::XSSymSet is not needed (VMS only) +Requires: %{?scl_prefix}perl(File::Find) +Requires: %{?scl_prefix}perl(File::Spec) >= 0.8 +Requires: %{?scl_prefix}perl(Getopt::Long) +# Optional Pod::Man is needed for generating manual pages from POD +Requires: %{?scl_prefix}perl(Pod::Man) +Requires: %{?scl_prefix}perl(POSIX) +Requires: %{?scl_prefix}perl(Test::Harness) +# Time::HiRes is optional +# Text::ParseWords is not needed (Win32 only) +Requires: %{?scl_prefix}perl(version) +# VMS::Filespec is not needed (VMS only) +# Win32 is not needed (Win32 only) + +# Do not export underspecified dependencies +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^%{?scl_prefix}perl\\(File::Spec\\)\s*$ +# Do not export private redefinitions +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^%{?scl_prefix}perl\\(DynaLoader|ExtUtils::MakeMaker::_version\\) + +%if ( 0%{?rhel} && 0%{?rhel} < 7 ) +%filter_from_requires /perl(File::Spec)\s*$/d +%filter_from_provides /perl(\(DynaLoader\|ExtUtils::MakeMaker::_version\))/d +%filter_provides_in %{perl_vendorlib}/.*\.pod$ +%filter_requires_in %{perl_vendorlib}/.*\.pod$ +%filter_setup +%endif + +%description +This utility is designed to write a Makefile for an extension module from a +Makefile.PL. It is based on the Makefile.SH model provided by Andy +Dougherty and the perl5-porters. + +%prep +%setup -q -n ExtUtils-MakeMaker-%{cpan_version} +%patch0 -p1 +# The package is built explicitly to libperl.so with Perl 5.18 and newer +#%%patch1 -p1 +# Remove bundled modules +rm -rf bundled/* ||: +sed -i -e '/^bundled\// d' MANIFEST + +%build +%{?scl:scl enable %{scl} "} +perl Makefile.PL INSTALLDIRS=vendor +%{?scl:"} +%{?scl:scl enable %{scl} "} +make %{?_smp_mflags} +%{?scl:"} + +%install +%{?scl:scl enable %{scl} "} +make pure_install DESTDIR=$RPM_BUILD_ROOT +%{?scl:"} +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +%{_fixperms} $RPM_BUILD_ROOT/* + +%check +%{?scl:scl enable %{scl} "} +make test +%{?scl:"} + +%files +%doc Changes NOTES PATCHING README TODO +%{_bindir}/* +%{perl_vendorlib}/* +%{_mandir}/man1/* +%{_mandir}/man3/* + +%changelog +* Thu Dec 05 2013 Jitka Plesnikova - 6.82-2 +- Update filter of dependencies +- Resolves: rhbz#1038685 + +* Tue Nov 19 2013 Jitka Plesnikova - 6.82-1 +- 6.82 bump + +* Tue Sep 24 2013 Jitka Plesnikova - 6.66-2 +- Fixed filter of requires +- Specify all dependencies + +* Mon May 20 2013 Jitka Plesnikova - 6.66-1 +- 6.66 bump + +* Fri Feb 8 2013 Jitka Plesnikova - 6.64-1 +- SCL package - initial release