gcc41: rename and rebuild

This updates the build to use the common gcc build
infrastructure.
Additionally the package is renamed from gcc412 to gcc41
to match tgcwarev2.
This commit is contained in:
Tom G. Christensen
2013-11-24 00:10:00 +01:00
parent a1791f9367
commit bfcbebf6b6
9 changed files with 711 additions and 137 deletions

View File

@@ -0,0 +1,15 @@
--- gcc-4.0.4/libjava/testsuite/lib/libjava.exp.orig 2006-04-11 00:01:37.000000000 +0200
+++ gcc-4.0.4/libjava/testsuite/lib/libjava.exp 2013-10-07 18:28:39.308315000 +0200
@@ -35,6 +35,12 @@
set i $j
}
}
+ for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+ if {[string match "ld: warning: file *libiconv.so: attempted multiple inclusion of file" [lindex $tlist $i]]} {
+ # Delete line
+ set tlist [lreplace $tlist $i $i]
+ }
+ }
return [join $tlist \n]
}

View File

@@ -0,0 +1,12 @@
diff -up gcc-4.1.2/gcc/configure.orig gcc-4.1.2/gcc/configure
--- gcc-4.1.2/gcc/configure.orig 2006-11-13 23:09:55.000000000 +0100
+++ gcc-4.1.2/gcc/configure 2012-11-27 14:41:08.040178600 +0100
@@ -14226,7 +14226,7 @@ L2:' > conftest.s
# arbitrary sections are supported and try the test.
as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
if echo "$as_ver" | grep GNU > /dev/null; then
- as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
+ as_ver=`echo $as_ver | sed -e 's/GNU assembler.* \([0-9.][0-9.]*\).*/\1/'`
as_major=`echo $as_ver | sed 's/\..*//'`
as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
if test $as_major -eq 2 && test $as_minor -lt 11

View File

@@ -0,0 +1,25 @@
diff -up gcc-4.1.2/Makefile.in.makeinfo gcc-4.1.2/Makefile.in
diff -up gcc-4.1.2/gcc/configure.makeinfo gcc-4.1.2/gcc/configure
--- gcc-4.1.2/gcc/configure.makeinfo 2012-11-27 14:42:57.707666500 +0100
+++ gcc-4.1.2/gcc/configure 2012-11-27 14:43:17.715610000 +0100
@@ -7495,7 +7495,7 @@ else
echo "configure:7495: version of makeinfo is $ac_prog_version" >&5
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
- 4.[2-9]*)
+ 4.[7-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*)
gcc_cv_prog_makeinfo_modern=yes;;
*) gcc_cv_prog_makeinfo_modern=no;;
esac
diff -up gcc-4.1.2/configure.makeinfo gcc-4.1.2/configure
--- gcc-4.1.2/configure.makeinfo 2006-11-21 18:48:36.000000000 +0100
+++ gcc-4.1.2/configure 2012-11-27 19:17:38.366113000 +0100
@@ -3549,7 +3549,7 @@ case " $build_configdirs " in
# For an installed makeinfo, we require it to be from texinfo 4.2 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[7-9]*|4\.[1-9][0-9]*|[1-9][0-9]*)' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"