packages: mysql/mysql.spec - only need gcc4 in build section

glen glen at pld-linux.org
Mon Dec 27 22:06:17 CET 2010


Author: glen                         Date: Mon Dec 27 21:06:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- only need gcc4 in build section

---- Files affected:
packages/mysql:
   mysql.spec (1.507 -> 1.508) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.507 packages/mysql/mysql.spec:1.508
--- packages/mysql/mysql.spec:1.507	Mon Dec 27 21:22:31 2010
+++ packages/mysql/mysql.spec	Mon Dec 27 22:06:11 2010
@@ -26,13 +26,6 @@
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
-%if "%{pld_release}" == "ac"
-# add suffix, but allow ccache, etc in ~/.rpmmacros
-%{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
-%{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
-%{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
-%endif
-
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -546,7 +539,7 @@
 # cluster it wants)
 
 %if "%{pld_release}" == "ac"
-# this needs to be redefined for ./repackage.sh to work
+# add suffix, but allow ccache, etc in ~/.rpmmacros
 %{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
 %{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
 %{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
@@ -1116,6 +1109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.508  2010/12/27 21:06:11  glen
+- only need gcc4 in build section
+
 Revision 1.507  2010/12/27 20:22:31  glen
 - needs gcc4 to build, be sure detect is ok
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.507&r2=1.508&f=u



More information about the pld-cvs-commit mailing list