[SM-Commit] GIT changes to stable-rc-0.24 grimoire by Arwed von Merkatz (c311acf3cc6e24f452408783f7df787d81f6dd02)

Arwed von Merkatz scm at sourcemage.org
Wed Aug 6 11:58:13 EDT 2008


GIT changes to stable-rc-0.24 grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 dev/null                                         |binary
 gnu/ada/BUILD                                    |   28 ++---------
 gnu/ada/DEPENDS                                  |    4 -
 gnu/ada/DETAILS                                  |   36 ++++++---------
 gnu/ada/FINAL                                    |    4 +
 gnu/ada/HISTORY                                  |   55 -----------------------
 gnu/ada/INSTALL                                  |    9 ++-
 gnu/ada/POST_REMOVE                              |    2 
 gnu/ada/POST_RESURRECT                           |    2 
 gnu/ada/PRE_BUILD                                |   38 ++-------------
 gnu/ada/gnat-4.1.1-i386-pc-linux-gnu.tar.bz2.sig |binary
 gnu/ada/specs_ada                                |    9 +++
 gnu/fortran/BUILD                                |    4 -
 gnu/fortran/DEPENDS                              |    8 +--
 gnu/fortran/DETAILS                              |    2 
 gnu/fortran/HISTORY                              |   12 -----
 gnu/g++/BUILD                                    |    4 -
 gnu/g++/DEPENDS                                  |    6 --
 gnu/g++/DETAILS                                  |    2 
 gnu/g++/HISTORY                                  |   12 -----
 gnu/gcc/BUILD                                    |    4 -
 gnu/gcc/DEPENDS                                  |   18 +------
 gnu/gcc/DETAILS                                  |    7 +-
 gnu/gcc/HISTORY                                  |   19 -------
 gnu/gcc/PRE_BUILD                                |    3 -
 gnu/gcc/gcc-4.2.3-ffast-math.patch               |   50 ++++++++++++++++++++
 gnu/gcc/gcc-4.3.0-ffast-math.patch               |   50 --------------------
 gnu/gcj/BUILD                                    |   10 +---
 gnu/gcj/DEPENDS                                  |   31 ++++--------
 gnu/gcj/DETAILS                                  |   15 ++----
 gnu/gcj/HISTORY                                  |   28 -----------
 gnu/gcj/INSTALL                                  |   11 ++--
 gnu/gcj/PRE_BUILD                                |   20 ++------
 gnu/gcj/ecj-4.3.jar.sig                          |    0 
 gnu/gcj/specs_java                               |    4 -
 gnu/objc/BUILD                                   |    4 -
 gnu/objc/DEPENDS                                 |    5 --
 gnu/objc/DETAILS                                 |    2 
 gnu/objc/HISTORY                                 |   12 -----
 39 files changed, 152 insertions(+), 378 deletions(-)

New commits:
commit c311acf3cc6e24f452408783f7df787d81f6dd02
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcc: Updated to 4.3.0"
    
    This reverts commit 09cc37fe6bb5518c607074492a5bcc8e86ffe0eb.

commit 77534c0805a329e9e6848b7fca5edaeb8513016b
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcc: x86_64 build fix, otherwise tries to compile as x86_64-unknown-linux-gnu instead of x86_64-pc-linux-gnu and breaks"
    
    This reverts commit 8e051dc1a92b67d3b076eda952d43dbde0cac342.

commit b29d27a9780cf43eb17f0fee65c4986fa4fa0d9e
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcc: Force mpfr >= 2.3.0"
    
    This reverts commit b8c65f956dbaf8f14d66a6dfdc004213d2bade46.

commit 8dbd2af2d75ad7b154fa730b940c91624d0fa89a
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcc: Reset PATCHLEVEL to default"
    
    This reverts commit 9e9cbc8d2719d506857130a6d56a4f958c7ff539.

commit f3444f3f71cf44c9d5be15addad3a38be21f15fd
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "g++: Updated to 4.3.0"
    
    This reverts commit 44ed7c9b155e1c06e35c6a6f3a3f0574c13b55bc.

commit 42f04f13c6c0a1de86215d52273697e2a7c51fb4
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj: Updated to 4.3.0"
    
    This reverts commit 65980b59d286461ab3173b18252158d7de9cae7a.

commit 8721e82188a858a8b011ebaae6e2bcaac8d8c05a
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "objc: Updated to 4.3.0"
    
    This reverts commit 01cdc736d14ea26e5c989d9a69337f2a0bbf68b3.

commit decd9ced99d81925b8c0eb4a627ff435262fc32f
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "fortran: Updated to 4.3.0"
    
    This reverts commit 48e000a663c79cdd94532ebb468c35a8d8bdd859.

commit 0430eba896788a2c2b27cc54ea309af68a55f3c1
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "g++: x86_64 build fix, otherwise tries to compile as x86_64-unknown-linux-gnu instead of x86_64-pc-linux-gnu and breaks"
    
    This reverts commit 2cb501124b175aca726b60bdb56b1f4fc321722f.

commit 19f606cf7d8b991a7f588b9ee118d9bd60c932e8
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj: x86_64 build fix, otherwise tries to compile as x86_64-unknown-linux-gnu instead of x86_64-pc-linux-gnu and breaks"
    
    This reverts commit 5fdd62a9dd87c6ae6291d512bf6454111770051f.

