diff --git a/gcc33/build.sh b/gcc33/build.sh new file mode 100755 index 0000000..a14e8de --- /dev/null +++ b/gcc33/build.sh @@ -0,0 +1,102 @@ +#!/bin/bash +# This is a buildpkg build.sh script +# build.sh helper functions +. ${BUILDPKG_SCRIPTS}/build.sh.functions +# +########################################################### +# Check the following 4 variables before running the script +topdir=gcc +version=3.3.6 +pkgver=1 +source[0]=ftp://ftp.sunet.se/pub/gnu/gcc/releases/$topdir-$version/$topdir-$version.tar.bz2 +# If there are no patches, simply comment this +patch[0]=gcc-3.3.6-new-makeinfo.patch + +# Source function library +. ${BUILDPKG_SCRIPTS}/buildpkg.functions + +# Common settings for gcc +. ${BUILDPKG_BASE}/gcc/build.sh.gcc.common + +# Global settings + +# This compiler is bootstrapped with gcc 3.2.3 +export PATH=/usr/tgcware/gcc32/bin:$PATH + +reg prep +prep() +{ + generic_prep + setdir source + # Set bugurl and vendor version + ${__gsed} -i "s|URL:[^>]*|URL:$gccbugurl|" gcc/version.c + ${__gsed} -i "s/$version/$version (release)/" gcc/version.c + ${__gsed} -i "s/(release)/($gccpkgversion)/" gcc/version.c +} + +reg build +build() +{ + ${__mkdir} -p ${srcdir}/$objdir + generic_build ../$objdir + # Build gnat + setdir ${srcdir}/${objdir} + ${__make} -C gcc gnatlib + ${__make} -C gcc gnattools +} + +reg install +install() +{ + clean stage + setdir ${srcdir}/${objdir} + ${__make} DESTDIR=$stagedir install + custom_install=1 + generic_install + ${__find} ${stagedir} -name '*.la' -print | ${__xargs} ${__rm} -f + + # No shared libgna{t,rl} but dangling symlink appears + ${__find} $stagedir -name 'libgnarl.so*' -exec ${__rm} -f {} \; + ${__find} $stagedir -name 'libgnat.so*' -exec ${__rm} -f {} \; + + # Rearrange libraries + redo_libs + + # Remove obsolete gccbug script + ${__rm} -f $stagedir$prefix/bin/gccbug + + # Turn all the hardlinks in bin into symlinks + redo_bin + + # Place share/docs in the regular location + prefix=$topinstalldir + doc COPYING* BUGS FAQ MAINTAINERS +} + +reg check +check() +{ + setdir source + setdir ../$objdir + ${__make} -k check +} + +reg pack +pack() +{ + iprefix=${topdir}${abbrev_majorminor} + generic_pack +} + +reg distclean +distclean() +{ + META_CLEAN="$META_CLEAN compver.*" + clean distclean + ${__rm} -rf $srcdir/$objdir +} + +################################################### +# No need to look below here +################################################### +build_sh $* diff --git a/gcc33/meta/ChangeLog b/gcc33/meta/ChangeLog new file mode 100644 index 0000000..b38a969 --- /dev/null +++ b/gcc33/meta/ChangeLog @@ -0,0 +1,4 @@ +CHANGELOG +--------- +* Thu Oct 03 2013 Tom G. Christensen - 3.3.6-1 +- Import from tgcware v2 diff --git a/gcc33/meta/depend b/gcc33/meta/depend new file mode 100644 index 0000000..93ec1ef --- /dev/null +++ b/gcc33/meta/depend @@ -0,0 +1,11 @@ +TGCg33c libgcc_s1 auto +TGCg33cx gcc auto +TGCg33cx libstdc++5 auto +TGCg33ob gcc auto +TGCg33ob libobjc1 auto +TGCg33ft gcc auto +TGCg33ft libg2c0 auto +TGCg33gn gcc auto +TGClg2c0 libgcc_s1 auto +TGClobjc1 libgcc_s1 auto +TGClstdc5 libgcc_s1 auto diff --git a/gcc33/meta/pkgdef b/gcc33/meta/pkgdef new file mode 100644 index 0000000..fdebcfc --- /dev/null +++ b/gcc33/meta/pkgdef @@ -0,0 +1,369 @@ +[gcc] +pkgname="${pkgprefix}g${abbrev_majorminor}c" +name="GCC - GNU Compiler Collection (C)" +pkgvendor="http://gcc.gnu.org" +pkgdesc="GNU Compiler Collection (C)" +pkgver="$pkgver" +files(-,root,bin) +$iprefix/$_bindir/*gcc* +$iprefix/$_bindir/*gcov* +$iprefix/$_bindir/cpp +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/gcrt* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/crt* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgcc* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/gmon.o +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libiberty.* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/specs +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/collect2 +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/cc1 +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/install-tools +# "fixed" includes produced during build +# This list will vary as it depends on the buildhost +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/alloca.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/curses.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/floatingpoint.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/kerberos/osconf.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/libintl.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/math.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/memory.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/netinet/if_ether.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/proc_service.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/prof.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/pthread.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/regex.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/auth.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/clnt.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/svc.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/xdr.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdio.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdlib.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/audio_4231.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/core.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ddidmareq.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ddi_impldefs.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ethernet.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/exec.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/fs/hsfs_spec.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/gp1var.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ieeefp.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/syslimits.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/msreg.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/mutex.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/pctypes.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/proc/prdata.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/prsystm.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/rwlock.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/scsi/adapters/glmvar.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/scsi/impl/pkt_wrapper.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/sunddi.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/types.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/user.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/utrap.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/varargs.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/thread_db.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/unistd.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/wchar.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/v7 +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/fixed +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/README +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/X11 +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/DPS/dpsconfig.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/dni.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/nmdefs.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/Xlib.h +# real gcc includes +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/float.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/iso646.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/limits.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdarg.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdbool.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stddef.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/unwind.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/varargs.h +$iprefix/info/dir +$iprefix/info/gcc* +$iprefix/info/cpp* +$iprefix/man/?a?1/gcc.1 +$iprefix/man/?a?1/cpp.1 +$iprefix/man/?a?1/gcov.1 +$iprefix/man/?a?7/*.7 +$_vdocdir + +[gcc-gnat] +pkgname="${pkgprefix}g${abbrev_majorminor}gn" +name="gcc-gnat - GNU Compiler Collection (Ada)" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Ada support for GCC" +pkgver="$pkgver" +files(-,root,bin) +$iprefix/bin/gnat +$iprefix/bin/gnatbind +$iprefix/bin/gnatbl +$iprefix/bin/gnatchop +$iprefix/bin/gnatfind +$iprefix/bin/gnatkr +$iprefix/bin/gnatlink +$iprefix/bin/gnatls +$iprefix/bin/gnatmake +$iprefix/bin/gnatname +$iprefix/bin/gnatprep +$iprefix/bin/gnatpsta +$iprefix/bin/gnatxref +$iprefix/lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adainclude +$iprefix/lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adalib +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adainclude +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adalib +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/gnat1 +$iprefix/info/gnat* + +[gcc-c++] +pkgname="${pkgprefix}g${abbrev_majorminor}cx" +name="gcc-c++ - GNU Compiler Collection (C++)" +pkgvendor="http://gcc.gnu.org" +pkgdesc="C++ support for GCC" +pkgver="$pkgver" +files(-,root,bin) +$iprefix/bin/*++* +include/c++/${version}/algorithm +include/c++/${version}/backward/algobase.h +include/c++/${version}/backward/algo.h +include/c++/${version}/backward/alloc.h +include/c++/${version}/backward/backward_warning.h +include/c++/${version}/backward/bvector.h +include/c++/${version}/backward/complex.h +include/c++/${version}/backward/defalloc.h +include/c++/${version}/backward/deque.h +include/c++/${version}/backward/fstream.h +include/c++/${version}/backward/function.h +include/c++/${version}/backward/hash_map.h +include/c++/${version}/backward/hash_set.h +include/c++/${version}/backward/hashtable.h +include/c++/${version}/backward/heap.h +include/c++/${version}/backward/iomanip.h +include/c++/${version}/backward/iostream.h +include/c++/${version}/backward/istream.h +include/c++/${version}/backward/iterator.h +include/c++/${version}/backward/list.h +include/c++/${version}/backward/map.h +include/c++/${version}/backward/multimap.h +include/c++/${version}/backward/multiset.h +include/c++/${version}/backward/new.h +include/c++/${version}/backward/ostream.h +include/c++/${version}/backward/pair.h +include/c++/${version}/backward/queue.h +include/c++/${version}/backward/rope.h +include/c++/${version}/backward/set.h +include/c++/${version}/backward/slist.h +include/c++/${version}/backward/stack.h +include/c++/${version}/backward/streambuf.h +include/c++/${version}/backward/stream.h +include/c++/${version}/backward/strstream +include/c++/${version}/backward/tempbuf.h +include/c++/${version}/backward/tree.h +include/c++/${version}/backward/vector.h +include/c++/${version}/bits/basic_ios.h +include/c++/${version}/bits/basic_ios.tcc +include/c++/${version}/bits/basic_string.h +include/c++/${version}/bits/basic_string.tcc +include/c++/${version}/bits/boost_concept_check.h +include/c++/${version}/bits/char_traits.h +include/c++/${version}/bits/cmath.tcc +include/c++/${version}/bits/codecvt.h +include/c++/${version}/bits/concept_check.h +include/c++/${version}/bits/cpp_type_traits.h +include/c++/${version}/bits/deque.tcc +include/c++/${version}/bits/list.tcc +include/c++/${version}/bits/locale_classes.h +include/c++/${version}/bits/vector.tcc +include/c++/${version}/bitset +include/c++/${version}/bits/fpos.h +include/c++/${version}/bits/fstream.tcc +include/c++/${version}/bits/functexcept.h +include/c++/${version}/bits/gslice_array.h +include/c++/${version}/bits/gslice.h +include/c++/${version}/bits/indirect_array.h +include/c++/${version}/bits/ios_base.h +include/c++/${version}/bits/istream.tcc +include/c++/${version}/bits/locale_facets.h +include/c++/${version}/bits/locale_facets.tcc +include/c++/${version}/bits/localefwd.h +include/c++/${version}/bits/mask_array.h +include/c++/${version}/bits/ostream.tcc +include/c++/${version}/bits/pthread_allocimpl.h +include/c++/${version}/bits/slice_array.h +include/c++/${version}/bits/sstream.tcc +include/c++/${version}/bits/stl_algobase.h +include/c++/${version}/bits/stl_algo.h +include/c++/${version}/bits/stl_alloc.h +include/c++/${version}/bits/stl_bvector.h +include/c++/${version}/bits/stl_construct.h +include/c++/${version}/bits/stl_deque.h +include/c++/${version}/bits/stl_function.h +include/c++/${version}/bits/stl_heap.h +include/c++/${version}/bits/stl_iterator_base_funcs.h +include/c++/${version}/bits/stl_iterator_base_types.h +include/c++/${version}/bits/stl_iterator.h +include/c++/${version}/bits/stl_list.h +include/c++/${version}/bits/stl_map.h +include/c++/${version}/bits/stl_multimap.h +include/c++/${version}/bits/stl_multiset.h +include/c++/${version}/bits/stl_numeric.h +include/c++/${version}/bits/stl_pair.h +include/c++/${version}/bits/stl_pthread_alloc.h +include/c++/${version}/bits/stl_queue.h +include/c++/${version}/bits/stl_raw_storage_iter.h +include/c++/${version}/bits/stl_relops.h +include/c++/${version}/bits/stl_set.h +include/c++/${version}/bits/stl_stack.h +include/c++/${version}/bits/stl_tempbuf.h +include/c++/${version}/bits/stl_threads.h +include/c++/${version}/bits/stl_tree.h +include/c++/${version}/bits/stl_uninitialized.h +include/c++/${version}/bits/stl_vector.h +include/c++/${version}/bits/stream_iterator.h +include/c++/${version}/bits/streambuf_iterator.h +include/c++/${version}/bits/streambuf.tcc +include/c++/${version}/bits/stringfwd.h +include/c++/${version}/bits/type_traits.h +include/c++/${version}/bits/valarray_array.h +include/c++/${version}/bits/valarray_array.tcc +include/c++/${version}/bits/valarray_meta.h +include/c++/${version}/cassert +include/c++/${version}/cctype +include/c++/${version}/cerrno +include/c++/${version}/cfloat +include/c++/${version}/ciso646 +include/c++/${version}/climits +include/c++/${version}/clocale +include/c++/${version}/cmath +include/c++/${version}/complex +include/c++/${version}/csetjmp +include/c++/${version}/csignal +include/c++/${version}/cstdarg +include/c++/${version}/cstddef +include/c++/${version}/cstdio +include/c++/${version}/cstdlib +include/c++/${version}/cstring +include/c++/${version}/ctime +include/c++/${version}/cwchar +include/c++/${version}/cwctype +include/c++/${version}/cxxabi.h +include/c++/${version}/deque +include/c++/${version}/exception +include/c++/${version}/exception_defines.h +include/c++/${version}/ext/algorithm +include/c++/${version}/ext/enc_filebuf.h +include/c++/${version}/ext/functional +include/c++/${version}/ext/hash_map +include/c++/${version}/ext/hash_set +include/c++/${version}/ext/iterator +include/c++/${version}/ext/memory +include/c++/${version}/ext/numeric +include/c++/${version}/ext/rb_tree +include/c++/${version}/ext/rope +include/c++/${version}/ext/ropeimpl.h +include/c++/${version}/ext/slist +include/c++/${version}/ext/stdio_filebuf.h +include/c++/${version}/ext/stl_hash_fun.h +include/c++/${version}/ext/stl_hashtable.h +include/c++/${version}/ext/stl_rope.h +include/c++/${version}/fstream +include/c++/${version}/functional +include/c++/${version}/iomanip +include/c++/${version}/ios +include/c++/${version}/iosfwd +include/c++/${version}/iostream +include/c++/${version}/istream +include/c++/${version}/iterator +include/c++/${version}/limits +include/c++/${version}/list +include/c++/${version}/locale +include/c++/${version}/map +include/c++/${version}/memory +include/c++/${version}/new +include/c++/${version}/numeric +include/c++/${version}/ostream +include/c++/${version}/queue +include/c++/${version}/set +include/c++/${version}/sstream +include/c++/${version}/stack +include/c++/${version}/stdexcept +include/c++/${version}/streambuf +include/c++/${version}/string +include/c++/${version}/typeinfo +include/c++/${version}/utility +include/c++/${version}/valarray +include/c++/${version}/vector +include/c++/${version}/${arch}-${vendor}-solaris*/bits +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libstdc++.* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libsupc++.* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/cc1plus +$iprefix/man/man1/g++.1 + +[gcc-objc] +pkgname="${pkgprefix}g${abbrev_majorminor}ob" +name="gcc-objc - GNU Compiler Collection (Objective-C)" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Objective-C support for GCC" +pkgver="$pkgver" +files(-,root,bin) +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/objc +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libobjc.* +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/cc1obj + +[gcc-g77] +pkgname="${pkgprefix}g${abbrev_majorminor}ft" +name="gcc-g77 - GNU Compiler Collection (Fortran)" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Fortran support for GCC" +pkgver="$pkgver" +files(-,root,bin) +$iprefix/bin/?77 +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/g2c.h +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/f771 +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libfrtbegin.a +lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libg2c.* +$iprefix/man/?a?1/g77.1 +$iprefix/info/g77.info* + +[libgcc_s1] +pkgname="${pkgprefix}lgcc1" +name="libgcc_s1 - GCC shared support library" +pkgcat="system" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Runtime support library for C" +pkgver="$pkgver" +files(-,root,bin) +$_libdir/libgcc_s.so.1* + +[libstdc++5] +pkgname="${pkgprefix}lstdc5" +name="libstdc++5 - GNU Standard C++ library" +pkgcat="system" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Runtime support library for C++" +pkgver="$pkgver" +files(-,root,bin) +$_libdir/libstdc++.so.5* + +[libobjc1] +pkgname="${pkgprefix}lobjc1" +name="libobjc1 - GNU Objective-C shared support library" +pkgcat="system" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Runtime support library for Objective-C" +pkgver="$pkgver" +files(-,root,bin) +$_libdir/libobjc.so.1* + +[libg2c0] +pkgname="${pkgprefix}lg2c0" +name="libg2c0 - GNU Fortran shared support library" +pkgcat="system" +pkgvendor="http://gcc.gnu.org" +pkgdesc="Runtime support library for Fortran" +pkgver="$pkgver" +files(-,root,bin) +dir $_libdir +$_libdir/libg2c.so.0* + diff --git a/gcc33/meta/relnotes b/gcc33/meta/relnotes new file mode 100644 index 0000000..2151c41 --- /dev/null +++ b/gcc33/meta/relnotes @@ -0,0 +1,30 @@ +PACKAGE DETAILS +--------------- +Name: %%PKGNAME%% +Version: %%SOURCE_AND_VER%% +Vendor: %%VENDOR%% +Packager: %%PKGEDBY%% + +Source (sha1sum): +%%SOURCE_SHA1SUM%% + +BUILD DETAILS +------------- +Compiler: +%%COMPILER%% + +Environment: +%%ENVIRONMENT%% + +Configure: +%%CONFIGURE%% + +KNOWN DEPENDENCIES +------------------ +%%DEPENDENCIES%% + +ERRORS/MISCELLANEOUS +-------------------- +After installation the fixed-includes should be regenerated. +Go to /usr/tgcware/lib/gcc-lib///install-tools and run +the mkheaders program. diff --git a/gcc33/src/gcc-3.3.6-new-makeinfo.patch b/gcc33/src/gcc-3.3.6-new-makeinfo.patch new file mode 100644 index 0000000..c246d33 --- /dev/null +++ b/gcc33/src/gcc-3.3.6-new-makeinfo.patch @@ -0,0 +1,24 @@ +diff -up gcc-3.3.6/Makefile.in.makeinfo gcc-3.3.6/Makefile.in +--- gcc-3.3.6/Makefile.in.makeinfo 2003-07-05 04:37:08.000000000 +0200 ++++ gcc-3.3.6/Makefile.in 2012-11-25 13:39:24.849486100 +0100 +@@ -158,7 +158,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \ + 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.3.6/gcc/configure.makeinfo gcc-3.3.6/gcc/configure +--- gcc-3.3.6/gcc/configure.makeinfo 2012-11-25 13:36:36.715834600 +0100 ++++ gcc-3.3.6/gcc/configure 2012-11-25 13:37:53.139791400 +0100 +@@ -3299,7 +3299,7 @@ else + echo "configure:3300: 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