Link to libperl.so explicitly
This commit is contained in:
parent
3fc144d114
commit
999ae19876
@ -0,0 +1,52 @@
|
|||||||
|
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
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: perl-%{cpan_name}
|
Name: perl-%{cpan_name}
|
||||||
Version: %(echo '%{cpan_version}' | tr _ .)
|
Version: %(echo '%{cpan_version}' | tr _ .)
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Create a module Makefile
|
Summary: Create a module Makefile
|
||||||
License: GPL+ or Artistic
|
License: GPL+ or Artistic
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -12,6 +12,8 @@ Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{cpan_v
|
|||||||
# Do not set RPATH to perl shared-library modules by default. Bug #773622.
|
# Do not set RPATH to perl shared-library modules by default. Bug #773622.
|
||||||
# This is copy from `perl' package. This is distributor extension.
|
# This is copy from `perl' package. This is distributor extension.
|
||||||
Patch0: %{cpan_name}-6.68-USE_MM_LD_RUN_PATH.patch
|
Patch0: %{cpan_name}-6.68-USE_MM_LD_RUN_PATH.patch
|
||||||
|
# Link to libperl.so explicitly. Bug #960048.
|
||||||
|
Patch1: %{cpan_name}-6.68-Link-to-libperl-explicitly-on-Linux.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: perl
|
BuildRequires: perl
|
||||||
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib
|
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib
|
||||||
@ -71,6 +73,7 @@ Dougherty and the perl5-porters.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n ExtUtils-MakeMaker-%{cpan_version}
|
%setup -q -n ExtUtils-MakeMaker-%{cpan_version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
# Remove bundled modules
|
# Remove bundled modules
|
||||||
rm -rf bundled/* ||:
|
rm -rf bundled/* ||:
|
||||||
sed -i -e '/^bundled\// d' MANIFEST
|
sed -i -e '/^bundled\// d' MANIFEST
|
||||||
@ -95,6 +98,9 @@ make test
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 02 2013 Petr Pisar <ppisar@redhat.com> - 6.68-3
|
||||||
|
- Link to libperl.so explicitly (bug #960048)
|
||||||
|
|
||||||
* Thu Jun 27 2013 Jitka Plesnikova <jplesnik@redhat.com> - 6.68-2
|
* Thu Jun 27 2013 Jitka Plesnikova <jplesnik@redhat.com> - 6.68-2
|
||||||
- Update BRs
|
- Update BRs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user