1 $NetBSD: patch-ca,v 1.10 2011/08/05 18:06:14 adam Exp $
3 --- Configure.orig 2011-09-26 09:44:34.000000000 +0000
5 @@ -3256,13 +3256,14 @@ EOM
8 dragonfly) osname=dragonfly
10 + osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
12 dynixptx*) osname=dynixptx
13 osvers=`echo "$4"|sed 's/^v//'`
15 freebsd) osname=freebsd
17 + osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
19 genix) osname=genix ;;
22 @@ -3284,7 +3285,7 @@ EOM
25 netbsd*) osname=netbsd
27 + osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
31 @@ -3295,7 +3296,7 @@ EOM
33 nonstop-ux) osname=nonstopux ;;
34 openbsd) osname=openbsd
36 + osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
40 @@ -4790,7 +4791,7 @@ case "$plibpth" in
44 -'') dlist="$loclibpth $plibpth $glibpth";;
45 +'') dlist="$plibpth $glibpth $loclibpth";;
49 @@ -4798,7 +4799,7 @@ esac
53 - if $test -d $xxx; then
54 + if $test -d $xxx -o "$xxx" = "$prefix/lib"; then
57 *) libpth="$libpth $xxx";;
58 @@ -6521,7 +6522,9 @@ rp='Pathname for the site-specific libra
62 -sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
63 +if $test -z "$sitelib_stem"; then
64 + sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
67 : Determine list of previous versions to include in @INC
68 $cat > getverlist <<EOPL
69 @@ -7033,7 +7036,9 @@ case "$vendorprefix" in
70 vendorlibexp="$ansexp"
73 -vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
74 +if $test -z "$vendorlib_stem"; then
75 + vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
80 @@ -7510,6 +7515,15 @@ case "$nm_so_opt" in
84 +: Mac OS X 10.7 is different
89 + libnames="$libnames /usr/lib/system/libsystem_*.dylib"
93 : Figure out where the libc is located
96 @@ -8339,7 +8353,7 @@ if "$useshrplib"; then
97 # beos doesn't like the default, either.
100 - # Haiku doesn't like the default, either.
101 + xxx="-Wl,-rpath,$shrpdir"
104 # hpux doesn't like the default, either.
105 @@ -9410,6 +9424,13 @@ EOCP
109 +: Look for a hint-file generated 'call-back-unit'. We need
110 +: to set some defaults for building perl in pkgsrc.
111 +if $test -f pkgsrc.cbu; then
112 + echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
116 : Set the vendorbin variables
117 case "$vendorprefix" in
118 '') d_vendorbin="$undef"
119 @@ -19061,7 +19082,15 @@ RCAT(Rei,ser)
122 $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
123 -if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
124 +# yuck, what a hack.
125 +# MIPSPro compiler/preprocessor behaves differently if invoked on
126 +# stdin vs file. Here we test for stdin, but lateron we use files.
127 +# So force it to work the way we know it does:
128 +if [ x"${OPSYS}" = x"IRIX" ]; then
129 + echo "Hacking MIPSPro on file vs. stdin..." >&4
130 + echo "We know we can catify or stringify, separately or together!"
132 +elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
133 echo "Oh! Smells like ANSI's been here." >&4
134 echo "We can catify or stringify, separately or together!"