|
 |
fb0d177 |
From 9644657c4 10326749fd321d9c24944ec25afad2f Mon Sep 17 00:00:00 2001
|
|
 |
bbd2a6e |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
bbd2a6e |
Date: Thu, 20 Jun 2013 15:22:53 +0200
|
|
|
bbd2a6e |
Subject: [PATCH] Install libperl.so to shrpdir on Linux
|
|
|
bbd2a6e |
MIME-Version: 1.0
|
|
|
bbd2a6e |
Content-Type: text/plain; charset=UTF-8
|
|
|
bbd2a6e |
Content-Transfer-Encoding: 8bit
|
|
|
bbd2a6e |
|
|
|
bbd2a6e |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
bbd2a6e |
---
|
|
|
bbd2a6e |
Configure | 7 ++++---
|
|
|
bbd2a6e |
Makefile.SH | 2 +-
|
|
|
bbd2a6e |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
bbd2a6e |
|
|
|
bbd2a6e |
diff --git a/Configure b/Configure
|
|
|
bbd2a6e |
index 2f30261..825496e 100755
|
|
|
bbd2a6e |
--- a/Configure
|
|
|
bbd2a6e |
+++ b/Configure
|
|
|
70d9301 |
@@ -8762,7 +8762,9 @@ esac
|
|
|
bbd2a6e |
|
|
|
bbd2a6e |
# Detect old use of shrpdir via undocumented Configure -Dshrpdir
|
|
|
bbd2a6e |
case "$shrpdir" in
|
|
|
bbd2a6e |
-'') ;;
|
|
|
bbd2a6e |
+'')
|
|
|
bbd2a6e |
+shrpdir=$archlibexp/CORE
|
|
|
bbd2a6e |
+;;
|
|
|
bbd2a6e |
*) $cat >&4 <
|
|
|
bbd2a6e |
WARNING: Use of the shrpdir variable for the installation location of
|
|
|
bbd2a6e |
the shared $libperl is not supported. It was never documented and
|
|
|
70d9301 |
@@ -8792,7 +8794,6 @@ esac
|
|
|
bbd2a6e |
# Add $xxx to ccdlflags.
|
|
|
bbd2a6e |
# If we can't figure out a command-line option, use $shrpenv to
|
|
|
bbd2a6e |
# set env LD_RUN_PATH. The main perl makefile uses this.
|
|
|
bbd2a6e |
-shrpdir=$archlibexp/CORE
|
|
|
bbd2a6e |
xxx=''
|
|
|
bbd2a6e |
tmp_shrpenv=''
|
|
|
bbd2a6e |
if "$useshrplib"; then
|
|
|
70d9301 |
@@ -8807,7 +8808,7 @@ if "$useshrplib"; then
|
|
|
bbd2a6e |
xxx="-Wl,-R$shrpdir"
|
|
|
bbd2a6e |
;;
|
|
|
d493078 |
bsdos|linux|irix*|dec_osf|gnu*|haiku)
|
|
|
bbd2a6e |
- xxx="-Wl,-rpath,$shrpdir"
|
|
|
bbd2a6e |
+ # We want standard path
|
|
|
bbd2a6e |
;;
|
|
|
fb0d177 |
hpux*)
|
|
|
fb0d177 |
# hpux doesn't like the default, either.
|
|
|
bbd2a6e |
diff --git a/Makefile.SH b/Makefile.SH
|
|
|
bbd2a6e |
index 7733a32..a481183 100755
|
|
|
bbd2a6e |
--- a/Makefile.SH
|
|
|
bbd2a6e |
+++ b/Makefile.SH
|
|
|
70d9301 |
@@ -288,7 +288,7 @@ ranlib = $ranlib
|
|
|
bbd2a6e |
# installman commandline.
|
|
|
bbd2a6e |
bin = $installbin
|
|
|
bbd2a6e |
scriptdir = $scriptdir
|
|
|
bbd2a6e |
-shrpdir = $archlibexp/CORE
|
|
|
bbd2a6e |
+shrpdir = $shrpdir
|
|
|
bbd2a6e |
privlib = $installprivlib
|
|
|
bbd2a6e |
man1dir = $man1dir
|
|
|
bbd2a6e |
man1ext = $man1ext
|
|
|
bbd2a6e |
--
|
|
|
bbd2a6e |
1.8.1.4
|