Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (851a3a819eab509a4658ee2d0464615c60e371d0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (851a3a819eab509a4658ee2d0464615c60e371d0)
  • Date: Thu, 12 Jan 2012 04:11:59 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnu/gcc/EXPORTS | 6 ++++++
gnu/gcc/HISTORY | 4 ++++
gnu/gcc/REPAIR^all^EXPORTS | 1 +
libs/gmp/DEPENDS | 16 ++++++++++------
libs/gmp/HISTORY | 3 +++
5 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit 851a3a819eab509a4658ee2d0464615c60e371d0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gmp: correctly handle g++ dependency

commit 7d47a420e21832fa638de9b8f5c0f7f0ffe3621b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gcc: added GCC_COMPILER to EXPORTS

diff --git a/gnu/gcc/EXPORTS b/gnu/gcc/EXPORTS
new file mode 100644
index 0000000..b46480a
--- /dev/null
+++ b/gnu/gcc/EXPORTS
@@ -0,0 +1,6 @@
+GCC_CFLAGS
+GCC_COMPILER
+GCC_LDFLAGS
+GCC_MULTILIB
+GCC_NOLIB64
+GCC_BUILD_ARCH
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 7cd81c3..e26173f 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2012-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * REPAIR^all^EXPORTS: added missing GCC_COMPILER
+ * EXPORTS: added
+
2011-11-24 Robin Cook <rcook AT wyrms.net>
* BUILD: added java home build option
* CONFIGURE: query about java home
diff --git a/gnu/gcc/REPAIR^all^EXPORTS b/gnu/gcc/REPAIR^all^EXPORTS
index d069ed8..b46480a 100644
--- a/gnu/gcc/REPAIR^all^EXPORTS
+++ b/gnu/gcc/REPAIR^all^EXPORTS
@@ -1,4 +1,5 @@
GCC_CFLAGS
+GCC_COMPILER
GCC_LDFLAGS
GCC_MULTILIB
GCC_NOLIB64
diff --git a/libs/gmp/DEPENDS b/libs/gmp/DEPENDS
index a100f5d..b7acd4a 100755
--- a/libs/gmp/DEPENDS
+++ b/libs/gmp/DEPENDS
@@ -1,11 +1,15 @@
depends m4 &&

+if spell_ok gcc; then
+ persistent_read gcc GCC_COMPILER GCC_COMPILER || true
+fi &&
+
# only allow dependency on g++ if g++ is installed, otherwise a cycle is
created
-if spell_ok g++; then
- optional_depends g++ \
- "--enable-cxx" \
- "--disable-cxx" \
- "Enable C++ support?"
+if list_find "$GCC_COMPILER" "c++"; then
+ optional_depends -sub CXX gcc \
+ "--enable-cxx" \
+ "--disable-cxx" \
+ "Enable C++ support?"
else
- OPTS="--disable-cxx $OPTS"
+ OPTS="--disable-cxx $OPTS"
fi
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 4a2ac9f..5abd827 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: correctly handle g++ dependency
+
2011-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0.2 (devel)




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (851a3a819eab509a4658ee2d0464615c60e371d0), Vlad Glagolev, 01/12/2012

Archive powered by MHonArc 2.6.24.

Top of Page