gcc34: rename and rebuild

This updates the build to use the common gcc build infrastructure.
Additionally the package is renamed from gcc346 to gcc34 to match
tgcwarev2.
This commit is contained in:
Tom G. Christensen
2013-11-23 22:14:46 +01:00
parent 34c7babca0
commit 80db73058a
9 changed files with 428 additions and 226 deletions

View File

@@ -0,0 +1,24 @@
diff -up gcc-3.4.6/gcc/ada/Makefile.in.gpr gcc-3.4.6/gcc/ada/Makefile.in
--- gcc-3.4.6/gcc/ada/Makefile.in.gpr 2004-01-26 22:57:33.000000000 +0100
+++ gcc-3.4.6/gcc/ada/Makefile.in 2012-11-16 20:36:24.625050300 +0100
@@ -2021,7 +2021,7 @@ b_gnatm.o : b_gnatm.c
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
-ADA_SHARE_MAKE_DIR = $(prefix)/share/gnat
+ADA_SHARE_MAKE_DIR = $(prefix)/share/gnat/@@GCCVERSION@@
# force no sibling call optimization on s-traceb.o so the number of stack
# frames to be skipped when computing a call chain is not modified by
diff -up gcc-3.4.6/gcc/ada/bld.adb.gpr gcc-3.4.6/gcc/ada/bld.adb
--- gcc-3.4.6/gcc/ada/bld.adb.gpr 2004-01-12 12:36:13.000000000 +0100
+++ gcc-3.4.6/gcc/ada/bld.adb 2012-11-16 20:35:48.956716400 +0100
@@ -2628,6 +2628,8 @@ package body Bld is
Put_Directory_Separator;
Put ("gnat");
Put_Directory_Separator;
+ Put ("@@GCCVERSION@@");
+ Put_Directory_Separator;
Put ("Makefile.prolog");
New_Line;

View File

@@ -0,0 +1,12 @@
diff -up gcc-3.4.6/gcc/configure.newgas gcc-3.4.6/gcc/configure
--- gcc-3.4.6/gcc/configure.newgas 2005-06-01 18:32:31.000000000 +0200
+++ gcc-3.4.6/gcc/configure 2012-09-09 12:05:30.363537700 +0200
@@ -10577,7 +10577,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,24 @@
diff -up gcc-3.4.6/Makefile.in.makeinfo gcc-3.4.6/Makefile.in
--- gcc-3.4.6/Makefile.in.makeinfo 2004-09-24 02:43:53.000000000 +0200
+++ gcc-3.4.6/Makefile.in 2012-11-26 16:33:40.887886300 +0100
@@ -186,7 +186,7 @@ MAKEINFO=@MAKEINFO@
USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
then echo $$r/texinfo/makeinfo/makeinfo ; \
else if (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 makeinfo; else echo $$s/missing makeinfo; fi; fi`
# This just becomes part of the MAKEINFO definition passed down to
diff -up gcc-3.4.6/gcc/configure.makeinfo gcc-3.4.6/gcc/configure
--- gcc-3.4.6/gcc/configure.makeinfo 2012-11-26 16:33:19.666187200 +0100
+++ gcc-3.4.6/gcc/configure 2012-11-26 16:33:40.913588700 +0100
@@ -5232,7 +5232,7 @@ else
echo "configure:5232: 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