Accepting request 505895 from home:dmdiss:bsc841204_MakeMaker_rpath_rebase

- rebase downstream bsc#841204 fix against 7.30
  + Do_not_set_RPATH_by_default.patch
  + based on:
  http://pkgs.fedoraproject.org/cgit/rpms/perl-ExtUtils-MakeMaker.git/plain/ExtUtils-MakeMaker-7.16-USE_MM_LD_RUN_PATH.patch

- updated to 7.30
   see /usr/share/doc/packages/perl-ExtUtils-MakeMaker/Changes

OBS-URL: https://build.opensuse.org/request/show/505895
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-ExtUtils-MakeMaker?expand=0&rev=37
This commit is contained in:
Stephan Kulow 2017-06-25 07:48:16 +00:00 committed by Git OBS Bridge
parent 41d41dee48
commit 6b96963fe5
5 changed files with 372 additions and 68 deletions

View File

@ -1,7 +1,10 @@
From dbc43828283bd5ab150e24a6cd18c778e9763d7f Mon Sep 17 00:00:00 2001
From 4361bd6fb0717f99f6b21ed053542e01c5093af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
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.
@ -9,14 +12,20 @@ environment variable to 1.
This is copy from `perl' package.
See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>.
Signed-off-by: Petr Písař <ppisar@redhat.com>
[ddiss@suse.de: also handle LD_RUN_PATH set in MM_Any.pm]
---
lib/ExtUtils/Liblist.pm | 5 ++++
lib/ExtUtils/MM_Any.pm | 1
lib/ExtUtils/MM_Unix.pm | 2 -
lib/ExtUtils/MakeMaker.pm | 56 +++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 62 insertions(+), 2 deletions(-)
Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/Liblist.pm
Index: ExtUtils-MakeMaker-7.30/lib/ExtUtils/Liblist.pm
===================================================================
--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/Liblist.pm
+++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/Liblist.pm
@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ
--- ExtUtils-MakeMaker-7.30.orig/lib/ExtUtils/Liblist.pm
+++ ExtUtils-MakeMaker-7.30/lib/ExtUtils/Liblist.pm
@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separ
in LDLOADLIBS. It is passed as an environment variable to the process
that links the shared library.
@ -28,40 +37,36 @@ Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/Liblist.pm
=head2 BSLOADLIBS
List of those libraries that are needed but can be linked in
Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Unix.pm
Index: ExtUtils-MakeMaker-7.30/lib/ExtUtils/MM_Unix.pm
===================================================================
--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/MM_Unix.pm
+++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Unix.pm
@@ -972,7 +972,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
--- ExtUtils-MakeMaker-7.30.orig/lib/ExtUtils/MM_Unix.pm
+++ ExtUtils-MakeMaker-7.30/lib/ExtUtils/MM_Unix.pm
@@ -1045,7 +1045,7 @@ sub xs_make_dynamic_lib {
}
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)" ';
$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
}
Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MakeMaker.pm
Index: ExtUtils-MakeMaker-7.30/lib/ExtUtils/MakeMaker.pm
===================================================================
--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/MakeMaker.pm
+++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/MakeMaker.pm
@@ -301,7 +301,8 @@ sub full_setup {
--- ExtUtils-MakeMaker-7.30.orig/lib/ExtUtils/MakeMaker.pm
+++ ExtUtils-MakeMaker-7.30/lib/ExtUtils/MakeMaker.pm
@@ -317,7 +317,7 @@ sub full_setup {
PERM_DIR PERM_RW PERM_RWX MAGICXS
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
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
- 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
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
clean depend dist dynamic_lib linkext macro realclean tool_autosplit
@@ -436,7 +437,27 @@ sub new {
# PRINT_PREREQ is RedHatism.
if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
@@ -503,6 +503,26 @@ sub new {
$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/)
@ -81,10 +86,11 @@ Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MakeMaker.pm
+ };
+ $self->{USE_MM_LD_RUN_PATH}=$v;
+ };
+
print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
@@ -2711,6 +2732,40 @@ precedence. A typemap in the current di
check_manifest();
@@ -2797,6 +2817,40 @@ precedence. A typemap in the current di
precedence, even if it isn't listed in TYPEMAPS. The default system
typemap has lowest precedence.
@ -125,11 +131,11 @@ Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MakeMaker.pm
=item VENDORPREFIX
Like PERLPREFIX, but only for the vendor install locations.
Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Any.pm
Index: ExtUtils-MakeMaker-7.30/lib/ExtUtils/MM_Any.pm
===================================================================
--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/MM_Any.pm
+++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Any.pm
@@ -2275,6 +2275,7 @@ sub init_others {
--- ExtUtils-MakeMaker-7.30.orig/lib/ExtUtils/MM_Any.pm
+++ ExtUtils-MakeMaker-7.30/lib/ExtUtils/MM_Any.pm
@@ -2435,6 +2435,7 @@ sub init_others {
# LD_RUN_PATH now computed by ExtUtils::Liblist
($self->{EXTRALIBS}, $self->{BSLOADLIBS},
$self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83b76cd49e458a55774e2e8d87bd1107bc159ba4219600c8ef10c6b43b0d94c5
size 445464

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e081a8aa61c56565746bee998bf4c32926c030b84bb3f206e81714a1707f393c
size 469792

View File

@ -1,3 +1,331 @@
-------------------------------------------------------------------
Fri Jun 23 13:12:48 UTC 2017 - ddiss@suse.com
- rebase downstream bsc#841204 fix against 7.30
+ Do_not_set_RPATH_by_default.patch
+ based on:
http://pkgs.fedoraproject.org/cgit/rpms/perl-ExtUtils-MakeMaker.git/plain/ExtUtils-MakeMaker-7.16-USE_MM_LD_RUN_PATH.patch
-------------------------------------------------------------------
Wed Jun 14 05:31:17 UTC 2017 - coolo@suse.com
- updated to 7.30
see /usr/share/doc/packages/perl-ExtUtils-MakeMaker/Changes
7.30 Mon Jun 12 13:17:29 BST 2017
No changes since v7.29_02
7.29_02 Sun Jun 11 12:00:33 BST 2017
Doc fixes:
- Fixed POD errors in FAQ
7.29_01 Wed May 31 08:34:10 BST 2017
Bug fixes:
- Prune .a without extralibs.ld from search paths
-------------------------------------------------------------------
Wed May 31 05:38:24 UTC 2017 - coolo@suse.com
- updated to 7.28
see /usr/share/doc/packages/perl-ExtUtils-MakeMaker/Changes
7.28 Tue May 30 22:01:08 BST 2017
No changes since v7.27_02
7.27_02 Tue May 30 09:27:56 BST 2017
Bug fixes:
- Prune auto/share from search paths RT#121918
7.27_01 Sun May 28 11:35:46 BST 2017
Bug fixes:
- Fix regression with metadata RT#121913
-------------------------------------------------------------------
Sun May 28 05:40:55 UTC 2017 - coolo@suse.com
- updated to 7.26
see /usr/share/doc/packages/perl-ExtUtils-MakeMaker/Changes
7.26 Sat May 27 21:01:47 BST 2017
No changes since 7.25_06
7.25_06 Tue May 23 20:18:01 BST 2017
Bug fixes:
- Fix regression with XS tests on MSWin32 with MS toolchain
7.25_05 Mon May 15 10:18:01 BST 2017
Bug fixes:
- Make MakeMaker pass compilation tests on AIX again
- Test, fix test dep on SKIPped linktype
7.25_04 Fri May 12 12:24:09 BST 2017
Enhancements:
- Add os_unsupported() function
7.25_03 Thu May 11 17:51:23 BST 2017
Bug fixes:
- processPL now depends on 'pure_all' instead of 'all'
7.25_02 Thu May 11 11:54:42 BST 2017
Bug fixes:
- Only add staticlibs that are installed under auto/
- Correct the order of tests of chmod()
Doc fixes:
- Fixed typo in MakeMaker.pm
7.25_01 Fri Feb 3 13:36:25 GMT 2017
Bug fixes:
- Make perllocal.pod files reproducible
- META_ADD/MERGE default meta version based on each other
- Eliminate an ancient, unneeded, dangerous call to Carp::longmess
-------------------------------------------------------------------
Thu May 25 08:07:16 UTC 2017 - coolo@suse.com
- updated to 7.24
see /usr/share/doc/packages/perl-ExtUtils-MakeMaker/Changes
7.24 Sat Aug 20 13:22:28 BST 2016
No changes since 7.23_01
7.23_01 Fri Aug 19 10:02:30 BST 2016
Test fixes:
- always use the core serializers when testing in core
7.22 Mon Aug 8 09:29:02 BST 2016
No changes since 7.21_01
7.21_01 Sun Aug 7 10:37:53 BST 2016
Bug fixes:
- CVE-2016-1238: instmodsh sanitise @INC
7.20 Fri Aug 5 09:39:56 BST 2016
No changes since 7.19_08
7.19_08 Thu Jul 28 12:31:13 BST 2016
Bug fixes:
- CVE-2016-1238: avoid loading VMS::Feature from the default .
7.19_07 Sun Jul 3 15:11:40 BST 2016
Bug fixes:
- Restore ordering issue involving OTHERLDFLAGS
7.19_06 Mon Jun 27 12:32:06 BST 2016
Test fixes:
- Skip subdirscomplex test on VMS
7.19_05 Mon Jun 20 15:21:52 BST 2016
Doc fixes:
- fix typos and add subdirs text to MakeMaker.pm
7.19_04 Tue Jun 14 11:16:19 BST 2016
Bug fixes:
- prevent EUMM::Locale from warning with old Win32.pm
Doc fixes:
- added examples for running tests in subdirs
7.19_03 Mon Jun 13 14:22:46 BST 2016
Bug fixes:
- Fix test warnings in MM_Unix.pm when in core
7.19_02 Mon Jun 13 09:57:37 BST 2016
Bug fixes:
- Check for ascii locale using normalized name
7.19_01 Thu Jun 2 14:26:20 BST 2016
Bug fixes:
- Cygwin: avoid libperl.dll.dll.a
- Fix basic.t tests on Win32 in core
7.18 Mon May 23 15:55:26 BST 2016
No changes since 7.17_03
7.17_03 Wed May 11 18:22:06 BST 2016
Dist fixes:
- remove build_requires on ourselves
7.17_02 Mon May 9 23:55:09 BST 2016
Bug fixes:
- Resolve a regression in c_o with trailing spaces
7.17_01 Mon May 9 20:02:02 BST 2016
Test fixes:
- Resolve issues with tests when running in core
7.16 Sat May 7 10:13:05 BST 2016
No changes since 7.15_03
7.15_03 Sun May 1 14:13:44 BST 2016
Bug fixes:
- lazy load Time::HiRes in ExtUtils::Command::MM
- fix 5.6 compat by removing indexed sprintf
7.15_02 Thu Apr 28 12:54:23 BST 2016
Bug fixes:
- Fix regression with small fractional numeric versions
7.15_01 Wed Apr 27 19:13:46 BST 2016
Bug fixes:
- Fix regression with SKIP and dynamic and static targets
7.14 Sun Apr 24 13:53:33 BST 2016
No changes since 7.13_01
7.13_01 Sat Apr 23 16:41:20 BST 2016
Bug fixes:
- Make dynamic depend on config again, fixes issues with Inline
7.12 Tue Apr 19 12:24:41 BST 2016
Enhancements:
- version ranges are now supported for PREREQS, etc.
- Metadata is now represented internally as Meta Spec 2.0
- ExtUtils::Command has been re-incorporated at 1.19 of that module
- Refactored XS handling
- XSMULTI=>1 - put multiple *.xs under lib, it "just works" and XSBUILD
for refined control of XSMULTI
- can do "make test" without first doing "make"
Bug fixes:
- Handle new warnings from File::Path
- Resolve RT#106572 specifying AUTHOR via command-line is broken
- Warning on missing TEST_REQUIRES and CONFIGURE_REQUIRES
- Sanitise make_type on Win32
- Cygwin rebase fixes
- Makefile starting comments reflect decoded @ARGV, not raw
- Add various targets to .PHONY to avoid disk IO with dmake
- Fixed race condition in realclean
- improve static-build lib detection
- Eliminate non-error STDERR
- Make WriteEmptyMakefile Makefile functional when called in subdir
- manifypods fixes
- perllocal.pod generation "Perl in Space" fix
- PASTHRU fixes
- Fix distsignature dependencies for parallel make
- Check exit status for commands in "make ci" target
- Less noisey output during building sub-modules
- Fix dos2unix() on Windows
- stop makeaperl from polluting @ARGV in cases where ARGV contains args with spaces
- Fix regression when both test.pl and t/*.t are present
- Refactored internals to remove DirHandle usage
- MM_Unix::find_perl() dont repeatedly stat the same path in a loop
- No longer repeatedly attempt to load CPAN::Meta if it is now available
VMS fixes:
- Made MM_VMS::oneline build continuation lines properly
- Implemented XSMULTI and XSBUILD
- Resurrect PASTHRU on VMS
- make_macro should handle multiple macros
- Fix regression with File::Spec changes in previous release
Win32 fixes:
- t/echo.t needs SHELL env for Win32 gmake
Dist fixes:
- Made %ExtraPrereqs match bundled prereqs
- Included MANIFEST.SKIP from ExtUtils::Manifest
- The bundled Encode::Locale has been updated to 1.04
Test fixes:
- test PL_FILES of a "module"
- Various tests no longer require a separate .pm file for testing
- Support v5.6.1 in various tests
- test static build if $ENV{AUTHOR_TESTING}
- XS tests now pluggable
- test for "Perl in Space"
Doc fixes:
- better document for PL_FILES, oneliner method
- FAQ updated
7.11_06 Tue Mar 29 19:22:38 BST 2016
Bug fixes:
- Backported change from blead for Win32 miniperl
7.11_05 Sat Mar 19 09:41:02 GMT 2016
Bug fixes:
- Less noisey output during building sub-modules
- Fix dos2unix() on Windows
VMS fixes:
- Implemented XSMULTI and XSBUILD
- Resurrect PASTHRU on VMS
7.11_04 Mon Feb 15 11:20:14 GMT 2016
Enhancements:
- Added find_tests_recursive_in() method
Bug fixes:
- Fix regression when both test.pl and t/*.t are present
- Refactored internals to remove DirHandle usage
VMS fixes:
- make_macro should handle multiple macros
- Fix regression with File::Spec changes in previous release
Win32 fixes:
- t/echo.t needs SHELL env for Win32 gmake
7.11_03 Wed Nov 25 15:23:25 GMT 2015
Bug fixes:
- stop makeaperl from polluting @ARGV in cases where ARGV contains args with spaces
7.11_02 Sat Nov 21 20:05:45 GMT 2015
Bug fixes:
- MM_Unix::find_perl() dont repeatedly stat the same path in a loop
7.11_01 Thu Nov 12 11:58:58 GMT 2015
Includes all the Changes noted for v7.06 and the following:
Bug fixes:
- Use of intermediate files to store META.* and *.ppd files has been reverted
- No longer repeatedly attempt to load CPAN::Meta if it is now available
- Made MM_VMS::oneline build continuation lines properly
-------------------------------------------------------------------
Fri Mar 11 10:05:35 UTC 2016 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package perl-ExtUtils-MakeMaker
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,14 +17,14 @@
Name: perl-ExtUtils-MakeMaker
Version: 7.10
Version: 7.30
Release: 0
%define cpan_name ExtUtils-MakeMaker
Summary: Create a module Makefile
License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/ExtUtils-MakeMaker/
Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz
Source0: https://cpan.metacpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
Patch0: Do_not_set_RPATH_by_default.patch
BuildArch: noarch
@ -33,28 +33,6 @@ BuildRequires: perl
BuildRequires: perl-macros
%{perl_requires}
# MANUAL BEGIN
#!BuildIgnore: perl-ExtUtils-MakeMaker
# used by my/bundles.pm
#BuildRequires: perl-File-Copy-Recursive
BuildRequires: perl(Data::Dumper)
######################################################################
### dependencies defined in a dummy package to avoid build loops
BuildRequires: perl-ExtUtils-MakeMaker-mini
######################################################################
Requires: perl(CPAN::Meta) >= 2.113640
Requires: perl(CPAN::Meta::Requirements) >= 2.121
Requires: perl(CPAN::Meta::YAML) >= 0.002
Requires: perl(ExtUtils::Command) >= 1.16
Requires: perl(ExtUtils::Install) >= 1.52
Requires: perl(ExtUtils::Manifest) >= 1.58
Requires: perl(File::Temp) >= 0.22
Requires: perl(JSON::PP) >= 2.27103
Requires: perl(Parse::CPAN::Meta) >= 1.4400
Requires: perl(Scalar::Util) >= 1.13
Requires: perl(version) >= 0.82
# MANUAL END
%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
@ -87,14 +65,8 @@ Perl to handle Unicode filenames, which is not yet the case on Windows.
%prep
%setup -q -n %{cpan_name}-%{version}
%patch0 -p1
find . -type f -print0 | xargs -0 chmod 644
# MANUAL BEGIN
grep -v ^bundled MAINFEST > t && mv t MAINFEST
rm -rf bundled
# MANAUL END
%build
export BUILDING_AS_PACKAGE=1
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
@ -103,13 +75,11 @@ export BUILDING_AS_PACKAGE=1
%install
%perl_make_install
rm $RPM_BUILD_ROOT/usr/bin/instmodsh
rm $RPM_BUILD_ROOT/usr/share/man/man1/instmodsh.1
%perl_process_packlist
%perl_gen_filelist
%files -f %{name}.files
%defattr(-,root,root,755)
%doc Changes CONTRIBUTING NOTES README README.packaging
%doc Changes CONTRIBUTING README README.packaging
%changelog