sync vapier-m

[patches.git] / libperl.patch

--- Configure.orig	2007-04-08 22:19:09.000000000 -0400
+++ Configure	2007-04-09 02:34:02.000000000 -0400
@@ -1263,6 +1263,7 @@
 : 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"
@@ -1981,6 +1982,30 @@
 	esac;;
 esac"
 
+: figure out sizes of things with just compile tests
+: based on AC_CHECK_SIZEOF from autoconf
+cat <<EOSC >mysizeof
+$startsh
+size=0
+while true; do
+	echo "$sizeincludes" > try.c
+	echo "typedef \$type ac__type_sizeof_;" > try.c
+	echo "int main() {" >> try.c
+	echo "static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= \$size)];" >> try.c
+	echo "test_array [0] = 0; return 0;}" >> try.c
+	if \$cc $cflags -c try.c >/dev/null 2>&1; then
+		break
+	fi
+	: sanity check
+	if test \$size -gt 20; then
+		size=""
+		break
+	fi
+	size=\`expr \$size + 1\`
+done
+\$rm -f try.*
+EOSC
+
 : now set up to do reads with possible shell escape and default assignment
 cat <<EOSC >myread
 $startsh
@@ -4617,7 +4642,18 @@
 for thisdir in $libpth $xlibpth; do
   test -d $thisdir && libspath="$libspath $thisdir"
 done
+echo 'main(){}' > try.c
 for thislib in $libswanted; do
+	printf "Checking for -l$thislib ... " >&4
+	if $cc $cflags $ldflags -l$thislib try.c >/dev/null 2>&1; then
+		echo "OK" >&4
+		dflt="$dflt -l$thislib"
+		libsfiles="$libsfiles lib${thislib}.so"
+		libsfound="$libsfound /usr/lib/lib${thislib}.so"
+	else
+		echo "nope" >&4
+	fi
+	continue
 	for thisdir in $libspath; do
 	    xxx=''
 	    if $test ! -f "$xxx" -a "X$ignore_versioned_solibs" = "X"; then
@@ -5025,6 +5061,8 @@
 		rp="You have a problem.  Shall I abort Configure"
 		dflt=y
 	fi
+	# we dont care how it executed, just that it compiled
+	dflt=n
 else
 	echo "I can't compile the test program." >>try.msg
 	rp="You have a BIG problem.  Shall I abort Configure"
@@ -5182,23 +5220,20 @@
 case "$intsize" in
 '')
 	echo "Checking to see how big your integers are..." >&4
-	$cat >try.c <<EOCP
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main()
-{
-	printf("intsize=%d;\n", (int)sizeof(int));
-	printf("longsize=%d;\n", (int)sizeof(long));
-	printf("shortsize=%d;\n", (int)sizeof(short));
-	exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok && $run ./try > /dev/null; then
-		eval `$run ./try`
+
+	type="int"
+	. ./mysizeof
+	intsize="$size"
+
+	type="long"
+	. ./mysizeof
+	longsize="$size"
+
+	type="short"
+	. ./mysizeof
+	shortsize="$size"
+
+	if test "X$intsize" != X -a "X$longsize" != X -a "X$shortsize" != X; then
 		echo "Your integers are $intsize bytes long."
 		echo "Your long integers are $longsize bytes long."
 		echo "Your short integers are $shortsize bytes long."
@@ -5225,7 +5260,6 @@
 	fi
 	;;
 esac
-$rm -f try try.*
 
 : check for long long
 echo " "
@@ -5246,19 +5280,11 @@
 : check for length of long long
 case "${d_longlong}${longlongsize}" in
 $define)
-	echo " "
-	echo "Checking to see how big your long longs are..." >&4
-	$cat >try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-    printf("%d\n", (int)sizeof(long long));
-    return(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		longlongsize=`$run ./try`
+	type="long long"
+	. ./mysizeof
+	longlongsize="$size"
+
+	if test "X$longlongsize" != X; then
 		echo "Your long longs are $longlongsize bytes long."
 	else
 		dflt='8'
@@ -5572,21 +5598,10 @@
 case "$doublesize" in
 '')
 	echo "Checking to see how big your double precision numbers are..." >&4
-	$cat >try.c <<EOCP
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main()
-{
-    printf("%d\n", (int)sizeof(double));
-    exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		doublesize=`$run ./try`
+	type="double"
+	. ./mysizeof
+	doublesize="$size"
+	if test "X$doublesize" != X; then
 		echo "Your double is $doublesize bytes long."
 	else
 		dflt='8'
@@ -5620,17 +5635,10 @@
 $define)
 	echo " "
 	echo "Checking to see how big your long doubles are..." >&4
-	$cat >try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-	printf("%d\n", sizeof(long double));
-}
-EOCP
-	set try
-	set try
-	if eval $compile; then
-		longdblsize=`$run ./try`
+	type="long double"
+	. ./mysizeof
+	longdblsize="$size"
+	if test "X$longdblsize" != X; then
 		echo "Your long doubles are $longdblsize bytes long."
 	else
 		dflt='8'
@@ -6268,25 +6276,13 @@
 '')
 	echo "Checking to see how big your pointers are..." >&4
 	if test "$voidflags" -gt 7; then
-		echo '#define VOID_PTR char *' > try.c
+		type="char *"
 	else
-		echo '#define VOID_PTR void *' > try.c
+		type="void *"
 	fi
-	$cat >>try.c <<EOCP
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main()
-{
-    printf("%d\n", (int)sizeof(VOID_PTR));
-    exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		ptrsize=`$run ./try`
+	. ./mysizeof
+	ptrsize="$size"
+	if test "X$ptrsize" != X; then
 		echo "Your pointers are $ptrsize bytes long."
 	else
 		dflt='4'
@@ -8837,18 +8833,10 @@
 
 echo " "
 echo "Checking to see how big your file offsets are..." >&4
-$cat >try.c <<EOCP
-#include <sys/types.h>
-#include <stdio.h>
-int main()
-{
-    printf("%d\n", (int)sizeof($lseektype));
-    return(0); 
-}
-EOCP
-set try
-if eval $compile_ok; then
-	lseeksize=`$run ./try`
+type="$lseektype"
+. ./mysizeof
+lseeksize="$size"
+if test "X$lseeksize" != X; then
 	echo "Your file offsets are $lseeksize bytes long."
 else
 	dflt=$longsize
@@ -8871,21 +8859,10 @@
 *)   zzz="fpos_t"	;;
 esac
 echo "Checking the size of $zzz..." >&4 
-cat > try.c <<EOCP
-#include <sys/types.h>
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main() {
-    printf("%d\n", (int)sizeof($fpostype));
-    exit(0);
-}
-EOCP
-set try
-if eval $compile_ok; then
-	yyy=`$run ./try`
+type="$zzz"
+. ./mysizeof
+yyy="$size"
+if test "X$yyy" != X; then
 	case "$yyy" in
 	'')	fpossize=4
 		echo "(I can't execute the test program--guessing $fpossize.)" >&4
@@ -8953,18 +8930,10 @@
 	if $test -f uselargefiles.cbu; then
 		echo " "
 		echo "Rechecking to see how big your file offsets are..." >&4
-		$cat >try.c <<EOCP
-#include <sys/types.h>
-#include <stdio.h>
-int main()
-{
-    printf("%d\n", (int)sizeof($lseektype));
-    return(0); 
-}
-EOCP
-		set try
-		if eval $compile_ok; then
-			lseeksize=`$run ./try`
+		type="$lseektype"
+		. ./mysizeof
+		lseeksize="$size"
+		if test "X$lseeksize" != X; then
 			$echo "Your file offsets are now $lseeksize bytes long."
 		else
 			dflt="$lseeksize"
@@ -14590,22 +14559,10 @@
 case "$charsize" in
 '')
 	echo "Checking to see how big your characters are (hey, you never know)..." >&4
-	$cat >try.c <<EOCP
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main()
-{
-    printf("%d\n", (int)sizeof(char));
-    exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		dflt=`$run ./try`
-	else
+	type="char"
+	. ./mysizeof
+	dflt="$size"
+	if test "X$dflt" = X; then
 		dflt='1'
 		echo "(I can't seem to compile the test program.  Guessing...)"
 	fi
@@ -17430,6 +17387,24 @@
 			esac
 		else
 			dflt='4321'
+$cat >try.c <<EOCP
+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; }
+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
+int main() { _ascii (); _ebcdic (); return 0; }
+EOCP
+			if $cc $cflags -c try.c -o try.o; then
+				if grep BIGenDianSyS try.o >/dev/null; then
+					dflt='4321'
+				else
+					if grep LiTTleEnDian try.o >/dev/null; then
+						dflt='1234'
+					fi
+				fi
+			fi
 			cat <<'EOM'
 (I can't seem to compile the test program.  Guessing big-endian...)
 EOM
@@ -17753,6 +17728,13 @@
 		set try
 		if eval $compile_ok; then
 			dflt=`$run ./try`
+			if test "X$dflt" = X; then
+				if $test "X$uselongdouble" = Xdefine -a "X$d_longdbl" = Xdefine; then
+					dflt='__alignof__(long double)'
+				else
+					dflt='__alignof__(double)'
+				fi
+			fi
 		else
 			dflt='8'
 			echo "(I can't seem to compile the test program...)"
@@ -18475,21 +18457,10 @@
 *)   zzz="gid"		;;
 esac
 echo "Checking the size of $zzz..." >&4 
-cat > try.c <<EOCP
-#include <sys/types.h>
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main() {
-    printf("%d\n", (int)sizeof($gidtype));
-    exit(0);
-}
-EOCP
-set try
-if eval $compile_ok; then
-	yyy=`$run ./try`
+type="$zzz"
+. ./mysizeof
+yyy="$type"
+if test "X$yyy" != X; then
 	case "$yyy" in
 	'')	gidsize=4
 		echo "(I can't execute the test program--guessing $gidsize.)" >&4
@@ -19659,21 +19630,10 @@
 *)   zzz="filesize"	;;
 esac
 echo "Checking the size of $zzz..." >&4 
-cat > try.c <<EOCP
-#include <sys/types.h>
-#include <stdio.h>
-#$i_stdlib I_STDLIB
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-int main() {
-    printf("%d\n", (int)sizeof($sizetype));
-    exit(0);
-}
-EOCP
-set try
-if eval $compile_ok; then
-	yyy=`$run ./try`
+type="$sizetype"
+. ./mysizeof
+yyy="$size"
+if test "X$yyy" != X; then
 	case "$yyy" in
 	'')	sizesize=4
 		echo "(I can't execute the test program--guessing $sizesize.)" >&4