rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix building with relro and PIE

Browse Source
This commit is contained in:
Honza Horák 2013-04-25 18:30:48 +02:00
parent bd951ae9c8
commit 654bf004ca
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
community-mysql.spec
View File

@ -1,6 +1,6 @@
Name: community-mysql Name: community-mysql
Version: 5.5.31 Version: 5.5.31
Release: 3%{?dist} Release: 4%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
Group: Applications/Databases Group: Applications/Databases
@ -14,9 +14,6 @@ License: GPLv2 with exceptions and LGPLv2 and BSD
# Regression tests take a long time, you can skip 'em with this # Regression tests take a long time, you can skip 'em with this
%{!?runselftest:%global runselftest 1} %{!?runselftest:%global runselftest 1}
# Build with -fPIE and -z now
%global _hardened_build 1
# Upstream has a mirror redirector for downloads, so the URL is hard to # Upstream has a mirror redirector for downloads, so the URL is hard to
# represent statically. You can get the tarball by following a link from # represent statically. You can get the tarball by following a link from
# http://dev.mysql.com/downloads/mysql/ # http://dev.mysql.com/downloads/mysql/
@ -285,6 +282,9 @@ CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
%endif %endif
CXXFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"
export CFLAGS CXXFLAGS export CFLAGS CXXFLAGS
# building with PIE
LDFLAGS="$LDFLAGS -pie"
export LDFLAGS
# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
# so we can't use %%{_datadir} and so forth here. # so we can't use %%{_datadir} and so forth here.
@ -311,7 +311,8 @@ cmake . -DBUILD_CONFIG=mysql_release \
-DWITH_EMBEDDED_SERVER=ON \ -DWITH_EMBEDDED_SERVER=ON \
-DWITH_READLINE=ON \ -DWITH_READLINE=ON \
-DWITH_SSL=system \ -DWITH_SSL=system \
-DWITH_ZLIB=system -DWITH_ZLIB=system \
-DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now"
make %{?_smp_mflags} VERBOSE=1 make %{?_smp_mflags} VERBOSE=1
@ -701,6 +702,9 @@ install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/my
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Fri Apr 26 2013 Honza Horak <hhorak@redhat.com> 5.5.31-4
- Fix building with relro and PIE
* Thu Apr 25 2013 Honza Horak <hhorak@redhat.com> 5.5.31-3 * Thu Apr 25 2013 Honza Horak <hhorak@redhat.com> 5.5.31-3
- Fix paths in -plugin-test patch - Fix paths in -plugin-test patch