| 1 |
commit: 4db353aa3ab0c41c887d3d745c6cd792c2a97351 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 1 18:31:39 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 18:31:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db353aa |
| 7 |
|
| 8 |
eclass/mysql-multilib-r1: Ignore building SELinux policies for mysqld_safe wrt #607928 |
| 9 |
|
| 10 |
eclass/mysql-multilib-r1.eclass | 11 +++++++---- |
| 11 |
1 file changed, 7 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 14 |
index ebf89f2..b787542 100644 |
| 15 |
--- a/eclass/mysql-multilib-r1.eclass |
| 16 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 17 |
@@ -319,12 +319,10 @@ mysql-multilib-r1_src_prepare() { |
| 18 |
if in_iuse tokudb ; then |
| 19 |
# Don't build bundled xz-utils |
| 20 |
if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then |
| 21 |
- rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die |
| 22 |
- touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die |
| 23 |
+ echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die |
| 24 |
sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die |
| 25 |
elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then |
| 26 |
- rm "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die |
| 27 |
- touch "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die |
| 28 |
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die |
| 29 |
sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die |
| 30 |
sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die |
| 31 |
fi |
| 32 |
@@ -340,6 +338,11 @@ mysql-multilib-r1_src_prepare() { |
| 33 |
rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" |
| 34 |
fi |
| 35 |
|
| 36 |
+ # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux |
| 37 |
+ if [[ -d "${S}/support-files/SELinux" ]] ; then |
| 38 |
+ echo > "${S}/support-files/SELinux/CMakeLists.txt" || die |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
if [[ "${EAPI}x" == "5x" ]] ; then |
| 42 |
epatch_user |
| 43 |
else |
Archives