Commit 1f5ce2fb authored by Jonathan Perkin's avatar Jonathan Perkin

Actually, move the libgcc stuff to %install where it belongs.

parent d8883b8d
Branches unavailable
Tags unavailable
No related merge requests found
......@@ -398,18 +398,6 @@ RBR=$RPM_BUILD_ROOT
# Clean up the BuildRoot first
[ "$RBR" != "/" ] && [ -d "$RBR" ] && rm -rf "$RBR";
# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921)
if "$CC" --version | grep '(GCC)' >/dev/null 2>&1
then
libgcc=`$CC $CFLAGS --print-libgcc-file`
if [ -f $libgcc ]
then
%define WITH_LIBGCC 1
mkdir -p $RBR%{_libdir}
install -m 644 $libgcc $RBR%{_libdir}/libmygcc.a
fi
fi
##############################################################################
%install
......@@ -431,6 +419,17 @@ install -d $RBR%{_sbindir}
make DESTDIR=$RBR install
)
# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921)
if "$CC" --version | grep '(GCC)' >/dev/null 2>&1
then
libgcc=`$CC $CFLAGS --print-libgcc-file`
if [ -f $libgcc ]
then
%define WITH_LIBGCC 1
install -m 644 $libgcc $RBR%{_libdir}/libmygcc.a
fi
fi
# Install logrotate and autostart
install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
......
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