Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.21 grimoire by Arwed von Merkatz (2d54aeb1c88cdafca6290030074289fd2e5be7ec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.21 grimoire by Arwed von Merkatz (2d54aeb1c88cdafca6290030074289fd2e5be7ec)
  • Date: Thu, 15 May 2008 12:41:31 -0500

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

gnu/ada/BUILD | 28 ++----------
gnu/ada/DEPENDS | 4 -
gnu/ada/DETAILS | 36 +++++++--------
gnu/ada/FINAL | 4 +
gnu/ada/HISTORY | 52
-----------------------
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 | 9 ---
gnu/g++/BUILD | 4 -
gnu/g++/DEPENDS | 6 --
gnu/g++/DETAILS | 2
gnu/g++/HISTORY | 9 ---
gnu/gcc/BUILD | 4 -
gnu/gcc/DEPENDS | 18 +------
gnu/gcc/DETAILS | 7 +--
gnu/gcc/HISTORY | 16 -------
gnu/gcc/PRE_BUILD | 2
gnu/gcc/gcc-4.2.3-ffast-math.patch | 50
++++++++++++++++++++++
gnu/gcc/gcc-4.3.0-ffast-math.patch | 50
----------------------
gnu/gcj/BUILD | 4 -
gnu/gcj/DEPENDS | 9 +--
gnu/gcj/DETAILS | 2
gnu/gcj/HISTORY | 9 ---
gnu/objc/BUILD | 4 -
gnu/objc/DEPENDS | 5 --
gnu/objc/DETAILS | 2
gnu/objc/HISTORY | 9 ---
34 files changed, 123 insertions(+), 296 deletions(-)

New commits:
commit 2d54aeb1c88cdafca6290030074289fd2e5be7ec
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 a1b77fa7c3e59aac1d15e13c0b2f0d1bedbbc281
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 c8d92ae3bf2f47fe42824290df9f5430fe5e1599
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 057a62dc7e37cdae70ae5c9df4ce08ce5e9d4ad3
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 57d9ba45a7679be4f49bee0ac05d61242092eeb0
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 8d083aa02f42e5e61f37d9001b5f898bedc66d28
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.

Conflicts:

gnu/gcj/HISTORY

commit e08880e58768d4bdb6a3cffe4e569550b0588629
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 442bfe25014aceae3164e4c1fd869d3980580024
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 1f670f5d6b1a2b9049d04779bffbc50fffec9b55
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 5d66330815f18ca87a8dfb9707040e7171ce4653
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 138ae933b8d4439ed48de6315c00a33ce96e6f64
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 af8af864da988d39d288dc8505a81ea9527f8689
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 81431b72d44f51f6f86994d48c5c0193e6f641eb
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 248b3628cdaa5a5c4db709c415830d87ea9b3671
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 4132f77c28ebb46cf14f90626fd2bcd9588624b3
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.

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 5758e07..6253b94 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,35 +1,30 @@
SPELL=ada
- VERSION=4.3.0
+ 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 88d6837..5dc7151 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,55 +1,3 @@
-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 @@
+@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:
+@ada
+
+.adb:
+@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 b788f5b..09d59a2 100755
--- a/gnu/fortran/DETAILS
+++ b/gnu/fortran/DETAILS
@@ -1,5 +1,5 @@
SPELL=fortran
- VERSION=4.3.0
+ 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 c03bffa..4e65e85 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -1,12 +1,3 @@
-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 9733cd1..8b096f4 100755
--- a/gnu/g++/DETAILS
+++ b/gnu/g++/DETAILS
@@ -1,5 +1,5 @@
SPELL=g++
- VERSION=4.3.0
+ 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 574e463..c6f97d8 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,12 +1,3 @@
-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 a20ebaf..bf101a5 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcc
- VERSION=4.3.0
+ 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 0530fd4..151884d 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,19 +1,3 @@
-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 ba4613e..be70a58 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -6,4 +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.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 1af3ced..47642db 100755
--- a/gnu/gcj/BUILD
+++ b/gnu/gcj/BUILD
@@ -10,10 +10,6 @@ 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 &&
-
sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&

cd $SOURCE_DIRECTORY.bld &&
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index a8f12d4..3f2b5da 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -13,9 +13,6 @@ 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 d3f009e..f571d37 100755
--- a/gnu/gcj/DETAILS
+++ b/gnu/gcj/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcj
- VERSION=4.3.0
+ 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
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 4f48445..467618e 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -2,15 +2,6 @@
* 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

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 1bb35a9..737ffd7 100755
--- a/gnu/objc/DETAILS
+++ b/gnu/objc/DETAILS
@@ -1,5 +1,5 @@
SPELL=objc
- VERSION=4.3.0
+ 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 d9bdf5b..6cf9ab5 100644
--- a/gnu/objc/HISTORY
+++ b/gnu/objc/HISTORY
@@ -1,12 +1,3 @@
-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




  • [SM-Commit] GIT changes to stable-rc-0.21 grimoire by Arwed von Merkatz (2d54aeb1c88cdafca6290030074289fd2e5be7ec), Arwed von Merkatz, 05/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page