[gentoo-commits] repo/gentoo:master commit in: eclass/

[Brian Evans]

commit:     4db353aa3ab0c41c887d3d745c6cd792c2a97351
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 18:31:39 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 18:31:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db353aa

eclass/mysql-multilib-r1: Ignore building SELinux policies for mysqld_safe wrt 
#607928

 eclass/mysql-multilib-r1.eclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index ebf89f2..b787542 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -319,12 +319,10 @@ mysql-multilib-r1_src_prepare() {
        if in_iuse tokudb ; then
                # Don't build bundled xz-utils
                if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-                       rm -f 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-                       touch 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+                       echo > 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
                        sed -i 's/ build_lzma//' 
"${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
                elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-                       rm 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-                       touch 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+                       echo > 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
                        sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' 
"${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
                        sed -i -e 
's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' 
"${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
                fi
@@ -340,6 +338,11 @@ mysql-multilib-r1_src_prepare() {
                rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not 
remove packaged groonga"
        fi
 
+       # Remove the centos and rhel selinux policies to support mysqld_safe 
under SELinux
+       if [[ -d "${S}/support-files/SELinux" ]] ; then
+               echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+       fi
+
        if [[ "${EAPI}x" == "5x" ]] ; then
                epatch_user
        else