commit f0eb68985c6d04b3741f5c4cf3d3c60a0edbec50
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "objc: x86_64 build fix, otherwise tries to compile as x86_64-unknown-linux-gnu instead of x86_64-pc-linux-gnu and breaks"
    
    This reverts commit aa3e922d0cae36fbf552d3b44b51e663d8e6847c.

commit 8d88e5b9beb17800aa87d6f10ec2e2e0a30e9d46
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "fortran: x86_64 build fix, otherwise tries to compile as x86_64-unknown-linux-gnu instead of x86_64-pc-linux-gnu and breaks"
    
    This reverts commit 020a94c8ab1ae7e32787b6f0faf2c1f347a591ef.

commit 9214eec7835bd39c9a076743e8206fe67127b6b3
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "ada: 4.3.0, won't work without a newer/rebuilt gnat binary (SOURCE3)."
    
    This reverts commit 5adc23660a6f172692f0aa2cd54cf0fe534b3c7e.

commit 74bacbe9dce6cec4aac822879b514d4b91e83346
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "ada: x86_64 build fix, otherwise tries to compile as x86_64-unknown-linux-gnu instead of x86_64-pc-linux-gnu and breaks"
    
    This reverts commit ff59752992951c915d773ab1299e45f5fa98105d.

commit cdc0ca6b3a9fbe1bd86d753c9bdf9a8b608078af
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "ada: Many muckings to get this POS to work. Now supports x86_64, the bootstrap has"
    
    This reverts commit 4f424d2cc6571e5f4a53fa2562835644c42dbf8c.

