void-packages/srcpkgs/perl/patches/usr_local.diff

65 lines
2.0 KiB
Diff

From 1b9950c255b7d5f13b8c65bde26151908f30fc10 Mon Sep 17 00:00:00 2001
From: Vladimir Smirnov <civil@gentoo.org>
Date: Mon, 19 May 2014 19:58:00 +0400
Subject: [PATCH] Remove /usr/local paths
remove /usr/local paths from all stuff thats used
in Configure script
Patch-Name: gentoo/usr_local.diff
Original-By: Torsten Veller <tove@gentoo.org>
---
Configure | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/Configure b/Configure
index 63b8848..d0a3c28 100755
--- Configure
+++ Configure
@@ -1315,8 +1315,7 @@ archobjs=''
archname=''
: Possible local include directories to search.
: Set locincpth to "" in a hint file to defeat local include searches.
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
+locincpth=""
:
: no include file wanted by default
inclwanted=''
@@ -1329,12 +1328,11 @@ libnames=''
: change the next line if compiling for Xenix/286 on Xenix/386
xlibpth='/usr/lib/386 /lib/386'
: Possible local library directories to search.
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
+loclibpth=""
: general looking path for locating libraries
glibpth="/lib /usr/lib $xlibpth"
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+glibpth="$glibpth /usr/ccs/lib /usr/ucblib"
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
@@ -4914,7 +4912,7 @@ esac
: Set private lib path
case "$plibpth" in
'') if ./mips; then
- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
+ plibpth="$incpath/usr/lib $sysroot/usr/ccs/lib"
fi;;
esac
case "$libpth" in
@@ -20513,7 +20511,7 @@ else
case "$ranlib" in
:) ranlib='';;
'')
- ranlib=`./loc ranlib X /usr/bin /bin /usr/local/bin`
+ ranlib=`./loc ranlib X /usr/bin /bin`
$test -f $ranlib || ranlib=''
;;
esac
--
1.9.3