Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.37 grimoire by Arwed von Merkatz (1456d52fba50fb8e684498851caf989f7da8b710)

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.37 grimoire by Arwed von Merkatz (1456d52fba50fb8e684498851caf989f7da8b710)
  • Date: Tue, 20 Oct 2009 13:33:58 -0500

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

gnu/g++/DEPENDS | 6 +++---
gnu/g++/HISTORY | 3 +++
gnu/gcc/DEPENDS | 4 ++--
gnu/gcc/HISTORY | 4 ++++
4 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 1456d52fba50fb8e684498851caf989f7da8b710
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

g++: don't fail casting if persistent vars are not there
(cherry picked from commit 53bf2b1b86471afeab002a92d60f4624f5a5103d)

commit 721a35d0b0d42ce11eedd992b488fd96e0d82ea9
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gcc: don't fail casting if persistent vars are not there
(cherry picked from commit f28094f3d365878787a2c5578a478f9a961a0194)

diff --git a/gnu/g++/DEPENDS b/gnu/g++/DEPENDS
index 071293e..db054db 100755
--- a/gnu/g++/DEPENDS
+++ b/gnu/g++/DEPENDS
@@ -7,7 +7,7 @@ depends mpfr &&
depends smgl-archspecs &&

if spell_ok gcc; then
- persistent_read gcc GCC_BUILD_ARCH GCC_BUILD_ARCH
+ persistent_read gcc GCC_BUILD_ARCH GCC_BUILD_ARCH || true
fi &&

if [[ $VERSION != $(installed_version gcc)
@@ -16,10 +16,10 @@ if [[ $VERSION != $(installed_version gcc)
fi &&

if spell_ok gmp; then
- persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH
+ persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH || true
fi &&
if spell_ok mpfr; then
- persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH
+ persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH || true
fi &&

if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index 1485b83..e14764b 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,3 +1,6 @@
+2009-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: don't fail if persistent vars are not available, bug #15476
+
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.
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 7faab02..2bd4edb 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -13,10 +13,10 @@ then
fi &&

if spell_ok gmp; then
- persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH
+ persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH || true
fi &&
if spell_ok mpfr; then
- persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH
+ persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH || true
fi &&

if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 254df83..07c924e 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2009-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: don't fail if mpfr and gmp persistent variables are
+ not available, bug #15476
+
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.



  • [SM-Commit] GIT changes to stable-rc-0.37 grimoire by Arwed von Merkatz (1456d52fba50fb8e684498851caf989f7da8b710), Arwed von Merkatz, 10/20/2009

Archive powered by MHonArc 2.6.24.

Top of Page