commit 67502566c2ba5e8f4f1905a51cb73aedc3430b72
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj: Depend on libxtst if AWT is requested and using xorg-modular (Bug #13975)"
    
    This reverts commit d1cefa7ef55c17655424074e5c6c6c84dc984caf.

commit 67d498401976e9a0c00bb77ee06b87209ea61b5f
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcc 4.3.1"
    
    This reverts commit c9a6a2db761521cc53e49b6cac56a69522bb98a1.

commit 6c7f6ea37537e383ed3878502c651f25837ce810
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "g++ 4.3.1"
    
    This reverts commit e004d38537a85d74da8696bdaa1422f776041d54.

commit 75f4d5c8a467e34ddc6373f759c314a006deac0f
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj 4.3.1"
    
    This reverts commit 2f8841ce028fd6262da2c68410e10687b1ad6d0a.

commit 4a5e08017876ed29eda4f7081f4c25d891eaad9e
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "objc 4.3.1"
    
    This reverts commit 29afc38a7128ef83f07479399df26b56ed9806c0.

commit 8cf728963b9928d0923ed679417a04639d9f6f4d
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "fortran 4.3.1"
    
    This reverts commit 01aef11c1ab8ec1cda8ceee5aae04f18a0e62e86.

commit bc8a3c2f3f182b3fe47e0e55918a657f2fd27e64
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "ada 4.3.1"
    
    This reverts commit ad1987cc31a5f8547796b0f7515987040416bba0.

commit 82ef371534f983d6f56daa2c023f21c7e6290d1b
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj: fixed to be _useable_, added ECJ (Eclipse compiler for Java) jar as a source file (GCJ >=4.3 depends on it)"
    
    This reverts commit fb1862913bd40905203119550eb260ad0b737c31.

commit e398acf596a7f24a8ba9bbdc8bb329cb050442cf
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj: added some bashism, cleaned up"
    
    This reverts commit d075dca0e060c0bf49716dc4b4269b3e8c4a0063.

commit d1bd7f18a69a505cd9b6b28d1834bb1f57fe6b60
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    Revert "gcj: use strict ecj version"
    
    This reverts commit 9ae34e8cc6facbc12a68f0042eb6e9e489d92528.

diff --git a/gnu/ada/BUILD b/gnu/ada/BUILD
index a4bfaa8..a03ca31 100755
--- a/gnu/ada/BUILD
+++ b/gnu/ada/BUILD
@@ -6,24 +6,8 @@ persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
 persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
 
 # setup bootstrap ada compiler
-ADA_PATH=${SOURCE3/.tar.bz2/}                   &&
-PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH  &&
-
-if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
-  OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi  &&
-
-export          CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gnatgcc"                      &&
-export INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.0/include"  &&
-export     LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.0/"         &&
-export     LDFLAGS="-L${LIB_DIR}"
-
-export    LIBRARY_PATH="$LIB_DIR"                             &&
-export LD_LIBRARY_PATH="$LIB_DIR"                             &&
-export   COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin"  &&
-
-export ADA_OBJECTS_PATH="$LIB_DIR/adalib"      &&
-export ADA_INCLUDE_PATH="$LIB_DIR/adainclude"  &&
+ADA_PATH=gnat-4.1.1-i386-pc-linux-gnu       &&
+PATH=$SOURCE_DIRECTORY/$ADA_PATH/bin:$PATH  &&
 
 cd $SOURCE_DIRECTORY.bld                                   &&
 $SOURCE_DIRECTORY/configure                                \
@@ -33,11 +17,9 @@ $SOURCE_DIRECTORY/configure                                \
              --mandir=${INSTALL_ROOT}/usr/share/man        \
              --enable-threads=posix                        \
              --with-system-zlib                            \
-             --program-prefix=gnat                         \
-             --enable-libada                               \
-             --enable-languages="ada"                      \
+             --enable-languages=ada                        \
              $GCC_MULTILIB                                 \
              $OPTS                                         &&
 
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"  \
-     bootstrap
+make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+     profiledbootstrap
diff --git a/gnu/ada/DEPENDS b/gnu/ada/DEPENDS
index a1d2c84..d1fddf2 100755
--- a/gnu/ada/DEPENDS
+++ b/gnu/ada/DEPENDS
@@ -3,7 +3,5 @@ depends  gcc  &&
 if  [[  $VERSION != $(installed_version gcc) ]]; then
   force_depends  gcc
 fi &&
+depends smgl-archspecs
 
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index c77f894..6253b94 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,35 +1,30 @@
            SPELL=ada
-         VERSION=4.3.1
+         VERSION=4.2.3
           SOURCE=gcc-core-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
    SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
    SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
          SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
-     SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
   SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
   SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-if    [[  "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
-         SOURCE3=gnat-4.3.0-i686-pc-linux-gnu.tar.bz2
-elif  [[  "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
-then
-         SOURCE3=gnat-4.3.0-x86_64-pc-linux-gnu.tar.bz2
-else
-         SOURCE3=gnat-4.3.0-i686-pc-linux-gnu.tar.bz2
-fi
-     SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:VERIFIED_UPSTREAM_KEY"
+         SOURCE3=gnat-4.1.1-i386-pc-linux-gnu.tar.bz2
+     SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:UPSTREAM_KEY
   SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3
-         SOURCE4=$SOURCE3.sig
-  SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
-  SOURCE4_IGNORE=signature
+
 #upstream signatures
-         SOURCE5=$SOURCE.sig
-  SOURCE5_URL[0]=${SOURCE_URL[0]}.sig
+         SOURCE4=$SOURCE.sig
+  SOURCE4_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE4_IGNORE=signature
+         SOURCE5=$SOURCE2.sig
+  SOURCE5_URL[0]=${SOURCE2_URL[0]}.sig
+      SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
   SOURCE5_IGNORE=signature
-         SOURCE6=$SOURCE2.sig
-  SOURCE6_URL[0]=${SOURCE2_URL[0]}.sig
-  SOURCE6_IGNORE=signature
+#         SOURCE6=$SOURCE3.sig
+#  SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
+#     SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
+#  SOURCE6_IGNORE=signature
+
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20050213
@@ -39,3 +34,4 @@ fi
 cat << EOF
 The GNU Ada Translator and Ada95 runtime library.
 EOF
+
diff --git a/gnu/ada/FINAL b/gnu/ada/FINAL
index 907a1a0..14a9914 100755
--- a/gnu/ada/FINAL
+++ b/gnu/ada/FINAL
@@ -1 +1,3 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld
+rm_source_dir  $SOURCE_DIRECTORY.bld                       &&
+local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
+cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index 3130382..5dc7151 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,58 +1,3 @@
-2008-06-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 4.3.1
-
-2008-04-06 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated bootstrap to gnat 4.3.0
-	  x86 bootstrap is now built as i686 instead of i386
-	  Added x86_64 gnat bootstrap.
-	  gnat bootstraps are just the ARCHIVE version of ada built using
-	  the prior bootstrap.
-	  SOURCE3 is provided by us and signed by us, so use
-	  VERIFIED_UPSTREAM_KEY :)
-	* PRE_BUILD: New bootstraps have different directory structure, modify
-	  unpack accordingly.
-	  Added code for future bootstrap generation to avoid extra research:
-	* BUILD: profiledbootstrap fails (for now), use regular bootstrap. See
-	  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32581
-	  Ada 4.3.0 is retarded and now requires extra environment settings,
-	  borrowed from Gentoo's gnatbuild_src_compile() from
-	  http://kambing.ui.edu/gentoo-portage/eclass/gnatbuild.eclass
-	  New bootstraps use a different directory structure, modify ADA_PATH
-	  accordingly.
-	  Need to pass --enable-libada to ensure ada libraries are built
-	  Use --program-prefix=gnat to install gnatgcc instead of gnat when
-	  building bootstrap.
-	* INSTALL: Install all files (including gnatgcc, required)
-	  No longer install specs_ada
-	* FINAL: Do not combine Ada specs with the rest of the system's as
-	  it screws up gcc (at least) and packages (e.g. ncurses and gtkada)
-	  compile fine with Ada without it.
-	* POST_REMOVE, POST_RESURRECT: No longer install specs_ada
-	* specs_ada: Removed, seems to be unused
-	* Bootstrap generation notes:
-	  Modify BUILD to use '--enable-language="c,ada"'
-	    NOTE: (c may not be needed, but it worked so I used that)
-	  Compile ada
-	  Unmodify BUILD
-	  Rename cache tarball to gnat-$VERSION-$HOST.tar.bz2
-	  Clean out non-essential files from the cache such as:
-	    etc, var, usr/share/{doc,info,man}
-	  Sign gnat-$VERSION-$HOST.tar.bz2
-	  Set SOURCE3=gnat-$VERSION-$HOST.tar.bz2
-	  Upload to some public site and set SOURCE3_URL[0]
-	  Test ada with your new bootstrap
-
-2008-03-15 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.3.0
-	  NOTE: Need to update SOURCE3 (gnat-4.1.1) for this to work on x86
-	  and need to create other pre-built gnat's for other architectures
-	* DEPENDS: Depends on gmp and mpfr
-	* BUILD: Pass --build=x86_64-pc-linux-gnu for x86_64, only way I found
-	  to get around this warning:
-	  configure: WARNING: If you wanted to set the --build type, don't use
-	  --host. If a cross compiler is detected then cross compile mode will
-	  be used.
-
 2008-02-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.2.3
 
diff --git a/gnu/ada/INSTALL b/gnu/ada/INSTALL
index 32b9891..c09db49 100755
--- a/gnu/ada/INSTALL
+++ b/gnu/ada/INSTALL
@@ -3,5 +3,10 @@
 #
 cd  $SOURCE_DIRECTORY.bld  &&
 
-make -C gcc install lang.install-common lang.install-man  &&
-install -c gcc/gnat1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/
+make -C gcc lang.install-common lang.install-man  &&
+install -c gcc/gnat1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
+
+# specs file stuff
+local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
+mkdir -p $SPECSDIR/specs-local                             &&
+cp $SCRIPT_DIRECTORY/specs_ada $SPECSDIR/specs-local
diff --git a/gnu/ada/POST_REMOVE b/gnu/ada/POST_REMOVE
new file mode 100755
index 0000000..2ab4140
--- /dev/null
+++ b/gnu/ada/POST_REMOVE
@@ -0,0 +1,2 @@
+local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
+cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/ada/POST_RESURRECT b/gnu/ada/POST_RESURRECT
new file mode 100755
index 0000000..b6c4867
--- /dev/null
+++ b/gnu/ada/POST_RESURRECT
@@ -0,0 +1,2 @@
+local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
+cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/ada/PRE_BUILD b/gnu/ada/PRE_BUILD
index 55467be..db044fd 100755
--- a/gnu/ada/PRE_BUILD
+++ b/gnu/ada/PRE_BUILD
@@ -3,35 +3,9 @@ if [ "$(installed_version gcc)" != "$VERSION" ]; then
   message "Update gcc first.${DEFAULT_COLOR}"
   return 1;
 fi
-
-default_pre_build                     &&
-cd $BUILD_DIRECTORY                   &&
-unpack_file 2                         &&
-cd $SOURCE_DIRECTORY                  &&
-mkdir ${SOURCE3/.tar.bz2/}            &&
-cd  ${SOURCE3/.tar.bz2/}              &&
-unpack_file 3                         &&
-mk_source_dir  $SOURCE_DIRECTORY.bld  &&
-
-#
-# This section is used to build a gnat bootstrap cache
-#
-touch  $SOURCE_DIRECTORY/gcc/cstamp-h.in       &&
-touch  $SOURCE_DIRECTORY/gcc/ada/[es]info.h    &&
-touch  $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs]  &&
-
-#
-# Set the compiler name to gnatgcc
-#
-for file in `find $SOURCE_DIRECTORY/gcc/ada/ -name '*.ad[sb]'`
-do
-  sedit "s:\"gcc\":\"gnatgcc\":g" $file
-done  &&
-
-sedit 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):'    \
-       $SOURCE_DIRECTORY/gcc/ada/makegpr.adb      &&
-sedit 's:and Nam is "gnatgcc":and Nam is "gcc":'  \
-       $SOURCE_DIRECTORY/gcc/ada/osint.ads
-#
-# End Ada bootstrap cache code
-#
+default_pre_build                &&
+cd $BUILD_DIRECTORY              &&
+unpack_file 2                    &&
+cd $SOURCE_DIRECTORY             &&
+unpack_file 3                    &&
+mk_source_dir  $SOURCE_DIRECTORY.bld
diff --git a/gnu/ada/gnat-4.1.1-i386-pc-linux-gnu.tar.bz2.sig b/gnu/ada/gnat-4.1.1-i386-pc-linux-gnu.tar.bz2.sig
new file mode 100644
index 0000000..4d97909
Binary files /dev/null and b/gnu/ada/gnat-4.1.1-i386-pc-linux-gnu.tar.bz2.sig differ
diff --git a/gnu/ada/specs_ada b/gnu/ada/specs_ada
new file mode 100644
index 0000000..a0d4c66
--- /dev/null
+++ b/gnu/ada/specs_ada
@@ -0,0 +1,9 @@
+ at ada:
+%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %{!S:%{!c:%e-c or -S required for Ada}} gnat1 %{I*} %{k8:-gnatk8} %{w:-gnatws} %{!Q:-quiet} %{nostdinc*} %{nostdlib*} -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}} %{O*} %{W*} %{w} %{p} %{pg:-p} %{a} %{f*} %{d*} %{g*&m*} %1 %{!S:%{o*:%w%*-gnatO}} %i %{S:%W{o*}%{!o*:-o %b.s}} %{gnatc*|gnats*: -o %j} %{-param*} %{!gnatc*:%{!gnats*:%(invoke_as)}}
+
+.ads:
+ at ada
+
+.adb:
+ at ada
+
diff --git a/gnu/fortran/BUILD b/gnu/fortran/BUILD
index 7f2e92d..853d368 100755
--- a/gnu/fortran/BUILD
+++ b/gnu/fortran/BUILD
@@ -7,10 +7,6 @@ persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
 
 sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
 
