Accepting request 293389 from devel:languages:perl
1 OBS-URL: https://build.opensuse.org/request/show/293389 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-ExtUtils-MakeMaker?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
906f7e5df6
139
Do_not_set_RPATH_by_default.patch
Normal file
139
Do_not_set_RPATH_by_default.patch
Normal file
@ -0,0 +1,139 @@
|
||||
From dbc43828283bd5ab150e24a6cd18c778e9763d7f 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
|
||||
|
||||
Former behavior can be forced by setting USE_MM_LD_RUN_PATH
|
||||
environment variable to 1.
|
||||
|
||||
This is copy from `perl' package.
|
||||
See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>.
|
||||
|
||||
[ddiss@suse.de: also handle LD_RUN_PATH set in MM_Any.pm]
|
||||
---
|
||||
|
||||
Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/Liblist.pm
|
||||
===================================================================
|
||||
--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/Liblist.pm
|
||||
+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/Liblist.pm
|
||||
@@ -88,6 +88,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.
|
||||
|
||||
+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
|
||||
Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm
|
||||
===================================================================
|
||||
--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm
|
||||
+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm
|
||||
@@ -972,7 +972,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
|
||||
}
|
||||
|
||||
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)" ';
|
||||
}
|
||||
|
||||
Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm
|
||||
===================================================================
|
||||
--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm
|
||||
+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm
|
||||
@@ -301,7 +301,8 @@ 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
|
||||
|
||||
@@ -436,7 +437,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}){
|
||||
@@ -2714,6 +2735,40 @@ precedence. A typemap in the current di
|
||||
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.
|
||||
Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Any.pm
|
||||
===================================================================
|
||||
--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Any.pm
|
||||
+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Any.pm
|
||||
@@ -2275,6 +2275,7 @@ sub init_others {
|
||||
# LD_RUN_PATH now computed by ExtUtils::Liblist
|
||||
($self->{EXTRALIBS}, $self->{BSLOADLIBS},
|
||||
$self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
|
||||
+ $self->{LD_RUN_PATH} = "" unless $self->{USE_MM_LD_RUN_PATH};
|
||||
last;
|
||||
}
|
||||
}
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 20 00:19:50 UTC 2015 - ddiss@suse.com
|
||||
|
||||
- Do not set LD_RUN_PATH by default; (bnc#841204).
|
||||
+ Add Do_not_set_RPATH_by_default.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 8 07:44:48 UTC 2015 - coolo@suse.com
|
||||
|
||||
|
||||
@ -30,6 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-macros
|
||||
%{perl_requires}
|
||||
Patch1: Do_not_set_RPATH_by_default.patch
|
||||
|
||||
# MANUAL BEGIN
|
||||
#!BuildIgnore: perl-ExtUtils-MakeMaker
|
||||
# used by my/bundles.pm
|
||||
@ -83,6 +85,7 @@ Perl to handle Unicode filenames, which is not yet the case on Windows.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{cpan_name}-%{version}
|
||||
%patch1 -p1
|
||||
find . -type f -print0 | xargs -0 chmod 644
|
||||
# MANUAL BEGIN
|
||||
grep -v ^bundled MAINFEST > t && mv t MAINFEST
|
||||
|
||||
Loading…
Reference in New Issue
Block a user