Author: glen Date: Sun Mar 13 21:11:26 2011 GMT
Module: packages Tag: MYSQL_5_1
---- Log message:
- force gcc4 on ac, percona patches depend on atomic ops
---- Files affected:
packages/mysql:
mysql.spec (1.496.2.9 -> 1.496.2.10)
---- Diffs:
================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.496.2.9 packages/mysql/mysql.spec:1.496.2.10
--- packages/mysql/mysql.spec:1.496.2.9 Sun Mar 13 18:00:06 2011
+++ packages/mysql/mysql.spec Sun Mar 13 22:11:21 2011
@@ -132,7 +132,11 @@
BuildRequires: automake
BuildRequires: bison
BuildRequires: groff
-BuildRequires: libstdc++-devel >= 5:3.0
+%if "%{pld_release}" == "ac"
+BuildRequires: libstdc++4-devel >= 5:4.0
+%else
+BuildRequires: libstdc++-devel >= 5:4.0
+%endif
BuildRequires: libtool
%{?with_tcpd:BuildRequires: libwrap-devel}
BuildRequires: ncurses-devel >= 4.2
@@ -625,6 +629,13 @@
# </percona>
%build
+%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
+
%{__libtoolize}
%{__aclocal} -I config/ac-macros
%{__automake}
@@ -1225,6 +1236,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.496.2.10 2011/03/13 21:11:21 glen
+- force gcc4 on ac, percona patches depend on atomic ops
+
Revision 1.496.2.9 2011/03/13 17:00:06 glen
- avoid ICE for gcc 3.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.496.2.9&r2=1.496.2.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