-if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
-  OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi  &&
-
 cd $SOURCE_DIRECTORY.bld                                   &&
 $SOURCE_DIRECTORY/configure                                \
              --host=$HOST                                  \
diff --git a/gnu/fortran/DEPENDS b/gnu/fortran/DEPENDS
index ef57546..96a5b3f 100755
--- a/gnu/fortran/DEPENDS
+++ b/gnu/fortran/DEPENDS
@@ -1,9 +1,7 @@
 . $GRIMOIRE/libcompat  &&
-depends  gcc   &&
+depends  gcc  &&
 if  [[  $VERSION != $(installed_version gcc) ]]; then
   force_depends  gcc
 fi  &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends  mpfr &&
+depends smgl-archspecs
diff --git a/gnu/fortran/DETAILS b/gnu/fortran/DETAILS
index ec2459e..09d59a2 100755
--- a/gnu/fortran/DETAILS
+++ b/gnu/fortran/DETAILS
@@ -1,5 +1,5 @@
            SPELL=fortran
-         VERSION=4.3.1
+         VERSION=4.2.3
           SOURCE=gcc-core-$VERSION.tar.bz2
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
diff --git a/gnu/fortran/HISTORY b/gnu/fortran/HISTORY
index 9e9d694..4e65e85 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -1,15 +1,3 @@
-2008-06-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 4.3.1
-
-2008-03-15 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.3.0
-	* DEPENDS: Depends on gmp
-	* BUILD: Pass --build=x86_64-pc-linux-gnu for x86_64, only way I found
-	  to get around this warning:
-	  configure: WARNING: If you wanted to set the --build type, don't use
-	  --host. If a cross compiler is detected then cross compile mode will
-	  be used.
-
 2008-02-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.2.3
 
diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index 9c98589..993e5f8 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -11,10 +11,6 @@ if  [[  "$ARCHITECTURE"  ==  "pentium4"  ||
   CXXFLAGS=${CXXFLAGS//-ffast-math/}
 fi  &&
 
-if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
-  OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi  &&
-
 sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
 
 if [[ "$GCC_NOLIB64" == 'y' ]]; then
diff --git a/gnu/g++/DEPENDS b/gnu/g++/DEPENDS
index 4db4f86..54c9f28 100755
--- a/gnu/g++/DEPENDS
+++ b/gnu/g++/DEPENDS
@@ -3,7 +3,5 @@ depends  gcc    &&
 if  [[  $VERSION != $(installed_version gcc) ]]; then
   force_depends  gcc
 fi  &&
-depends  gmp             &&
-depends  gnupg           &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends  gnupg &&
+depends smgl-archspecs
diff --git a/gnu/g++/DETAILS b/gnu/g++/DETAILS
index 344a9de..8b096f4 100755
--- a/gnu/g++/DETAILS
+++ b/gnu/g++/DETAILS
@@ -1,5 +1,5 @@
            SPELL=g++
-         VERSION=4.3.1
+         VERSION=4.2.3
           SOURCE=gcc-core-$VERSION.tar.bz2
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index feb934f..c6f97d8 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,15 +1,3 @@
-2008-06-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 4.3.1
-
-2008-03-15 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.3.0
-	* DEPENDS: Depends on gmp and mpfr
-	* BUILD: Pass --build=x86_64-pc-linux-gnu for x86_64, only way I found
-	  to get around this warning:
-	  configure: WARNING: If you wanted to set the --build type, don't use
-	  --host. If a cross compiler is detected then cross compile mode will
-	  be used.
-
 2008-02-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.2.3
 
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 1740b97..ad3d9c7 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -11,10 +11,6 @@ if  [[ "$ARCHITECTURE"  ==  "pentium4"  ||
   CXXFLAGS=${CXXFLAGS//-ffast-math/}
 fi  &&
 
-if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
-  OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi  &&
-
 # store CFLAGS and LDFLAGS persistently so they can be read by the other
 # split spells later, see bug #10087
 GCC_CFLAGS="$CFLAGS"                   &&
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 6ad4823..5087443 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -1,14 +1,4 @@
-. $GRIMOIRE/libcompat  &&
-
-depends  diffutils       &&
-depends  gmp             &&
-depends  gnupg           &&
-depends  mpfr            &&
-
-if  [[ "$(installed_version mpfr|sed 's:\.::g')" < 230 ]]
-then
-  force_depends  mpfr
-fi  &&
-
-depends  smgl-fhs        &&
-depends  smgl-archspecs
+depends  diffutils &&
+depends  gnupg     &&
+depends  smgl-fhs &&
+depends smgl-archspecs
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 4de48e8..bf101a5 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gcc
-         VERSION=4.3.1
+         VERSION=4.2.3
           SOURCE=gcc-core-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
@@ -10,10 +10,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
   SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
-        KEYWORDS="compiler"
          ENTERED=20040420
-           SHORT="the GNU C compiler"
             DOCS="$DOCS INSTALL"
+      PATCHLEVEL=1
+        KEYWORDS="compiler"
+           SHORT="the GNU C compiler"
 cat << EOF
 The GNU C compiler and the core of the GNU compiler collection.
 EOF
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index d180d8a..151884d 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,22 +1,3 @@
-2008-06-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 4.3.1
-
-2008-03-26 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Reset PATCHLEVEL=0 (removed PATCHLEVEL)
-	* DEPENDS: GCC requires mpfr 2.3.0 or newer to work, so force mpfr
-	  being built if it is not >= 2.3.0
-
-2008-03-15 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.3.0
-	* DEPENDS: Depends on gmp and mpfr
-	* PRE_BUILD: Use gcc-$VERSION-ffast-math.patch to keep up. :)
-	* BUILD: Pass --build=x86_64-pc-linux-gnu for x86_64, only way I found
-	  to get around this warning:
-	  configure: WARNING: If you wanted to set the --build type, don't use
-	  --host. If a cross compiler is detected then cross compile mode will
-	  be used.
-	* gcc-4.3.0-ffast-math.patch: Updated gcc-4.2.3-ffast-math.patch
-
 2008-02-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.2.3
 	* PRE_BUILD: gcc-4.1.1-ffast-math.patch -> gcc-4.2.3-ffast-math.patch
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 5e3907d..be70a58 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -6,5 +6,4 @@ cd  $SOURCE_DIRECTORY                 &&
 sedit  's/^-include/#\0/'  libcpp/Makefile.in &&
 
 #apply the GCC 4.1.1 fast-math fix
-#patch -p1 < $SPELL_DIRECTORY/gcc-$VERSION-ffast-math.patch
-patch -p1 < $SPELL_DIRECTORY/gcc-4.3.0-ffast-math.patch
+patch -p1 < $SPELL_DIRECTORY/gcc-4.2.3-ffast-math.patch
diff --git a/gnu/gcc/gcc-4.2.3-ffast-math.patch b/gnu/gcc/gcc-4.2.3-ffast-math.patch
new file mode 100644
index 0000000..c6601f6
--- /dev/null
+++ b/gnu/gcc/gcc-4.2.3-ffast-math.patch
@@ -0,0 +1,50 @@
+diff -Naur gcc-4.2.3.orig/gcc/config/i386/crtfastmath.c gcc-4.2.3/gcc/config/i386/crtfastmath.c
+--- gcc-4.2.3.orig/gcc/config/i386/crtfastmath.c	2008-02-05 11:26:52.724719808 -0800
++++ gcc-4.2.3/gcc/config/i386/crtfastmath.c	2008-02-05 11:27:16.337719080 -0800
+@@ -37,6 +37,23 @@
+ #define FXSAVE	(1 << 24)
+ #define SSE	(1 << 25)
+ 
++struct
++{
++	unsigned short int cwd;
++	unsigned short int swd;
++	unsigned short int twd;
++	unsigned short int fop;
++	long int fip;
++	long int fcs;
++	long int foo;
++	long int fos;
++	long int mxcsr;
++	long int mxcsr_mask;
++	long int st_space[32];
++	long int xmm_space[32];
++	long int padding[56];
++} __attribute__ ((aligned (16))) fxsave;
++
+ static void __attribute__((constructor))
+ #ifndef __x86_64__
+ /* The i386 ABI only requires 4-byte stack alignment, so this is necessary
+@@ -81,22 +98,6 @@
+       if (edx & FXSAVE)
+ 	{
+ 	  /* Check if DAZ is available.  */
+-	  struct
+-	    {
+-	      unsigned short int cwd;
+-	      unsigned short int swd;
+-	      unsigned short int twd;
+-	      unsigned short int fop;
+-	      long int fip;
+-	      long int fcs;
+-	      long int foo;
+-	      long int fos;
+-	      long int mxcsr;
+-	      long int mxcsr_mask;
+-	      long int st_space[32];
+-	      long int xmm_space[32];
+-	      long int padding[56];
+-	    } __attribute__ ((aligned (16))) fxsave;
+ 
+ 	  __builtin_memset (&fxsave, 0, sizeof (fxsave));
+ 
diff --git a/gnu/gcc/gcc-4.3.0-ffast-math.patch b/gnu/gcc/gcc-4.3.0-ffast-math.patch
deleted file mode 100644
index 747787e..0000000
--- a/gnu/gcc/gcc-4.3.0-ffast-math.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur gcc-4.3.0.orig/gcc/config/i386/crtfastmath.c gcc-4.3.0/gcc/config/i386/crtfastmath.c
---- gcc-4.3.0.orig/gcc/config/i386/crtfastmath.c	2008-03-15 19:59:26.925738030 -0700
-+++ gcc-4.3.0/gcc/config/i386/crtfastmath.c	2008-03-15 19:59:32.823482534 -0700
-@@ -40,6 +40,23 @@
- #include "cpuid.h"
- #endif
- 
-+struct
-+{
-+	unsigned short int cwd;
-+	unsigned short int swd;
-+	unsigned short int twd;
-+	unsigned short int fop;
-+	long int fip;
-+	long int fcs;
-+	long int foo;
-+	long int fos;
-+	long int mxcsr;
-+	long int mxcsr_mask;
-+	long int st_space[32];
-+	long int xmm_space[32];
-+	long int padding[56];
-+} __attribute__ ((aligned (16))) fxsave;
-+
- static void __attribute__((constructor))
- #ifndef __x86_64__
- /* The i386 ABI only requires 4-byte stack alignment, so this is necessary
-@@ -64,22 +81,6 @@
-       if (edx & bit_FXSAVE)
- 	{
- 	  /* Check if DAZ is available.  */
--	  struct
--	    {
--	      unsigned short int cwd;
--	      unsigned short int swd;
--	      unsigned short int twd;
--	      unsigned short int fop;
--	      long int fip;
--	      long int fcs;
--	      long int foo;
--	      long int fos;
--	      long int mxcsr;
--	      long int mxcsr_mask;
--	      long int st_space[32];
--	      long int xmm_space[32];
--	      long int padding[56];
--	    } __attribute__ ((aligned (16))) fxsave;
- 
- 	  __builtin_memset (&fxsave, 0, sizeof (fxsave));
- 
diff --git a/gnu/gcj/BUILD b/gnu/gcj/BUILD
index 8f31479..47642db 100755
--- a/gnu/gcj/BUILD
+++ b/gnu/gcj/BUILD
@@ -6,13 +6,9 @@ persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
 persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
 
 # when updating this spell please check if this is still necessary:
-if [[ $GCJ_AWT == y ]]; then
-  CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
-fi &&
-
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
-  OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi &&
+if [ "$GCJ_AWT" = "y" ]; then
+	CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
+fi                                                         &&
 
 sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
 
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index d1211a1..f4f2486 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -1,21 +1,12 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc           &&
-
-if [[ $GCJ_AWT == y ]]; then
-  depends  gtk+2 '--enable-java-awt=gtk'  &&
-  depends  libart_lgpl                    &&
-  . $GRIMOIRE/FUNCTIONS                   &&
-  if  check_if_xorg_modular_libs gtk+2;  then
-    depends  libxtst
-  fi
-fi  &&
-
-if [[ $VERSION != $(installed_version gcc) ]]; then
-  force_depends gcc
+. $GRIMOIRE/libcompat                                               &&
+depends  gcc                                                        &&
+if [ "$GCJ_AWT" = "y" ]; then
+	depends gtk+2 '--enable-java-awt=gtk'                       &&
+	depends libart_lgpl
+fi                                                                  &&
+if  [[  $VERSION != $(installed_version gcc) ]]; then
+  force_depends  gcc
 fi &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs  &&
-depends  unzip           &&
-depends  zip
+depends smgl-archspecs &&
+depends unzip &&
+depends zip
diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS
index c8c9f8d..f571d37 100755
--- a/gnu/gcj/DETAILS
+++ b/gnu/gcj/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gcj
-         VERSION=4.3.1
+         VERSION=4.2.3
           SOURCE=gcc-core-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
    SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
   SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
   SOURCE3_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
 
-# upstream signatures
+#upstream signatures
          SOURCE4=$SOURCE.sig
   SOURCE4_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
@@ -24,19 +24,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
   SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
      SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
   SOURCE6_IGNORE=signature
-
-# Eclipse compiler for Java (needed since 4.3)
-         SOURCE7=ecj-4.3.jar
-  SOURCE7_URL[0]=ftp://sourceware.org/pub/java/$SOURCE7
-     SOURCE7_GPG=gurus.gpg:$SOURCE7.sig
-
       LICENSE[0]=GPL
-        WEB_SITE=http://gcc.gnu.org/java/
+        WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040705
            TMPFS=off
             DOCS="$DOCS INSTALL"
         KEYWORDS="compiler java"
-           SHORT="GNU compiler for Java"
+           SHORT="the GNU java compiler"
 cat << EOF
 The GNU java compiler and library.
 EOF
+
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index d0cec82..550249d 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,30 +1,3 @@
-2008-07-07 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: use strict ecj version
-
-2008-06-14 Vlad Glagolev <stealth at sourcemage.org>
-	* BUILD, DEPENDS: a bit more bashismization
-	* DETAILS: added Eclipse compiler for Java (jar file, needed since 4.3)
-	* PRE_BUILD: move ECJ jar file into source tree, libjava conf will take
-	  care about it, added missing `&&', cleaned up, add a bit more bashism
-	* INSTALL: fixed multijob build, $SPELL > $SCRIPT, `install' > `cp'
-	* specs_java: renewed specs for Java (from lang-specs.h)
-
-2008-06-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 4.3.1
-
-2008-04-13 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: AWT support depends on libxtst if using xorg-modular
-	  Bug #13975
-
-2008-03-15 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.3.0
-	* DEPENDS: Depends on gmp and mpfr
-	* BUILD: Pass --build=x86_64-pc-linux-gnu for x86_64, only way I found
-	  to get around this warning:
-	  configure: WARNING: If you wanted to set the --build type, don't use
-	  --host. If a cross compiler is detected then cross compile mode will
-	  be used.
-
 2008-02-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.2.3
 
@@ -119,3 +92,4 @@
 	* BUILD, DETAILS, FINAL, HISTORY, INSTALL, POST_REMOVE, PRE_BUILD,
 	  SOLO, specs_java:
 	  new spell for the GNU java compiler and library
+
diff --git a/gnu/gcj/INSTALL b/gnu/gcj/INSTALL
index f66edaf..a592fcd 100755
--- a/gnu/gcj/INSTALL
+++ b/gnu/gcj/INSTALL
@@ -3,13 +3,12 @@
 #
 cd  $SOURCE_DIRECTORY.bld  &&
 
-make_single  &&
 make -C gcc java.install-common java.install-man  &&
-install -c gcc/jc1       ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION  &&
-install -c gcc/jvgenmain ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION  &&
-make -C $HOST/libjava install  &&
-make_normal  &&
+install -c gcc/jc1       ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
+install -c gcc/jvgenmain ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
+make -C $HOST/libjava/ install  &&
 
 # specs file stuff
 local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-install $SPELL_DIRECTORY/specs_java $SPECSDIR/specs-local
+mkdir -p $SPECSDIR/specs-local                             &&
+cp $SCRIPT_DIRECTORY/specs_java $SPECSDIR/specs-local
diff --git a/gnu/gcj/PRE_BUILD b/gnu/gcj/PRE_BUILD
index 63a4b87..8aee4f3 100755
--- a/gnu/gcj/PRE_BUILD
+++ b/gnu/gcj/PRE_BUILD
@@ -1,16 +1,10 @@
-if [[ $(installed_version gcc) != $VERSION ]]; then
+if [ "$(installed_version gcc)" != "$VERSION" ]; then
   message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version gcc), not $VERSION!"
   message "Update gcc first.${DEFAULT_COLOR}"
   return 1;
-fi &&
-
-default_pre_build &&
-cd $BUILD_DIRECTORY &&
-
-unpack_file 2 &&
-unpack_file 3 &&
-verify_file 7 &&
-
-cp -v $SOURCE_CACHE/$SOURCE7 $SOURCE_DIRECTORY/ecj.jar &&
-
-mk_source_dir $SOURCE_DIRECTORY.bld
+fi
+default_pre_build                &&
+cd $BUILD_DIRECTORY              &&
+unpack_file 2                    &&
+unpack_file 3                    &&
+mk_source_dir  $SOURCE_DIRECTORY.bld
diff --git a/gnu/gcj/ecj-4.3.jar.sig b/gnu/gcj/ecj-4.3.jar.sig
deleted file mode 100644
index b26563d..0000000
Binary files a/gnu/gcj/ecj-4.3.jar.sig and /dev/null differ
diff --git a/gnu/gcj/specs_java b/gnu/gcj/specs_java
index 4f0dd3d..1b3f493 100644
--- a/gnu/gcj/specs_java
+++ b/gnu/gcj/specs_java
@@ -1,7 +1,5 @@
 @java:
-%{fjni:%{femit-class-files:%e-fjni and -femit-class-files are incompatible}} %{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}} %{femit-class-file:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{femit-class-files:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{E:%{e-E is not valid for gcj}} \
-  %{.java|fsaw-java-file:ecj1 %i %{W*} %{w} %{g*} %{fbootclasspath*} %{fenable-assertions*} %{fdisable-assertions*} %{fencoding*} %{ffilelist-file} %{foutput-class-dir*} %{g*} %{fsource*} %{!fsource*:-fsource=1.5} %{ftarget*} %{!femit-class-files|!ftarget*:-ftarget=1.5} %{!findirect-dispatch:-fzip-dependency %U.zip} %{!fsyntax-only:-fzip-target %U.jar}}
-%{.class|.zip|.jar|!fsyntax-only:jc1 %{.java|fsaw-java-file:%U.jar -fsource-filename=%i %<ffilelist-file} %{.class|.zip|.jar|ffilelist-file|fcompile-resource*:%i} %(jc1) %(cc1_options) %{I*} %{!findirect-dispatch:-faux-classpath %U.zip} %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*} %(invoke_as)}
+%{fjni:%{femit-class-files:%e-fjni and -femit-class-files are incompatible}} %{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}} %{femit-class-file:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{femit-class-files:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{!E:jc1 %i %(jc1) %(cc1_options) %{+e*} %{I*} %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*} %{!fsyntax-only:%(invoke_as)}}
 
 .java:
 @java
diff --git a/gnu/objc/BUILD b/gnu/objc/BUILD
index db4e8ca..b06e6cd 100755
--- a/gnu/objc/BUILD
+++ b/gnu/objc/BUILD
@@ -7,10 +7,6 @@ persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
 
 sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
 
-if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
-  OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi  &&
-
 cd $SOURCE_DIRECTORY.bld                                   &&
 $SOURCE_DIRECTORY/configure                                \
              --host=$HOST                                  \
diff --git a/gnu/objc/DEPENDS b/gnu/objc/DEPENDS
index a1d2c84..4d76156 100755
--- a/gnu/objc/DEPENDS
+++ b/gnu/objc/DEPENDS
@@ -3,7 +3,4 @@ depends  gcc  &&
 if  [[  $VERSION != $(installed_version gcc) ]]; then
   force_depends  gcc
 fi &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends smgl-archspecs
diff --git a/gnu/objc/DETAILS b/gnu/objc/DETAILS
index 0c7e6df..737ffd7 100755
--- a/gnu/objc/DETAILS
+++ b/gnu/objc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=objc
-         VERSION=4.3.1
+         VERSION=4.2.3
           SOURCE=gcc-core-$VERSION.tar.bz2
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
          SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
diff --git a/gnu/objc/HISTORY b/gnu/objc/HISTORY
index 207499f..6cf9ab5 100644
--- a/gnu/objc/HISTORY
+++ b/gnu/objc/HISTORY
@@ -1,15 +1,3 @@
-2008-06-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 4.3.1
-
-2008-03-15 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.3.0
-	* DEPENDS: Depends on gmp and mpfr
-	* BUILD: Pass --build=x86_64-pc-linux-gnu for x86_64, only way I found
-	  to get around this warning:
-	  configure: WARNING: If you wanted to set the --build type, don't use
-	  --host. If a cross compiler is detected then cross compile mode will
-	  be used.
-
 2008-02-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.2.3
 



More information about the SM-Commit mailing list