[SM-Commit] GIT changes to master grimoire by Eric Sandall (3089734100895c9b85aec4a355ec8d2c71711ec4)
Eric Sandall
scm at sourcemage.org
Thu Apr 24 01:21:30 EDT 2008
GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:
kernels/linux/HISTORY | 5 +++++
kernels/linux/PRE_BUILD | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 3089734100895c9b85aec4a355ec8d2c71711ec4
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>
linux: Only fix linux kernel for gcc >= 4.3.0 (Bug #14480) patch from Jiri Golembiovsky <golemj at gmail.com>
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 0f0a628..b5ef869 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2008-04-23 Eric Sandall <sandalle at sourcemage.org>
+ * PRE_BUILD: Only fix linux kernel for gcc >= 4.3.0 (Bug #14480)
+ patch from Jiri Golembiovsky <golemj at gmail.com>
+
2008-04-21 Vlad Glagolev <stealth at sourcemage.org>
* info/patches/maintenance_patches/patch-2.6.24.5: added
@@ -4084,3 +4088,4 @@
2002-08-20 Wolfgang Scheicher <worf at sbox.tu-graz.ac.at>
* Rewrite - Attempt to merge several kernel spells into one
Now features a menu to select which version to build
+
diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 27e9888..032160a 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -161,8 +161,11 @@ else
fi &&
# fix build via gcc 4.3
-sed -i "s:-declaration:-declaration -fno-tree-scev-cprop:" \
- $LINUX_SOURCE_DIRECTORY/Makefile &&
+if [[ "$(installed_version gcc | sed 's:\.::g')" -ge "430" ]]
+then
+ sed -i "s:-declaration:-declaration -fno-tree-scev-cprop:" \
+ $LINUX_SOURCE_DIRECTORY/Makefile
+fi &&
# check to make sure .config exists
if [[ ! -f ./.config ]]
More information about the SM-Commit
mailing list