kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[lang/perl5] Fix rpath on QNX

Browse source
This commit is contained in:
js 2020-09-04 10:08:46 +00:00
parent 444d4beff1
commit 82dfb407e9
1 changed files with 26 additions and 27 deletions

53
lang/perl5/patches/patch-Configure
View file

@ -1,4 +1,4 @@
$NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
$NetBSD: patch-Configure,v 1.10 2020/09/04 10:08:46 js Exp $
* Use "uname -r" to get OS version for *BSD.
* Move $loclibpth to the end of $dlist, instead of the beginning.
@ -6,10 +6,11 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
* Honor more ldflags in shared objects.
* Add Minix
* Several other changes.
* Add rpath for QNX
--- Configure.orig 2020-02-27 17:40:12.000000000 +0000
--- Configure.orig 2020-06-14 23:01:24.000000000 +0000
+++ Configure
@@ -3475,13 +3475,14 @@ EOM
@@ -3479,13 +3479,14 @@ EOM
osvers="$3"
;;
dragonfly) osname=dragonfly
@ -26,7 +27,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
genix) osname=genix ;;
gnu) osname=gnu
osvers="$3" ;;
@@ -3506,8 +3507,11 @@ EOM
@@ -3510,8 +3511,11 @@ EOM
minix) osname=minix
osvers=`$uname -r`
;;
@ -39,7 +40,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
;;
news-os) osvers="$3"
case "$3" in
@@ -3517,7 +3521,7 @@ EOM
@@ -3521,7 +3525,7 @@ EOM
;;
nonstop-ux) osname=nonstopux ;;
openbsd) osname=openbsd
@ -48,7 +49,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
;;
os2) osname=os2
osvers="$4"
@@ -3532,6 +3536,9 @@ EOM
@@ -3536,6 +3540,9 @@ EOM
qnx) osname=qnx
osvers="$4"
;;
@ -58,7 +59,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
solaris) osname=solaris
case "$3" in
5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
@@ -4970,7 +4977,7 @@ esac
@@ -4978,7 +4985,7 @@ esac
# If using gcc or clang, we can get better values for libpth, incpth
# and usrinc directly from the compiler.
# Note that ccname for clang is also gcc.
@ -67,7 +68,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
gcc)
$echo 'extern int foo;' > try.c
set X `$cppstdin -v try.c 2>&1 | $awk '/^#include </,/^End of search /'|$cppfilter $grep '/include'`
@@ -5046,14 +5053,14 @@ case "$plibpth" in
@@ -5054,14 +5061,14 @@ case "$plibpth" in
esac
case "$libpth" in
' ') dlist='';;
@ -84,7 +85,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
case " $libpth " in
*" $xxx "*) ;;
*) libpth="$libpth $xxx";;
@@ -5169,7 +5176,7 @@ lib_ext=$_a
@@ -5177,7 +5184,7 @@ lib_ext=$_a
obj_ext=$_o
path_sep=$p_
@ -93,7 +94,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
: Which makefile gets called first. This is used by make depend.
case "$firstmakefile" in
@@ -5500,7 +5507,7 @@ default|recommended)
@@ -5508,7 +5515,7 @@ default|recommended)
# thing. (NWC)
case "$osname" in
amigaos) ;; # -fstack-protector builds but doesn't work
@ -102,7 +103,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
?*) set stack-protector-strong -fstack-protector-strong
eval $checkccflag
case "$dflt" in
@@ -6484,6 +6491,15 @@ case "$nm_so_opt" in
@@ -6492,6 +6499,15 @@ case "$nm_so_opt" in
;;
esac
@ -118,7 +119,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
: Figure out where the libc is located
case "$runnm" in
true)
@@ -7611,7 +7627,9 @@ rp='Pathname for the site-specific libra
@@ -7619,7 +7635,9 @@ rp='Pathname for the site-specific libra
. ./getfile
prefixvar=sitelib
. ./setprefixvar
@ -129,7 +130,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
: Determine list of previous versions to include in @INC
$cat > getverlist <<EOPL
@@ -8022,7 +8040,9 @@ case "$vendorprefix" in
@@ -8030,7 +8048,9 @@ case "$vendorprefix" in
vendorlibexp="$ansexp"
;;
esac
@ -140,7 +141,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
prefixvar=vendorlib
. ./installprefix
@@ -8518,6 +8538,7 @@ EOM
@@ -8530,6 +8550,7 @@ EOM
esac
;;
*linux*|irix*|gnu*) dflt="-shared $optimize" ;;
@ -148,7 +149,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
solaris) # See [perl #66604].
# On Solaris 11, gcc -m64 on amd64
# appears not to understand -G. gcc versions at
@@ -8557,7 +8578,7 @@ EOM
@@ -8569,7 +8590,7 @@ EOM
esac
for thisflag in $ldflags; do
case "$thisflag" in
@ -157,18 +158,16 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
case " $dflt " in
*" $thisflag "*) ;;
*) dflt="$dflt $thisflag" ;;
@@ -8816,6 +8837,10 @@ if "$useshrplib"; then
bsdos|linux|irix*|dec_osf|gnu*|haiku)
@@ -8825,7 +8846,7 @@ if "$useshrplib"; then
freebsd|minix|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
xxx="-Wl,-R$shrpdir"
;;
- bsdos|linux|irix*|dec_osf|gnu*|haiku)
+ bsdos|linux|irix*|dec_osf|gnu*|haiku|nto)
xxx="-Wl,-rpath,$shrpdir"
;;
+ haiku)
+ # Haiku doesn't like the default, either.
+ xxx="-Wl,-rpath,$shrpdir"
+ ;;
hpux*)
# hpux doesn't like the default, either.
tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
@@ -8823,6 +8848,9 @@ if "$useshrplib"; then
@@ -8835,6 +8856,9 @@ if "$useshrplib"; then
cygwin)
# cygwin needs only ldlibpth
;;
@ -178,7 +177,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
*)
tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
;;
@@ -9903,6 +9931,13 @@ esac
@@ -9911,6 +9935,13 @@ esac
: Check if we want perlio
useperlio="$define"
@ -192,7 +191,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
: Set the vendorbin variables
case "$vendorprefix" in
'') d_vendorbin="$undef"
@@ -20058,7 +20093,15 @@ RCAT(Rei,ser)
@@ -20114,7 +20145,15 @@ RCAT(Rei,ser)
ACAT(Cir,cus)
EOCP
$cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
@ -209,7 +208,7 @@ $NetBSD: patch-Configure,v 1.9 2020/07/22 15:23:57 sjmulder Exp $
echo "Oh! Smells like ANSI's been here." >&4
echo "We can catify or stringify, separately or together!"
cpp_stuff=42
@@ -22864,6 +22907,18 @@ eval $inhdr
@@ -22920,6 +22959,18 @@ eval $inhdr
set fenv.h i_fenv
eval $inhdr