Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (4c8091aad41d061cb5c8238674db3c400a4e8cdb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (4c8091aad41d061cb5c8238674db3c400a4e8cdb)
  • Date: Sun, 6 Sep 2009 16:01:47 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

gnu/g++/BUILD | 12 ++++++++++++
gnu/g++/DEPENDS | 32 ++++++++++++++++++++++++++------
gnu/g++/HISTORY | 8 ++++++++
gnu/gcc/BUILD | 14 +++++++++++++-
gnu/gcc/DEPENDS | 16 ++++++++++++++--
gnu/gcc/EXPORTS | 1 +
gnu/gcc/FINAL | 3 +++
gnu/gcc/HISTORY | 8 ++++++++
gnu/gcc/REPAIR^all^EXPORTS | 5 +++++
libs/gmp/EXPORTS | 1 +
libs/gmp/FINAL | 2 ++
libs/gmp/HISTORY | 4 ++++
libs/gmp/REPAIR^all^EXPORTS | 1 +
libs/mpfr/EXPORTS | 1 +
libs/mpfr/FINAL | 2 ++
libs/mpfr/HISTORY | 4 ++++
libs/mpfr/REPAIR^all^EXPORTS | 1 +
17 files changed, 106 insertions(+), 9 deletions(-)

New commits:
commit 559706c70a4bced2368bc8a27b66c74a27f23986
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

g++: force_depends gmp and mpfr if archspec they were built with is
different from current. Fixes part of bug 15166.

commit 39e31cffff9f26c0146fe2907a419bef9b4f5695
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gcc: save build archspec in EXPORTed variable, force_depends gmp and
mpfr if archspec they were built with is different from current. Fixes
part of bug 15166.

commit a2650fdda362f3c3ed1bcc52c3cfa9ff40644d7d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

mpfr: save build archspec in EXPORTed variable

commit 018decc3a6288830fa982c3a8f1605f21c2c02cd
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gmp: save build archspec in EXPORTed variable

diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index 9361152..d3f3c30 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -1,3 +1,15 @@
+persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH &&
+persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH &&
+
+if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
+ || $MPFR_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
+ message "${PROBLEM_COLOR}" 1>&2 &&
+ message "gmp and/or mpfr have been built with a different archspec,
building g++ now" 1>&2 &&
+ message "would result in a broken compiler" 1>&2 &&
+ message "${DEFAULT_COLOR}" 1>&2
+ return 1
+fi &&
+
# take multilib option (and nolib64 option) from GCC
# ignore return value as they are only available on x86_64
persistent_read gcc GCC_MULTILIB GCC_MULTILIB
diff --git a/gnu/g++/DEPENDS b/gnu/g++/DEPENDS
index 4db4f86..071293e 100755
--- a/gnu/g++/DEPENDS
+++ b/gnu/g++/DEPENDS
@@ -1,9 +1,29 @@
-. $GRIMOIRE/libcompat &&
-depends gcc &&
-if [[ $VERSION != $(installed_version gcc) ]]; then
- force_depends gcc
-fi &&
+. $GRIMOIRE/libcompat &&
+
+depends gcc &&
depends gmp &&
depends gnupg &&
depends mpfr &&
-depends smgl-archspecs
+depends smgl-archspecs &&
+
+if spell_ok gcc; then
+ persistent_read gcc GCC_BUILD_ARCH GCC_BUILD_ARCH
+fi &&
+
+if [[ $VERSION != $(installed_version gcc)
+ || $GCC_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
+ force_depends gcc
+fi &&
+
+if spell_ok gmp; then
+ persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH
+fi &&
+if spell_ok mpfr; then
+ persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH
+fi &&
+
+if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
+ || $MPFR_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
+ force_depends gmp &&
+ force_depends mpfr
+fi
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index def6201..1485b83 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,3 +1,11 @@
+2009-09-06 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: Stop build if gmp or mpfr were built with a different
archspec
+ than the current one.
+ * DEPENDS: force_depends gmp and mpfr if either were built with a
+ different archspec than the current one. Fixes part of bug 15166.
+ * DEPENDS: force_depends gcc if it was built with a different archspec
+ than the current one. Fixes part of bug 15166.
+
2009-05-10 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: profiledbootstrap should not use parallel make
See http://gcc.gnu.org/install/build.html
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 71fd636..adf29c2 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -1,3 +1,15 @@
+persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH &&
+persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH &&
+
+if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
+ || $MPFR_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
+ message "${PROBLEM_COLOR}" 1>&2 &&
+ message "gmp and/or mpfr have been built with a different archspec,
building gcc now" 1>&2 &&
+ message "would result in a broken compiler" 1>&2 &&
+ message "${DEFAULT_COLOR}" 1>&2
+ return 1
+fi &&
+
# install gcc libraries to /lib instead of /lib64
sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&
if [[ "$GCC_NOLIB64" == 'y' ]]; then
@@ -12,7 +24,7 @@ if [[ "$ARCHITECTURE" == "pentium4" ||
fi &&

# fixes seg-fault on libiberty/splay.c in v 4.3.2
-CFLAGS="-O1 $CFLAGS"
+CFLAGS="-O1 $CFLAGS" &&

if [[ $CROSS_INSTALL == on ]]; then
OPTS="--host=$HOST $OPTS"
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 6ad4823..7faab02 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -4,11 +4,23 @@ depends diffutils &&
depends gmp &&
depends gnupg &&
depends mpfr &&
+depends smgl-fhs &&
+depends smgl-archspecs &&

if [[ "$(installed_version mpfr|sed 's:\.::g')" < 230 ]]
then
force_depends mpfr
fi &&

-depends smgl-fhs &&
-depends smgl-archspecs
+if spell_ok gmp; then
+ persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH
+fi &&
+if spell_ok mpfr; then
+ persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH
+fi &&
+
+if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
+ || $MPFR_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
+ force_depends gmp &&
+ force_depends mpfr
+fi
diff --git a/gnu/gcc/EXPORTS b/gnu/gcc/EXPORTS
index 1759db7..d069ed8 100644
--- a/gnu/gcc/EXPORTS
+++ b/gnu/gcc/EXPORTS
@@ -2,3 +2,4 @@ GCC_CFLAGS
GCC_LDFLAGS
GCC_MULTILIB
GCC_NOLIB64
+GCC_BUILD_ARCH
diff --git a/gnu/gcc/FINAL b/gnu/gcc/FINAL
index 907a1a0..aa59b3f 100755
--- a/gnu/gcc/FINAL
+++ b/gnu/gcc/FINAL
@@ -1 +1,4 @@
rm_source_dir $SOURCE_DIRECTORY.bld
+
+GCC_BUILD_ARCH=${SMGL_COMPAT_ARCHS[4]}
+persistent_add GCC_BUILD_ARCH
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index c23f393..254df83 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,11 @@
+2009-09-06 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: Stop build if gmp or mpfr were built with a different
archspec
+ than the current one.
+ * DEPENDS: force_depends gmp and mpfr if either were built with a
+ different archspec than the current one. Fixes part of bug 15166.
+ * EXPORTS, FINAL, REPAIR^all^EXPORTS: Added export of build arch of
+ gcc to force recompile when casting g++ after switching archs.
+
2009-05-10 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: profiledbootstrap should not use parallel make
See http://gcc.gnu.org/install/build.html
diff --git a/gnu/gcc/REPAIR^all^EXPORTS b/gnu/gcc/REPAIR^all^EXPORTS
new file mode 100644
index 0000000..d069ed8
--- /dev/null
+++ b/gnu/gcc/REPAIR^all^EXPORTS
@@ -0,0 +1,5 @@
+GCC_CFLAGS
+GCC_LDFLAGS
+GCC_MULTILIB
+GCC_NOLIB64
+GCC_BUILD_ARCH
diff --git a/libs/gmp/EXPORTS b/libs/gmp/EXPORTS
new file mode 100644
index 0000000..0b60e2a
--- /dev/null
+++ b/libs/gmp/EXPORTS
@@ -0,0 +1 @@
+GMP_BUILD_ARCH
diff --git a/libs/gmp/FINAL b/libs/gmp/FINAL
new file mode 100755
index 0000000..a68db48
--- /dev/null
+++ b/libs/gmp/FINAL
@@ -0,0 +1,2 @@
+GMP_BUILD_ARCH=${SMGL_COMPAT_ARCHS[4]}
+persistent_add GMP_BUILD_ARCH
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 411cbd4..da0beea 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,7 @@
+2009-09-06 Remko van der Vossen <wich AT sourcemage.org>
+ * EXPORTS, FINAL, REPAIR^all^EXPORTS: Added export of build arch of
+ mpfr to force recompile when casting gcc/g++ after switching archs
+
2009-09-05 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: gmp requires m4 to build

diff --git a/libs/gmp/REPAIR^all^EXPORTS b/libs/gmp/REPAIR^all^EXPORTS
new file mode 100644
index 0000000..0b60e2a
--- /dev/null
+++ b/libs/gmp/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+GMP_BUILD_ARCH
diff --git a/libs/mpfr/EXPORTS b/libs/mpfr/EXPORTS
new file mode 100644
index 0000000..96be3f0
--- /dev/null
+++ b/libs/mpfr/EXPORTS
@@ -0,0 +1 @@
+MPFR_BUILD_ARCH
diff --git a/libs/mpfr/FINAL b/libs/mpfr/FINAL
new file mode 100755
index 0000000..7a37903
--- /dev/null
+++ b/libs/mpfr/FINAL
@@ -0,0 +1,2 @@
+MPFR_BUILD_ARCH=${SMGL_COMPAT_ARCHS[4]}
+persistent_add MPFR_BUILD_ARCH
diff --git a/libs/mpfr/HISTORY b/libs/mpfr/HISTORY
index 072d440..8d51ad2 100644
--- a/libs/mpfr/HISTORY
+++ b/libs/mpfr/HISTORY
@@ -1,3 +1,7 @@
+2009-09-06 Remko van der Vossen <wich AT sourcemage.org>
+ * EXPORTS, FINAL, REPAIR^all^EXPORTS: Added export of build arch of
+ mpfr to force recompile when casting gcc/g++ after switching archs
+
2009-04-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
force recompile after recent changes to gmp
diff --git a/libs/mpfr/REPAIR^all^EXPORTS b/libs/mpfr/REPAIR^all^EXPORTS
new file mode 100644
index 0000000..96be3f0
--- /dev/null
+++ b/libs/mpfr/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+MPFR_BUILD_ARCH



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (4c8091aad41d061cb5c8238674db3c400a4e8cdb), Remko van der Vossen, 09/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page