 @@ -1,225 +1,224 @@
-$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.
 * Detect systems which have <fenv.h> but where using it fails.
 * 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
 -			osvers="$3"
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
  			;;
  		dynixptx*) osname=dynixptx
  			osvers=`echo "$4"|sed 's/^v//'`
  			;;
  		freebsd) osname=freebsd
 -			osvers="$3" ;;
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
 +			;;
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3506,8 +3507,11 @@ EOM
+@@ -3510,8 +3511,11 @@ EOM
  		minix)	osname=minix
  			osvers=`$uname -r`
  			;;
 +		minix*) osname=minix
 +			osvers=`$uname -r`
 +			;;
  		netbsd*) osname=netbsd
 -			osvers="$3"
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3517,7 +3521,7 @@ EOM
+@@ -3521,7 +3525,7 @@ EOM
  			;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
 -			osvers="$3"
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
  			;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -3532,6 +3536,9 @@ EOM
+@@ -3536,6 +3540,9 @@ EOM
  		qnx) osname=qnx
  			osvers="$4"
  			;;
 +		sco_sv) osname=sco_sv
 +			osvers=`$uname -r`v`$uname -v`
 +			;;
  		solaris) osname=solaris
  			case "$3" in
 *) 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.
 -case "$ccname" in
 +case "xx$ccname" in
      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='';;
 -'') dlist="$loclibpth $plibpth $glibpth";;
 +'') dlist="$plibpth $glibpth $loclibpth";;
  *) dlist="$libpth";;
  esac
  : Now check and see which directories actually exist, avoiding duplicates
  for xxx in $dlist
  do
 -    if $test -d $xxx; then
 +    if $test -d $xxx -o "$xxx" = "$prefix/lib"; then
  		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_
 -rm_try="$rm -f try try$_exe a.out .out try.[cho] try.$_o core core.try* try.core*"
 +rm_try="@TOOLS_RM@ -f try try$_exe a.out .out try.[cho] try.$_o core core.try* try.core*"
  : 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
 -	*)	case "$gccversion" in
 +	nothing) case "$gccversion" in
  		?*)	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
 +: Mac OS X 10.7 is different
 +case "$osname" in
 +    darwin)
 +	case "$osvers" in
 +	    11.*)
 +		libnames="$libnames /usr/lib/system/libsystem_*.dylib"
 +	esac
 +esac
++
  : 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
 -sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
 +if $test -z "$sitelib_stem"; then
 +	sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
 +fi
  : 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
 -vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
 +if $test -z "$vendorlib_stem"; then
 +	vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
 +fi
  prefixvar=vendorlib
  . ./installprefix
-@@ -8518,6 +8538,7 @@ EOM
+@@ -8530,6 +8550,7 @@ EOM
  			  esac
  			  ;;
  		    *linux*|irix*|gnu*)  dflt="-shared $optimize" ;;
 +		    sco_sv) dflt='-shared' ;;
  		    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
 -		-L*|-R*|-Wl,-R*)
 +		-L*|-R*|-Wl,-R*|-Wl,-z*)
  		    case " $dflt " in
  			*" $thisflag "*) ;;
  			*) dflt="$dflt $thisflag" ;;
-@@ -8816,6 +8837,10 @@ if "$useshrplib"; then
+@@ -8825,7 +8846,7 @@ if "$useshrplib"; then
- 	bsdos|linux|irix*|dec_osf|gnu*|haiku)
+ 	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.
+@@ -8835,6 +8856,9 @@ if "$useshrplib"; then
  		tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
@@ -8823,6 +8848,9 @@ if "$useshrplib"; then
  	cygwin)
  		# cygwin needs only ldlibpth
  		;;
 +	sco_sv)
 +		xxx="-Wl,-R$shrpdir"
 +		;;
  	*)
  		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
  		;;
-@@ -9903,6 +9931,13 @@ esac
+@@ -9911,6 +9935,13 @@ esac
  : Check if we want perlio
  useperlio="$define"
 +: Look for a hint-file generated 'call-back-unit'.  We need
 +: to set some defaults for building perl in pkgsrc.
 +if $test -f pkgsrc.cbu; then
 +	echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
 +	. ./pkgsrc.cbu
 +fi
++
  : 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
 -if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
 +# yuck, what a hack.
 +# MIPSPro compiler/preprocessor behaves differently if invoked on
 +# stdin vs file.  Here we test for stdin, but lateron we use files.
 +# So force it to work the way we know it does:
 +if [ x"${OPSYS}" = x"IRIX" ]; then
 +	echo "Hacking MIPSPro on file vs. stdin..." >&4
 +	echo "We know we can catify or stringify, separately or together!"
 +	cpp_stuff=42
 +elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
  	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
 +: And really validate that it is OK to include it
 +: On NetBSD 6.x non-amd64 non-i386 and non-sparc this fails
 +cat > try.c <<EOCP
 +#include <fenv.h>
 +int main() { return 0; }
 +EOCP
 +set try
 +if ! eval $compile_ok; then
 +	echo "<fenv.h> found to be unusable, disabling" >&4
 +	i_fenv=$undef