Commit fe103030 authored by Jonathan Perkin's avatar Jonathan Perkin

Fix gcc check, SuSE doesn't print (GCC) anywhere. Get rid of

WITH_LIBGCC %define, it isn't subject to shell rules and is
parsed anyway.  Instead create a file with optional files to
include.
parent 478c2759
...@@ -68,9 +68,6 @@ ...@@ -68,9 +68,6 @@
%undefine __perl_provides %undefine __perl_provides
%undefine __perl_requires %undefine __perl_requires
# Variables which need to be global so they can be changed during phases.
%global WITH_LIBGCC 0
############################################################################## ##############################################################################
# Command line handling # Command line handling
############################################################################## ##############################################################################
...@@ -340,6 +337,9 @@ client/server version. ...@@ -340,6 +337,9 @@ client/server version.
# Be strict about variables, bail at earliest opportunity, etc. # Be strict about variables, bail at earliest opportunity, etc.
set -eu set -eu
# Optional files to include
touch optional-server-files
# #
# Set environment in order of preference, MYSQL_BUILD_* first, then variable # Set environment in order of preference, MYSQL_BUILD_* first, then variable
# name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the # name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the
...@@ -400,14 +400,14 @@ RBR=$RPM_BUILD_ROOT ...@@ -400,14 +400,14 @@ RBR=$RPM_BUILD_ROOT
# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921). This # For gcc builds, include libgcc.a in the devel subpackage (BUG 4921). This
# needs to be during build phase as $CC is not set during install. # needs to be during build phase as $CC is not set during install.
if "$CC" --version | grep '(GCC)' >/dev/null 2>&1 if "$CC" -v | grep '^gcc.version' >/dev/null 2>&1
then then
libgcc=`$CC $CFLAGS --print-libgcc-file` libgcc=`$CC $CFLAGS --print-libgcc-file`
if [ -f $libgcc ] if [ -f $libgcc ]
then then
%define WITH_LIBGCC 1
mkdir -p $RBR%{_libdir}/mysql mkdir -p $RBR%{_libdir}/mysql
install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
echo "%{_libdir}/mysql/libmygcc.a" >>optional-server-files
fi fi
fi fi
...@@ -645,7 +645,7 @@ fi ...@@ -645,7 +645,7 @@ fi
# Files section # Files section
############################################################################## ##############################################################################
%files server %files server -f optional-server-files
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc %{src_dir}/COPYING %doc %{src_dir}/COPYING
...@@ -832,9 +832,6 @@ fi ...@@ -832,9 +832,6 @@ fi
%dir %attr(755, root, root) %{_libdir}/mysql %dir %attr(755, root, root) %{_libdir}/mysql
%{_includedir}/mysql/* %{_includedir}/mysql/*
%{_datadir}/aclocal/mysql.m4 %{_datadir}/aclocal/mysql.m4
%if %{WITH_LIBGCC}
%{_libdir}/mysql/libmygcc.a
%endif
%{_libdir}/mysql/libmysqlclient.a %{_libdir}/mysql/libmysqlclient.a
%{_libdir}/mysql/libmysqlclient_r.a %{_libdir}/mysql/libmysqlclient_r.a
%{_libdir}/mysql/libmysqlservices.a %{_libdir}/mysql/libmysqlservices.a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment