summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2007-05-18 10:41:36 +0200
committerJaka Kranjc2007-05-18 10:41:36 +0200
commitd87f9ed884bdab41dcdca353dff44dde22fc8e38 (patch)
tree2b27e3e8f506a58c3692d3b355a802f0c213c930
parent359a1218936a049bfa3d678783d013dfc846ea56 (diff)
sync gnu from test (left gcc-cvs)
-rw-r--r--gnu/MAINTAINER1
-rwxr-xr-xgnu/ada/DEPENDS4
-rwxr-xr-xgnu/ada/DETAILS20
-rw-r--r--gnu/ada/HISTORY23
-rwxr-xr-xgnu/ada/INSTALL5
-rwxr-xr-xgnu/ada/PROVIDES2
-rw-r--r--gnu/ada/gcc-ada-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnu/ada/gcc-core-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rwxr-xr-xgnu/fortran/CONFLICTS1
-rwxr-xr-xgnu/fortran/DEPENDS3
-rwxr-xr-xgnu/fortran/DETAILS17
-rw-r--r--gnu/fortran/HISTORY23
-rwxr-xr-xgnu/fortran/INSTALL5
-rw-r--r--gnu/fortran/gcc-core-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnu/fortran/gcc-fortran-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rwxr-xr-xgnu/g++/BUILD5
-rwxr-xr-xgnu/g++/DEPENDS3
-rwxr-xr-xgnu/g++/DETAILS17
-rw-r--r--gnu/g++/HISTORY30
-rwxr-xr-xgnu/g++/INSTALL5
-rw-r--r--gnu/g++/gcc-core-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnu/g++/gcc-g++-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rwxr-xr-xgnu/g77/BUILD1
-rwxr-xr-xgnu/g77/CONFLICTS1
-rwxr-xr-xgnu/g77/DEPENDS1
-rwxr-xr-xgnu/g77/DETAILS22
-rw-r--r--gnu/g77/HISTORY21
-rwxr-xr-xgnu/g77/INSTALL1
-rwxr-xr-xgnu/g77/PRE_BUILD1
-rwxr-xr-xgnu/g77/TRIGGERS1
-rwxr-xr-xgnu/gcc/BUILD6
-rwxr-xr-xgnu/gcc/DEPENDS4
-rwxr-xr-xgnu/gcc/DETAILS11
-rw-r--r--gnu/gcc/HISTORY50
-rwxr-xr-xgnu/gcc/INSTALL7
-rwxr-xr-xgnu/gcc/PRE_BUILD5
-rw-r--r--gnu/gcc/gcc-4.1.1-ffast-math.patch51
-rw-r--r--gnu/gcc/gcc-core-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rwxr-xr-xgnu/gcc33/DEPENDS1
-rw-r--r--gnu/gcc33/HISTORY18
-rwxr-xr-xgnu/gcc33/INSTALL5
-rwxr-xr-xgnu/gcc34/DEPENDS3
-rw-r--r--gnu/gcc34/HISTORY24
-rwxr-xr-xgnu/gcc34/INSTALL5
-rwxr-xr-xgnu/gcj/BUILD5
-rwxr-xr-xgnu/gcj/DEPENDS11
-rwxr-xr-xgnu/gcj/DETAILS20
-rw-r--r--gnu/gcj/HISTORY24
-rwxr-xr-xgnu/gcj/INSTALL5
-rwxr-xr-xgnu/gcj/PREPARE1
-rw-r--r--gnu/gcj/gcc-core-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnu/gcj/gcc-g++-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnu/gcj/gcc-java-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rwxr-xr-xgnu/objc/DEPENDS3
-rwxr-xr-xgnu/objc/DETAILS17
-rw-r--r--gnu/objc/HISTORY22
-rwxr-xr-xgnu/objc/INSTALL5
-rw-r--r--gnu/objc/gcc-core-4.1.1.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnu/objc/gcc-objc-4.1.1.tar.bz2.sigbin536 -> 0 bytes
59 files changed, 400 insertions, 116 deletions
diff --git a/gnu/MAINTAINER b/gnu/MAINTAINER
new file mode 100644
index 0000000000..73f6cfa64b
--- /dev/null
+++ b/gnu/MAINTAINER
@@ -0,0 +1 @@
+OPEN: Contact Arwed v. Merkatz <grimoire@sourcemage.org> if interested.
diff --git a/gnu/ada/DEPENDS b/gnu/ada/DEPENDS
index 6aa97c6122..d1fddf299b 100755
--- a/gnu/ada/DEPENDS
+++ b/gnu/ada/DEPENDS
@@ -2,4 +2,6 @@
depends gcc &&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
-fi
+fi &&
+depends smgl-archspecs
+
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index f31598cde6..021eb0310c 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,21 +1,33 @@
SPELL=ada
- VERSION=4.1.1
+ VERSION=4.1.2
SOURCE=gcc-core-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
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=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
SOURCE3=gnat-4.1.1-i386-pc-linux-gnu.tar.bz2
SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:UPSTREAM_HASH
SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3
+
+#upstream signatures
+ 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=$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
- UPDATED=20050213
DOCS="$DOCS INSTALL"
KEYWORDS="compiler"
SHORT="the GNU Ada Translator"
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index b1ea516e78..c0132705ed 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,3 +1,21 @@
+2007-02-14 Treeve Jelbert <treeve@oi.be>
+ * DETAILS: version 4.1.2
+ convert to upstream signatures
+
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
+2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
+ * PROVIDES: [automated] Fixed invalid entries.
+
2006-05-28 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS, BUILD: use our own bootstrapping binary instead of the
ancient gnat 3.15p one, since that one segfaults during bootstrap
@@ -8,11 +26,14 @@
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
+2006-03-10 David Brown <dmlb2000@gmail.com>
+ * DETAILS: updated to 4.0.3
+
2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: use force_depends gcc if version doesn't match so it gets
recompiled
-2006-03-01 Treeve Jelbert <treeve01@pi.be>
+2006-03-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.1.0
2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/ada/INSTALL b/gnu/ada/INSTALL
index c837a10751..c09db497f4 100755
--- a/gnu/ada/INSTALL
+++ b/gnu/ada/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
make -C gcc lang.install-common lang.install-man &&
install -c gcc/gnat1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ &&
diff --git a/gnu/ada/PROVIDES b/gnu/ada/PROVIDES
index 6a6f7ea897..1f29e92957 100755
--- a/gnu/ada/PROVIDES
+++ b/gnu/ada/PROVIDES
@@ -1 +1 @@
-provides GNAT
+GNAT
diff --git a/gnu/ada/gcc-ada-4.1.1.tar.bz2.sig b/gnu/ada/gcc-ada-4.1.1.tar.bz2.sig
deleted file mode 100644
index 191d52c5de..0000000000
--- a/gnu/ada/gcc-ada-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/ada/gcc-core-4.1.1.tar.bz2.sig b/gnu/ada/gcc-core-4.1.1.tar.bz2.sig
deleted file mode 100644
index d4f3e0ebfd..0000000000
--- a/gnu/ada/gcc-core-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/fortran/CONFLICTS b/gnu/fortran/CONFLICTS
deleted file mode 100755
index b0f55e585c..0000000000
--- a/gnu/fortran/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts g77 y
diff --git a/gnu/fortran/DEPENDS b/gnu/fortran/DEPENDS
index ca9a1809e8..96a5b3f89c 100755
--- a/gnu/fortran/DEPENDS
+++ b/gnu/fortran/DEPENDS
@@ -3,4 +3,5 @@ depends gcc &&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
fi &&
-depends mpfr
+depends mpfr &&
+depends smgl-archspecs
diff --git a/gnu/fortran/DETAILS b/gnu/fortran/DETAILS
index 88dcea9f1c..d05b128042 100755
--- a/gnu/fortran/DETAILS
+++ b/gnu/fortran/DETAILS
@@ -1,18 +1,27 @@
SPELL=fortran
- VERSION=4.1.1
+ VERSION=4.1.2
SOURCE=gcc-core-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
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=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+# SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
+
+#upstream signatures
+ SOURCE3=$SOURCE.sig
+ SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE3_IGNORE=signature
+ SOURCE4=$SOURCE2.sig
+ SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
+ SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
+ SOURCE4_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://gcc.gnu.org/
ENTERED=20040705
- UPDATED=20040705
DOCS="$DOCS INSTALL"
KEYWORDS="fortran compiler"
SHORT="the GNU fortran compiler"
diff --git a/gnu/fortran/HISTORY b/gnu/fortran/HISTORY
index 66251e814c..286c6a11d5 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -1,9 +1,30 @@
+2007-02-16 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * CONFLICTS: removed, deprecation complete
+
+2007-02-14 Treeve Jelbert <treeve@oi.be>
+ * DETAILS: version 4.1.2
+ convert to upstream signatures
+
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
+2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: updated to 4.1.1
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
+2006-03-10 David Brown <dmlb2000@gmail.com>
+ * DETAILS: updated 4.0.3
+
2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: use force_depends gcc if version doesn't match so it gets
recompiled
@@ -11,7 +32,7 @@
2006-03-03 Arwed v. Merkatz <v.merkatz@gmx.net>
* specs_fortran: updated for 4.1.0
-2006-03-01 Treeve Jelbert <treeve01@pi.be>
+2006-03-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.1.0
2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/fortran/INSTALL b/gnu/fortran/INSTALL
index 61ed0cab18..1b3a64f177 100755
--- a/gnu/fortran/INSTALL
+++ b/gnu/fortran/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
make -C gcc lang.install-common lang.install-man &&
install -c gcc/f951 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ &&
make -C $HOST/libgfortran/ install &&
diff --git a/gnu/fortran/gcc-core-4.1.1.tar.bz2.sig b/gnu/fortran/gcc-core-4.1.1.tar.bz2.sig
deleted file mode 100644
index 56189e538e..0000000000
--- a/gnu/fortran/gcc-core-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/fortran/gcc-fortran-4.1.1.tar.bz2.sig b/gnu/fortran/gcc-fortran-4.1.1.tar.bz2.sig
deleted file mode 100644
index 3e5e462197..0000000000
--- a/gnu/fortran/gcc-fortran-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index d1832f5335..993e5f87aa 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -6,6 +6,11 @@ persistent_read gcc GCC_NOLIB64 GCC_NOLIB64
persistent_read gcc GCC_CFLAGS CFLAGS &&
persistent_read gcc GCC_LDFLAGS LDFLAGS &&
+if [[ "$ARCHITECTURE" == "pentium4" ||
+ "$ARCHITECTURE" == "pentium-m" ]]; then
+ CXXFLAGS=${CXXFLAGS//-ffast-math/}
+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 2a9767a07e..54c9f28e58 100755
--- a/gnu/g++/DEPENDS
+++ b/gnu/g++/DEPENDS
@@ -3,4 +3,5 @@ depends gcc &&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
fi &&
-depends gnupg
+depends gnupg &&
+depends smgl-archspecs
diff --git a/gnu/g++/DETAILS b/gnu/g++/DETAILS
index d6ce5bcbeb..02c0accdee 100755
--- a/gnu/g++/DETAILS
+++ b/gnu/g++/DETAILS
@@ -1,18 +1,27 @@
SPELL=g++
- VERSION=4.1.1
+ VERSION=4.1.2
SOURCE=gcc-core-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
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=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+# SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
+
+#upstream signatures
+ SOURCE3=$SOURCE.sig
+ SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE3_IGNORE=signature
+ SOURCE4=$SOURCE2.sig
+ SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
+ SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
+ SOURCE4_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://gcc.gnu.org/
ENTERED=20040704
- UPDATED=20040707
DOCS="$DOCS INSTALL"
KEYWORDS="compiler"
SHORT="the GNU c++ compiler"
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index 9062900914..09e8b5c535 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,14 +1,36 @@
+2007-03-01 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD: -ffast-math also breaks with pentium-m
+
+2007-02-14 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.1.2
+ convert to upstream signatures
+
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
+2007-01-04 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD: At least on pentium4 architecture, compiling g++ with
+ -ffast-math will cause segfaults in C++ apps (e.g. firefox)
+
2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: updated to 4.1.1
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
+2006-03-10 David Brown <dmlb2000@gmail.com>
+ * DETAILS: updated 4.0.3
+
2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: use force_depends gcc if version doesn't match so it gets
recompiled
-2006-03-01 Treeve Jelbert <treeve01@pi.be>
+2006-03-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.1.0
2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
@@ -17,7 +39,7 @@
instead of sourcing gcc.p
* POST_RESURRECT: setup specs file after resurrection (bug #8726)
-2006-02-06 Eric Sandall <eric@sandall.us>
+2006-02-06 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on gnupg (for SOURCE verification)
2005-10-02 Sergey Lipnevich <sergey@sourcemage.org>
@@ -53,10 +75,10 @@
* CONFIGURE: inherit from gcc;
* BUILD: include option MULTILIB.
-2004-11-07 Treeve Jelbert <treeve01@pi.be>
+2004-11-07 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.4.3
-2004-09-08 Treeve Jelbert <treeve01@pi.be>
+2004-09-08 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.4.2
2004-07-27 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/g++/INSTALL b/gnu/g++/INSTALL
index da8d830061..9b93368842 100755
--- a/gnu/g++/INSTALL
+++ b/gnu/g++/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
make -C gcc lang.install-common lang.install-man &&
install -c gcc/cc1plus ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ &&
make -C $HOST/libstdc++-v3/ install &&
diff --git a/gnu/g++/gcc-core-4.1.1.tar.bz2.sig b/gnu/g++/gcc-core-4.1.1.tar.bz2.sig
deleted file mode 100644
index 1b4009e2db..0000000000
--- a/gnu/g++/gcc-core-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/g++/gcc-g++-4.1.1.tar.bz2.sig b/gnu/g++/gcc-g++-4.1.1.tar.bz2.sig
deleted file mode 100644
index 2739f6bec9..0000000000
--- a/gnu/g++/gcc-g++-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/g77/BUILD b/gnu/g77/BUILD
deleted file mode 100755
index 27ba77ddaf..0000000000
--- a/gnu/g77/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnu/g77/CONFLICTS b/gnu/g77/CONFLICTS
deleted file mode 100755
index e729d2b187..0000000000
--- a/gnu/g77/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts fortran
diff --git a/gnu/g77/DEPENDS b/gnu/g77/DEPENDS
deleted file mode 100755
index 78eeacfb64..0000000000
--- a/gnu/g77/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends fortran
diff --git a/gnu/g77/DETAILS b/gnu/g77/DETAILS
deleted file mode 100755
index 63529dba8a..0000000000
--- a/gnu/g77/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
- SPELL=g77
- VERSION=3.4.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
-# SOURCE_HASH=sha512:68b1b65bc1c4ddbd7e90d0e342dc1a24dde5d5f1736a13b7daf82b7239418078aba1f892ecadf899974c111e80eb6c6e0e60ee358dc393ba953d18d0630c83a0
-# SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
-# SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-# SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-# SOURCE2_HASH=sha512:0df54526412df65ea1ece9903bd4c033935436d79567183fb4d8a09ede4291997fa4dbc05c6e8cb2ac2cf6df64556f3dcf3e480fa2da6909a5b3e5be3cfb11b0
- LICENSE[0]=GPL
- WEB_SITE=http://gcc.gnu.org/
- ENTERED=20040705
- UPDATED=20050421
- DOCS="$DOCS INSTALL"
- KEYWORDS="fortran compiler"
- SHORT="the GNU fortran compiler"
-cat << EOF
-The GNU fortran compiler and runtime library.
-EOF
-
diff --git a/gnu/g77/HISTORY b/gnu/g77/HISTORY
deleted file mode 100644
index 68c162ca98..0000000000
--- a/gnu/g77/HISTORY
+++ /dev/null
@@ -1,21 +0,0 @@
-2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth@tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-04-21 Arwed v. Merkatz <v.merkatz@gmx.net>
- * ALL: deprecated spell, renamed to fortran
-
-2004-09-09 Arwed v. Merkatz <v.merkatz@gmx.net>
- * DETAILS: updated to 3.4.2
-
-2004-07-06 Arwed v. Merkatz <v.merkatz@gmx.net>
- * DEPENDS: added dependency on gcc so they're built in correct order
- on a system-update
-
-2004-07-05 Arwed v. Merkatz <v.merkatz@gmx.net>
- * BUILD, DETAILS, FINAL, HISTORY, INSTALL, POST_REMOVE, PRE_BUILD,
- SOLO, specs_g77:
- new spell for the GNU fortran compiler and library
-
diff --git a/gnu/g77/INSTALL b/gnu/g77/INSTALL
deleted file mode 100755
index 27ba77ddaf..0000000000
--- a/gnu/g77/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnu/g77/PRE_BUILD b/gnu/g77/PRE_BUILD
deleted file mode 100755
index 27ba77ddaf..0000000000
--- a/gnu/g77/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnu/g77/TRIGGERS b/gnu/g77/TRIGGERS
deleted file mode 100755
index 87d28d6cba..0000000000
--- a/gnu/g77/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast g77 dispel_self
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 7e02a2e750..ad3d9c784e 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -5,6 +5,12 @@ if [[ "$GCC_NOLIB64" == 'y' ]]; then
sedit "s/lib64/lib/" gcc/config/i386/t-linux64
fi &&
+if [[ "$ARCHITECTURE" == "pentium4" ||
+ "$ARCHITECTURE" == "pentium-m" ]]; then
+ CFLAGS=${CFLAGS//-ffast-math/}
+ CXXFLAGS=${CXXFLAGS//-ffast-math/}
+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 18594eb242..50874434e8 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -1,2 +1,4 @@
+depends diffutils &&
depends gnupg &&
-depends smgl-fhs
+depends smgl-fhs &&
+depends smgl-archspecs
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 3d67f16b50..b7bf8f15e5 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,17 +1,18 @@
SPELL=gcc
- VERSION=4.1.1
+ VERSION=4.1.2
SOURCE=gcc-core-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ SOURCE2=$SOURCE.sig
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_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+
LICENSE[0]=GPL
- BUILD_API=2
WEB_SITE=http://gcc.gnu.org/
ENTERED=20040420
- UPDATED=20040619
DOCS="$DOCS INSTALL"
- PATCHLEVEL=1
KEYWORDS="compiler"
SHORT="the GNU C compiler"
cat << EOF
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index f77d0d4a53..f8c650512c 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,38 @@
+2007-03-01 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD: -ffast-math also breaks with pentium-m
+
+2007-02-14 Treeve Jelbert <treeve01@oi.be>
+ * DETAILS: version 4.1.2
+ convert to upstream signatures
+
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
+2007-01-04 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD: At least on pentium4 architecture, compiling gcc with
+ -ffast-math in CFLAGS *or* CXXFLAGS will cause some (e.g. firefox)
+ C++ apps to segfault
+
+2006-12-28 David Kowis <dkowis@shlrm.org>
+ * PRE_BUILD: added a patch for a -ffast-math bug
+ * DETAILS: incremented PATCHLEVEL
+ * gcc-4.1.1-ffast-math.patch: added
+
+2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * INSTALL: use TRACK_ROOT when linking #9163
+
+2006-06-29 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+ Removed UPDATED
+
+2006-06-23 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * DEPENDS: added diffutils #8855
+
2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: updated to 4.1.1
@@ -14,6 +49,9 @@
* WIP: added, as install fails -
can't find a usable gcc as it tries to recompile libcpp
+2006-03-10 David Brown <dmlb2000@gmail.com>
+ * DETAILS: updated 4.0.3
+
2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
* BUILD, EXPORTS: store CFLAGS and LDFLAGS as GCC_*
persistent_variables, used to fix bug #10087
@@ -28,10 +66,10 @@
* volatiles, REPAIR^none^volatiles: Added to prevent cleanse
failing on chainges to specs file.
-2006-02-08 Eric Sandall <eric@sandall.us>
+2006-02-08 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on smgl-fhs (for directory structure)
-2006-02-06 Eric Sandall <eric@sandall.us>
+2006-02-06 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on gnupg (for SOURCE verification)
2005-10-13 Arwed v. Merkatz <v.merkatz@gmx.net>
@@ -121,7 +159,7 @@
2004-03-13 hgg <hgreig@bigpond.net.au>
* BUILD: adding our LDFLAGS to Makefile.in
-2004-02-18 Eric Sandall <eric@sandall.us>
+2004-02-18 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Changed mirror to use gcc.gnu.org
Removed MAINTAINER
@@ -134,17 +172,17 @@
2004-01-29 hgg <hgreig@bigpond.net.au>
* BUILD: bug 5553 infodir and mandir switches
-2003-11-30 Eric Sandall <eric@sandall.us>
+2003-11-30 Eric Sandall <sandalle@sourcemage.org>
* BUILD,POST_REMOVE,PREPARE: Use INSTALL_ROOT
-2003-10-17 Eric Sandall <eric@sandall.us>
+2003-10-17 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Update to 3.3.2
* HISTORY: Formatted to Guru Handbook
2003-08-09 hgg <hgreig@bigpond.net.au>
* DETAILS: Update to gcc3.3.1
-2003-07-26 Eric Sandall <eric@sandall.us>
+2003-07-26 Eric Sandall <sandalle@sourcemage.org>
* CONFIGURE,PREPARE: Added Arwed's Ada patch (Bug #3846)
2003-07-26 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index a6063e381a..db5e393d44 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
# in some weird cases, this actually fails with multiple jobs
make_single &&
make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
@@ -5,7 +10,7 @@ make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
if [[ "$HOST" == x86_64-* ]]; then
[ -d /lib64 -a ! -f /lib/ld-linux-x86-64.so.2 -a -f /lib64/ld-linux-x86-64.so.2 ] &&
- ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2
+ ln -s $TRACK_ROOT/lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2
true # see bug 8626 for info about this conditional
fi &&
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 2a23a1a33e..0b6e50678e 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -3,4 +3,7 @@ mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&
# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26539 for the rationale for
# the below
-sedit 's/^-include/#\0/' libcpp/Makefile.in
+sedit 's/^-include/#\0/' libcpp/Makefile.in &&
+
+#apply the GCC 4.1.1 fast-math fix
+patch -p1 < $SPELL_DIRECTORY/gcc-4.1.1-ffast-math.patch
diff --git a/gnu/gcc/gcc-4.1.1-ffast-math.patch b/gnu/gcc/gcc-4.1.1-ffast-math.patch
new file mode 100644
index 0000000000..6c47d9ce8d
--- /dev/null
+++ b/gnu/gcc/gcc-4.1.1-ffast-math.patch
@@ -0,0 +1,51 @@
+#http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/files/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch?rev=1.1&view=markup
+# credit goes to a developer from gentoo
+--- gcc-4.1.1/gcc/config/i386/crtfastmath.c
++++ gcc-4.1.1/gcc/config/i386/crtfastmath.c
+@@ -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))
+ set_fast_math (void)
+ {
+@@ -75,22 +92,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-core-4.1.1.tar.bz2.sig b/gnu/gcc/gcc-core-4.1.1.tar.bz2.sig
deleted file mode 100644
index 954c20a182..0000000000
--- a/gnu/gcc/gcc-core-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/gcc33/DEPENDS b/gnu/gcc33/DEPENDS
new file mode 100755
index 0000000000..830a32d419
--- /dev/null
+++ b/gnu/gcc33/DEPENDS
@@ -0,0 +1 @@
+depends smgl-archspecs
diff --git a/gnu/gcc33/HISTORY b/gnu/gcc33/HISTORY
index d896dc361d..cd55811b0c 100644
--- a/gnu/gcc33/HISTORY
+++ b/gnu/gcc33/HISTORY
@@ -1,3 +1,11 @@
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
@@ -30,7 +38,7 @@
2005-01-15 Arwed v. Merkatz <v.merkatz@gmx.net>
* BUILD: sedit configure to use bash instead of sh, fixes bug #7205
-2004-09-14 Eric Sandall <eric@sandall.us>
+2004-09-14 Eric Sandall <sandalle@sourcemage.org>
* POST_REMOVE: Infodir is /usr/share/info
2004-03-13 hgg <hgreig@bigpond.net.au>
@@ -40,7 +48,7 @@
2004-03-13 hgg <hgreig@bigpond.net.au>
* BUILD: adding our LDFLAGS to Makefile.in
-2004-02-18 Eric Sandall <eric@sandall.us>
+2004-02-18 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Changed mirror to use gcc.gnu.org
Removed MAINTAINER
@@ -53,17 +61,17 @@
2004-01-29 hgg <hgreig@bigpond.net.au>
* BUILD: bug 5553 infodir and mandir switches
-2003-11-30 Eric Sandall <eric@sandall.us>
+2003-11-30 Eric Sandall <sandalle@sourcemage.org>
* BUILD,POST_REMOVE,PREPARE: Use INSTALL_ROOT
-2003-10-17 Eric Sandall <eric@sandall.us>
+2003-10-17 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Update to 3.3.2
* HISTORY: Formatted to Guru Handbook
2003-08-09 hgg <hgreig@bigpond.net.au>
* DETAILS: Update to gcc3.3.1
-2003-07-26 Eric Sandall <eric@sandall.us>
+2003-07-26 Eric Sandall <sandalle@sourcemage.org>
* CONFIGURE,PREPARE: Added Arwed's Ada patch (Bug #3846)
2003-07-26 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/gcc33/INSTALL b/gnu/gcc33/INSTALL
index 6077a243e2..92260c4b04 100755
--- a/gnu/gcc33/INSTALL
+++ b/gnu/gcc33/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
# create a symlink to version 5 runtime in regular prefix $INSTALL_ROOT/usr
## @param runtime library name relative to prefix
function link_runtime ()
diff --git a/gnu/gcc34/DEPENDS b/gnu/gcc34/DEPENDS
index 689e2258fd..62fb65a181 100755
--- a/gnu/gcc34/DEPENDS
+++ b/gnu/gcc34/DEPENDS
@@ -1,3 +1,4 @@
depends gcc &&
depends gnupg &&
-depends smgl-fhs
+depends smgl-fhs &&
+depends smgl-archspecs
diff --git a/gnu/gcc34/HISTORY b/gnu/gcc34/HISTORY
index cd0c2ceae9..da452c2f2c 100644
--- a/gnu/gcc34/HISTORY
+++ b/gnu/gcc34/HISTORY
@@ -1,16 +1,24 @@
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
2006-05-30 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: updated to 3.4.6
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
-2006-02-08 Eric Sandall <eric@sandall.us>
+2006-02-08 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on smgl-fhs (for directory structure)
-2006-02-06 Eric Sandall <eric@sandall.us>
+2006-02-06 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on gnupg (for SOURCE verification)
-2005-12-10 Treeve Jelbert <treeve01@pi.be>
+2005-12-10 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.4.5
2005-11-29 Seth Woolley <seth@tautology.org>
@@ -51,7 +59,7 @@
2005-01-15 Arwed v. Merkatz <v.merkatz@gmx.net>
* BUILD: sedit configure to use bash instead of sh, fixes bug #7205
-2004-09-14 Eric Sandall <eric@sandall.us>
+2004-09-14 Eric Sandall <sandalle@sourcemage.org>
* POST_REMOVE: Infodir is /usr/share/info
2004-03-13 hgg <hgreig@bigpond.net.au>
@@ -61,7 +69,7 @@
2004-03-13 hgg <hgreig@bigpond.net.au>
* BUILD: adding our LDFLAGS to Makefile.in
-2004-02-18 Eric Sandall <eric@sandall.us>
+2004-02-18 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Changed mirror to use gcc.gnu.org
Removed MAINTAINER
@@ -74,17 +82,17 @@
2004-01-29 hgg <hgreig@bigpond.net.au>
* BUILD: bug 5553 infodir and mandir switches
-2003-11-30 Eric Sandall <eric@sandall.us>
+2003-11-30 Eric Sandall <sandalle@sourcemage.org>
* BUILD,POST_REMOVE,PREPARE: Use INSTALL_ROOT
-2003-10-17 Eric Sandall <eric@sandall.us>
+2003-10-17 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Update to 3.3.2
* HISTORY: Formatted to Guru Handbook
2003-08-09 hgg <hgreig@bigpond.net.au>
* DETAILS: Update to gcc3.3.1
-2003-07-26 Eric Sandall <eric@sandall.us>
+2003-07-26 Eric Sandall <sandalle@sourcemage.org>
* CONFIGURE,PREPARE: Added Arwed's Ada patch (Bug #3846)
2003-07-26 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/gcc34/INSTALL b/gnu/gcc34/INSTALL
index a62ebc93a0..be14c3d176 100755
--- a/gnu/gcc34/INSTALL
+++ b/gnu/gcc34/INSTALL
@@ -1 +1,6 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
make prefix=${INSTALL_ROOT}/opt/gcc34 install-no-fixedincludes
diff --git a/gnu/gcj/BUILD b/gnu/gcj/BUILD
index 31e2af8f76..47642dbd94 100755
--- a/gnu/gcj/BUILD
+++ b/gnu/gcj/BUILD
@@ -5,6 +5,11 @@ persistent_read gcc GCC_MULTILIB GCC_MULTILIB
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 &&
+
sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&
cd $SOURCE_DIRECTORY.bld &&
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index 6aa97c6122..f025ea2c94 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -1,5 +1,10 @@
-. $GRIMOIRE/libcompat &&
-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
+fi &&
+depends smgl-archspecs
diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS
index 9d22ca58d9..7a5ac27bda 100755
--- a/gnu/gcj/DETAILS
+++ b/gnu/gcj/DETAILS
@@ -1,22 +1,32 @@
SPELL=gcj
- VERSION=4.1.1
+ VERSION=4.1.2
SOURCE=gcc-core-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
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-java-$VERSION.tar.bz2
- SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
SOURCE3=gcc-g++-$VERSION.tar.bz2
- SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:WORKS_FOR_ME
SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE3_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
+
+#upstream signatures
+ 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=$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=20040705
- UPDATED=20041107
TMPFS=off
DOCS="$DOCS INSTALL"
KEYWORDS="compiler java"
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 7c9f8f171d..24664f707b 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,9 +1,31 @@
+2007-02-14 Treeve Jelbert <treeve@oi.be>
+ * DETAILS: version 4.1.2
+ convert to upstream signatures
+
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
+2006-07-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, PREPARE, DEPENDS: added optional support for AWT
+ * DETAILS: remove UPDATED, added PATCHLEVEL
+
2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: updated to 4.1.1
+2006-03-12 David Brown <dmlb2000@gmail.com>
+ * DETAILS: fixed source hash for source3
+
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
+2006-03-10 David Brown <dmlb2000@gmail.com>
+ * DETAILS: updated 4.0.3 fixed source url for gcj part
+
2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: use force_depends gcc if version doesn't match so it gets
recompiled
@@ -11,7 +33,7 @@
2006-03-05 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: fixed hashsums
-2006-03-01 Treeve Jelbert <treeve01@pi.be>
+2006-03-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.1.0
2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
diff --git a/gnu/gcj/INSTALL b/gnu/gcj/INSTALL
index 069b2430eb..a592fcd661 100755
--- a/gnu/gcj/INSTALL
+++ b/gnu/gcj/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
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/ &&
diff --git a/gnu/gcj/PREPARE b/gnu/gcj/PREPARE
new file mode 100755
index 0000000000..37959d60c4
--- /dev/null
+++ b/gnu/gcj/PREPARE
@@ -0,0 +1 @@
+config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and libart_lgpl)?" n
diff --git a/gnu/gcj/gcc-core-4.1.1.tar.bz2.sig b/gnu/gcj/gcc-core-4.1.1.tar.bz2.sig
deleted file mode 100644
index cc2b647813..0000000000
--- a/gnu/gcj/gcc-core-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/gcj/gcc-g++-4.1.1.tar.bz2.sig b/gnu/gcj/gcc-g++-4.1.1.tar.bz2.sig
deleted file mode 100644
index 1955abe603..0000000000
--- a/gnu/gcj/gcc-g++-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/gcj/gcc-java-4.1.1.tar.bz2.sig b/gnu/gcj/gcc-java-4.1.1.tar.bz2.sig
deleted file mode 100644
index b6c74e3bfa..0000000000
--- a/gnu/gcj/gcc-java-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/objc/DEPENDS b/gnu/objc/DEPENDS
index 6aa97c6122..4d76156f6b 100755
--- a/gnu/objc/DEPENDS
+++ b/gnu/objc/DEPENDS
@@ -2,4 +2,5 @@
depends gcc &&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
-fi
+fi &&
+depends smgl-archspecs
diff --git a/gnu/objc/DETAILS b/gnu/objc/DETAILS
index b768751bbd..f7a822ee0d 100755
--- a/gnu/objc/DETAILS
+++ b/gnu/objc/DETAILS
@@ -1,19 +1,28 @@
SPELL=objc
- VERSION=4.1.1
+ VERSION=4.1.2
SOURCE=gcc-core-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
- SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+# SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
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_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
+#upstream signatures
+ SOURCE3=$SOURCE.sig
+ SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE3_IGNORE=signature
+ SOURCE4=$SOURCE2.sig
+ SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
+ SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
+ SOURCE4_IGNORE=signature
+
LICENSE[0]=GPL
LICENSE[1]=GPL
WEB_SITE=http://gcc.gnu.org/
ENTERED=20040704
- UPDATED=20040704
DOCS="$DOCS INSTALL"
KEYWORDS="compiler"
SHORT="the GNU Objective-C compiler"
diff --git a/gnu/objc/HISTORY b/gnu/objc/HISTORY
index 938fba5704..bd9aff301d 100644
--- a/gnu/objc/HISTORY
+++ b/gnu/objc/HISTORY
@@ -1,14 +1,32 @@
+2007-02-14 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.1.2
+ convert to upstream signatures
+
+2007-01-22 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: ensure that compilers get cast after archspecs so that
+ they all use the same fresh setup
+
+2007-01-16 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: cd to $SOURCE_DIRECTORY.bld at beginning of INSTALL
+ Bug #10647
+
+2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
* DETAILS: updated to 4.1.1
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
+2006-03-10 David Brown <dmlb2000@gmail.com>
+ * DETAILS: updated 4.0.3
+
2006-03-07 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: use force_depends gcc if version doesn't match so it gets
recompiled
-2006-03-01 Treeve Jelbert <treeve01@pi.be>
+2006-03-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.1.0
2006-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>
@@ -37,7 +55,7 @@
* DETAILS: updated to 4.0.0
* specs_objc: updated
-2004-12-01 Eric Sandall <eric@sandall.us>
+2004-12-01 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.4.3
Added LICENSE[1] for objc
diff --git a/gnu/objc/INSTALL b/gnu/objc/INSTALL
index 37e5d19c53..d55d493157 100755
--- a/gnu/objc/INSTALL
+++ b/gnu/objc/INSTALL
@@ -1,3 +1,8 @@
+#
+# Bug #10647, also fixed in devel Sorcery
+#
+cd $SOURCE_DIRECTORY.bld &&
+
make -C gcc lang.install-common lang.install-man &&
install -c gcc/cc1obj ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ &&
make -C $HOST/libobjc/ install &&
diff --git a/gnu/objc/gcc-core-4.1.1.tar.bz2.sig b/gnu/objc/gcc-core-4.1.1.tar.bz2.sig
deleted file mode 100644
index 1058529e5a..0000000000
--- a/gnu/objc/gcc-core-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnu/objc/gcc-objc-4.1.1.tar.bz2.sig b/gnu/objc/gcc-objc-4.1.1.tar.bz2.sig
deleted file mode 100644
index 974ec85603..0000000000
--- a/gnu/objc/gcc-objc-4.1.1.tar.bz2.sig
+++ /dev/null
Binary files differ