From 77ca2ff1809b927b0e76e3b909e9c4753dfc16d0 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Dec 2003 23:06:26 +0100 Subject: - Reworked the Do-rpm build script to be more flexible - Reworked testing for gcc3 in the RPM spec file a bit Build-tools/Do-rpm: Big overhaul: - Give the spec file name as the option, not the version number (required to be able to build commercial RPMs, too) - Some more logging and debugging, more documentation support-files/mysql.spec.sh: - made testing for gcc3 a bit more robust and not to stomp on user settings for CXX --- support-files/mysql.spec.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'support-files/mysql.spec.sh') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 658b90d1a3f..1cb25e2ff42 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -260,7 +260,7 @@ export PATH # If we want to compile with RAID using gcc 3, we need to use # gcc instead of g++ to avoid linking problems (RAID code is written in C++) -if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1 +test -z $CXX && test -z $CC && if gcc -v 2>&1 | grep 'gcc version 3' > /dev/null 2>&1 then export CXX="gcc" fi @@ -567,6 +567,10 @@ fi # The spec file changelog only includes changes made to the spec file # itself %changelog +* Thu Dec 11 2003 Lenz Grimmer + +- made testing for gcc3 a bit more robust + * Fri Nov 21 2003 Lenz Grimmer - removed dependency on MySQL-client from the MySQL-devel subpackage -- cgit v1.2.1