Date: Fri, 16 Dec 2011 16:24:04 -0800 From: Steve Kargl <sgk@troutmask.apl.washington.edu> To: freebsd-ports@freebsd.org Subject: [PATCH] lang/gcc -- Fix build on freebsd-current Message-ID: <20111217002404.GA70926@troutmask.apl.washington.edu>
next in thread | raw e-mail | index | archive | help
diff -ur gcc-4.6.2.orig/boehm-gc/configure gcc-4.6.2/boehm-gc/configure
--- gcc-4.6.2.orig/boehm-gc/configure 2011-10-26 02:30:24.000000000 -0700
+++ gcc-4.6.2/boehm-gc/configure 2011-12-16 11:19:53.000000000 -0800
@@ -10520,7 +10520,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -12428,7 +12428,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -14203,7 +14203,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/configure gcc-4.6.2/configure
--- gcc-4.6.2.orig/configure 2011-06-27 13:54:59.000000000 -0700
+++ gcc-4.6.2/configure 2011-12-16 11:19:03.000000000 -0800
@@ -3126,7 +3126,7 @@
noconfigdirs="$noconfigdirs sim target-rda"
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
+ *-*-freebsd2 | *-*-freebsd2.* | *-*-freebsd*aout*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;;
*-*-freebsd*)
diff -ur gcc-4.6.2.orig/gcc/config.gcc gcc-4.6.2/gcc/config.gcc
--- gcc-4.6.2.orig/gcc/config.gcc 2011-07-22 09:44:50.000000000 -0700
+++ gcc-4.6.2/gcc/config.gcc 2011-12-16 11:19:24.000000000 -0800
@@ -272,7 +272,7 @@
| pdp11-*-bsd \
| sparc-hal-solaris2* \
| thumb-*-* \
- | *-*-freebsd[12] | *-*-freebsd[12].* \
+ | *-*-freebsd2 | *-*-freebsd2.* \
| *-*-freebsd*aout* \
| *-*-linux*aout* \
| *-*-linux*coff* \
diff -ur gcc-4.6.2.orig/gcc/configure gcc-4.6.2/gcc/configure
--- gcc-4.6.2.orig/gcc/configure 2011-10-12 11:07:25.000000000 -0700
+++ gcc-4.6.2/gcc/configure 2011-12-16 11:19:40.000000000 -0800
@@ -16653,7 +16653,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -18537,7 +18537,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -20312,7 +20312,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libffi/configure gcc-4.6.2/libffi/configure
--- gcc-4.6.2.orig/libffi/configure 2011-10-26 02:30:24.000000000 -0700
+++ gcc-4.6.2/libffi/configure 2011-12-16 11:16:32.000000000 -0800
@@ -9914,7 +9914,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libgcc/config.host gcc-4.6.2/libgcc/config.host
--- gcc-4.6.2.orig/libgcc/config.host 2011-03-13 23:06:23.000000000 -0700
+++ gcc-4.6.2/libgcc/config.host 2011-12-16 11:16:26.000000000 -0800
@@ -145,7 +145,7 @@
asm_hidden_op=.private_extern
tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
;;
-*-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
+*-*-freebsd2 | *-*-freebsd2.* | *-*-freebsd*aout*)
# This is the place-holder for the generic a.out configuration
# of FreeBSD. No actual configuration resides here since
# there was only ever a bare-bones ix86 configuration for
diff -ur gcc-4.6.2.orig/libgfortran/configure gcc-4.6.2/libgfortran/configure
--- gcc-4.6.2.orig/libgfortran/configure 2011-10-26 02:30:24.000000000 -0700
+++ gcc-4.6.2/libgfortran/configure 2011-12-16 11:17:48.000000000 -0800
@@ -11242,7 +11242,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -14870,7 +14870,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libgo/configure gcc-4.6.2/libgo/configure
--- gcc-4.6.2.orig/libgo/configure 2011-02-20 20:17:20.000000000 -0800
+++ gcc-4.6.2/libgo/configure 2011-12-16 11:17:25.000000000 -0800
@@ -10046,7 +10046,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libgomp/configure gcc-4.6.2/libgomp/configure
--- gcc-4.6.2.orig/libgomp/configure 2011-10-26 02:30:24.000000000 -0700
+++ gcc-4.6.2/libgomp/configure 2011-12-16 11:16:09.000000000 -0800
@@ -10230,7 +10230,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -13869,7 +13869,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libjava/classpath/config.rpath gcc-4.6.2/libjava/classpath/config.rpath
--- gcc-4.6.2.orig/libjava/classpath/config.rpath 2011-02-13 03:45:53.000000000 -0800
+++ gcc-4.6.2/libjava/classpath/config.rpath 2011-12-16 11:15:13.000000000 -0800
@@ -533,7 +533,7 @@
;;
freebsd* | dragonfly*)
case "$host_os" in
- freebsd[123]*)
+ freebsd[23]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
diff -ur gcc-4.6.2.orig/libjava/classpath/configure gcc-4.6.2/libjava/classpath/configure
--- gcc-4.6.2.orig/libjava/classpath/configure 2011-02-13 03:45:53.000000000 -0800
+++ gcc-4.6.2/libjava/classpath/configure 2011-12-16 11:15:08.000000000 -0800
@@ -10941,7 +10941,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -14225,7 +14225,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -16000,7 +16000,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libjava/configure gcc-4.6.2/libjava/configure
--- gcc-4.6.2.orig/libjava/configure 2011-10-26 02:30:24.000000000 -0700
+++ gcc-4.6.2/libjava/configure 2011-12-16 11:15:30.000000000 -0800
@@ -12476,7 +12476,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -14384,7 +14384,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -16159,7 +16159,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -20715,7 +20715,7 @@
*-*-cygwin*)
# Don't set THREADLIBS here. Cygwin doesn't have -lpthread.
;;
- *-*-freebsd[1234]*)
+ *-*-freebsd[234]*)
# Before FreeBSD 5, it didn't have -lpthread (or any library which
# merely adds pthread_* functions) but it does have a -pthread switch
# which is required at link-time to select -lc_r *instead* of -lc.
diff -ur gcc-4.6.2.orig/libmudflap/configure gcc-4.6.2/libmudflap/configure
--- gcc-4.6.2.orig/libmudflap/configure 2011-02-13 03:45:53.000000000 -0800
+++ gcc-4.6.2/libmudflap/configure 2011-12-16 11:19:15.000000000 -0800
@@ -9731,7 +9731,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libobjc/configure gcc-4.6.2/libobjc/configure
--- gcc-4.6.2.orig/libobjc/configure 2011-02-13 03:45:53.000000000 -0800
+++ gcc-4.6.2/libobjc/configure 2011-12-16 11:19:08.000000000 -0800
@@ -9713,7 +9713,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libquadmath/configure gcc-4.6.2/libquadmath/configure
--- gcc-4.6.2.orig/libquadmath/configure 2011-03-28 10:09:27.000000000 -0700
+++ gcc-4.6.2/libquadmath/configure 2011-12-16 11:19:11.000000000 -0800
@@ -9643,7 +9643,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libssp/configure gcc-4.6.2/libssp/configure
--- gcc-4.6.2.orig/libssp/configure 2011-03-28 10:09:27.000000000 -0700
+++ gcc-4.6.2/libssp/configure 2011-12-16 11:16:37.000000000 -0800
@@ -9780,7 +9780,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/libstdc++-v3/configure gcc-4.6.2/libstdc++-v3/configure
--- gcc-4.6.2.orig/libstdc++-v3/configure 2011-10-05 16:09:51.000000000 -0700
+++ gcc-4.6.2/libstdc++-v3/configure 2011-12-16 11:17:40.000000000 -0800
@@ -10614,7 +10614,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -12522,7 +12522,7 @@
esac
;;
- freebsd[12]*)
+ freebsd2*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -14297,7 +14297,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/lto-plugin/configure gcc-4.6.2/lto-plugin/configure
--- gcc-4.6.2.orig/lto-plugin/configure 2011-02-13 03:45:53.000000000 -0800
+++ gcc-4.6.2/lto-plugin/configure 2011-12-16 11:17:51.000000000 -0800
@@ -9646,7 +9646,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
diff -ur gcc-4.6.2.orig/zlib/configure gcc-4.6.2/zlib/configure
--- gcc-4.6.2.orig/zlib/configure 2011-02-13 03:45:53.000000000 -0800
+++ gcc-4.6.2/zlib/configure 2011-12-16 11:17:56.000000000 -0800
@@ -9516,7 +9516,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23]*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111217002404.GA70926>