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

Install correct headers (server, not client) - MDEV-13370

Browse Source
This commit is contained in:
Adam Williamson 2017-07-21 14:56:38 -07:00
parent bb731eb481
commit b97399acb9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mariadb.spec
View File

@ -126,7 +126,7 @@
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
Release: 4%{?with_debug:.debug}%{?dist} Release: 5%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -766,7 +766,13 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
%endif %endif
%install %install
make DESTDIR=%{buildroot} install # CMAKE_INSTALL_ALWAYS is a bit of a hacky workaround for
# https://jira.mariadb.org/browse/MDEV-13370 ; it assumes that
# include/ gets installed *after* libmariadb/include/ , if that
# ever gets reversed, it will do exactly the wrong thing. Make sure
# the mysql.h that ultimately gets installed is the one from include/
# not the one from libmariadb/include/ .
make DESTDIR=%{buildroot} CMAKE_INSTALL_ALWAYS=1 install
# multilib header support # multilib header support
for header in mysql/my_config.h mysql/private/config.h; do for header in mysql/my_config.h mysql/private/config.h; do
@ -1427,6 +1433,9 @@ fi
%endif %endif
%changelog %changelog
* Fri Jul 21 2017 Adam Williamson <awilliam@redhat.com> - 3:10.2.7-5
- Install correct headers (server, not client) - MDEV-13370
* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 3:10.2.7-4 * Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 3:10.2.7-4
- Rebuilt for s390x binutils bug - Rebuilt for s390x binutils bug