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