diff --git a/.gitignore b/.gitignore index eeb8cb5..d61da8a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ExtUtils-MakeMaker-6.63_02.tar.gz /ExtUtils-MakeMaker-6.64.tar.gz /ExtUtils-MakeMaker-6.66.tar.gz +/ExtUtils-MakeMaker-6.68.tar.gz diff --git a/ExtUtils-MakeMaker-6.64-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.68-USE_MM_LD_RUN_PATH.patch similarity index 93% rename from ExtUtils-MakeMaker-6.64-USE_MM_LD_RUN_PATH.patch rename to ExtUtils-MakeMaker-6.68-USE_MM_LD_RUN_PATH.patch index 2ee9b3e..59763e2 100644 --- a/ExtUtils-MakeMaker-6.64-USE_MM_LD_RUN_PATH.patch +++ b/ExtUtils-MakeMaker-6.68-USE_MM_LD_RUN_PATH.patch @@ -1,13 +1,18 @@ -From 79fd2d34bf1bb9a46937d0c6455112839866d22c Mon Sep 17 00:00:00 2001 +From dfe5d4e6ffa4ba2cc88c2e3d1fc69723a2dc7231 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 +- @@ -15,7 +20,7 @@ See . 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm -index 71fef20..3447119 100644 +index 9abb959..b256ca1 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 @@ -31,7 +36,7 @@ index 71fef20..3447119 100644 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 388192e..d1e2380 100644 +index 36397bf..ac1fece 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -945,7 +945,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). @@ -44,7 +49,7 @@ index 388192e..d1e2380 100644 } diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm -index d040891..93a2850 100644 +index 7ca7c2c..c1948bd 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -281,7 +281,7 @@ sub full_setup { @@ -85,7 +90,7 @@ index d040891..93a2850 100644 print "MakeMaker (v$VERSION)\n" if $Verbose; if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ -@@ -2429,6 +2449,40 @@ precedence. A typemap in the current directory has highest +@@ -2445,6 +2465,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. @@ -127,5 +132,5 @@ index d040891..93a2850 100644 Like PERLPREFIX, but only for the vendor install locations. -- -1.7.11.7 +1.8.1.4 diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index fddb156..e738bb2 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,5 +1,5 @@ %global cpan_name ExtUtils-MakeMaker -%global cpan_version 6.66 +%global cpan_version 6.68 Name: perl-%{cpan_name} Version: %(echo '%{cpan_version}' | tr _ .) @@ -11,15 +11,21 @@ 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.64-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-6.68-USE_MM_LD_RUN_PATH.patch BuildArch: noarch +BuildRequires: perl # Makefile.Pl uses ExtUtils::MakeMaker from ./lib BuildRequires: perl(Carp) +BuildRequires: perl(Config) BuildRequires: perl(Cwd) BuildRequires: perl(Exporter) +BuildRequires: perl(File::Basename) BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) >= 0.8 BuildRequires: perl(lib) +BuildRequires: perl(strict) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) # Unbundled BuildRequires: perl(File::Copy::Recursive) # Tests: @@ -89,6 +95,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Jun 17 2013 Petr Pisar - 6.68-1 +- 6.68 bump + * Mon Apr 22 2013 Petr Pisar - 6.66-1 - 6.66 bump diff --git a/sources b/sources index 9765d44..989e3f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aca56039a78a3d0369aea0b3348aa2b2 ExtUtils-MakeMaker-6.66.tar.gz +a8afd7a2796d1dd64ef9d2b995e7eab6 ExtUtils-MakeMaker-6.68.tar.gz