53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
|
From 5d4dec01bcfafa55d9200f7b02ebbd65367ad34d Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||
|
|
Date: Tue, 2 Jul 2013 10:28:15 +0200
|
||
|
|
Subject: [PATCH] Link to libperl explicitly on Linux
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
<https://bugzilla.redhat.com/show_bug.cgi?id=960048>
|
||
|
|
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=327585#50>
|
||
|
|
|
||
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||
|
|
---
|
||
|
|
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 8796346..12c6e9f 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};
|
||
|
|
@@ -932,7 +933,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).
|
||
|
|
|
||
|
|
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
|
||
|
|
@@ -941,6 +942,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).
|
||
|
|
$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.1.4
|
||
|
|
|