diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-04-01 02:20:41 +0200 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-04-01 02:20:41 +0200 |
| commit | ee85029bbcdf3fa61b5ced1b77da986e2fad6f67 (patch) | |
| tree | 06f536f93b0e7834e093f74066c9c7437de74ae4 /support-files | |
| parent | 910e84216d4777bc377eb158fa2f126037ad1ab3 (diff) | |
| download | mariadb-git-ee85029bbcdf3fa61b5ced1b77da986e2fad6f67.tar.gz | |
Try some more fixes.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 1960a187931..f74fb894cf0 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -68,6 +68,9 @@ %undefine __perl_provides %undefine __perl_requires +# Set default +%global WITH_LIBGCC 0 + ############################################################################## # Command line handling ############################################################################## @@ -397,26 +400,14 @@ RBR=$RPM_BUILD_ROOT mkdir -p $RBR%{_libdir}/mysql # For gcc builds, include libgcc.a in the devel subpackage (BUG 4921) -# Some "icc" calls may have "gcc" in the argument string, so we should first -# check for "icc". (If we don't check, the "--print-libgcc-file" call will fail.) -if expr "$CC" : ".*icc.*" > /dev/null ; -then - %global WITH_LIBGCC 0 - : -elif expr "$CC" : ".*gcc.*" > /dev/null ; +if "$CC" --version | grep '(GCC)' >/dev/null 2>&1 then libgcc=`$CC $CFLAGS --print-libgcc-file` if [ -f $libgcc ] then - %global WITH_LIBGCC 1 + %define WITH_LIBGCC 1 install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a - else - %global WITH_LIBGCC 0 - : fi -else - %global WITH_LIBGCC 0 - : fi ############################################################################## @@ -464,6 +455,10 @@ touch $RBR%{_sysconfdir}/my.cnf install -m 644 "%{malloc_lib_source}" "$RBR%{_libdir}/mysql/%{malloc_lib_target}" %endif +# Remove man pages we explicitly do not want to package, avoids 'unpackaged +# files' warning. +rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1* + ############################################################################## # Post processing actions, i.e. when installed ############################################################################## |