From 93ad8889f84a8a34df9602b245bc4f5f2200a5c1 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Tue, 23 Dec 2003 01:51:57 +0000 Subject: [PATCH] Dimitar Zhekov : memtest86 still doesn't compile with gcc-33 / AthlonXP (probably on any i686+). Maybe we can at least agree not to compile it when neither gcc-2 not gcc-3 is present? Compiled/tested with -1946, applies to -2037. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2042 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/x86/memtest86/memtest86.conf | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 03983099d..ae882e128 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -6,6 +6,7 @@ - added a powerpc kernel26-disable.lst to fix linux26 for PowerPC - Sebastian Jaenicke: updated samba (3.0.1) - Alan J. Wylie: updated spamassassin + - Dimitar Zhekov: workaround for memtest86 to avoid gcc-33 if possible *) 2003-12-21 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/package/x86/memtest86/memtest86.conf b/package/x86/memtest86/memtest86.conf index db2f7c74b..06b61d052 100644 --- a/package/x86/memtest86/memtest86.conf +++ b/package/x86/memtest86/memtest86.conf @@ -38,6 +38,13 @@ makeinstopt='' if [ -f $root/var/adm/packages/gcc2 ] ; then hook_add postmake 3 memtest86_install else + # memtest fails to compile with gcc-33 + if [ -f $root/var/adm/packages/gcc3 ] ; then + var_append makeopt ' ' "CC=gcc-3" + else + makeopt='' + fi + # gcc-3-compiled memtest fails to work hook_add postmake 3 memtest86_install_nogcc2 fi hook_add postmake 4 "cp -v $confdir/install.sh $sbindir/memtest86_install ;\