gcc40: rename and rebuild

This updates the build to use the common gcc build
infrastructure.
Additionally the package is renamed from gcc404 to gcc40
to match tgcwarev2.
This commit is contained in:
Tom G. Christensen
2013-11-23 23:51:11 +01:00
parent 80db73058a
commit a1791f9367
9 changed files with 464 additions and 125 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,24 @@
diff -up gcc-4.0.4/gcc/configure.makeinfo gcc-4.0.4/gcc/configure
--- gcc-4.0.4/gcc/configure.makeinfo 2012-09-09 12:44:42.824254000 +0200
+++ gcc-4.0.4/gcc/configure 2012-09-09 12:51:40.456517400 +0200
@@ -7392,7 +7392,7 @@ else
echo "configure:7392: 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.0.4/Makefile.in.makeinfo gcc-4.0.4/Makefile.in
--- gcc-4.0.4/Makefile.in.makeinfo 2006-04-04 23:04:37.000000000 +0200
+++ gcc-4.0.4/Makefile.in 2012-11-20 19:36:54.679470100 +0100
@@ -293,7 +293,7 @@ CONFIGURED_MAKEINFO = @CONFIGURED_MAKEIN
MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
else if (${CONFIGURED_MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
+ | 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 echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
# This just becomes part of the MAKEINFO definition passed down to