| 1 |
commit: f9fcab9d2daaedb9623afc335e37028f24d91bcc |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 28 16:11:47 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 28 16:11:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f9fcab9d |
| 7 |
|
| 8 |
dev-db/mysql: Fix up warnings and errors |
| 9 |
|
| 10 |
Restore libressl sed on 5.5 |
| 11 |
Fix whitespace on 5.5 |
| 12 |
Remove unused option from 5.6 |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 15 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
| 16 |
|
| 17 |
dev-db/mysql/mysql-5.5.60-r1.ebuild | 13 ++++++++++++- |
| 18 |
dev-db/mysql/mysql-5.6.40-r1.ebuild | 1 - |
| 19 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-db/mysql/mysql-5.5.60-r1.ebuild b/dev-db/mysql/mysql-5.5.60-r1.ebuild |
| 22 |
index 6b499b3..36a1e5f 100644 |
| 23 |
--- a/dev-db/mysql/mysql-5.5.60-r1.ebuild |
| 24 |
+++ b/dev-db/mysql/mysql-5.5.60-r1.ebuild |
| 25 |
@@ -10,7 +10,7 @@ SUBSLOT="18" |
| 26 |
inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build |
| 27 |
|
| 28 |
SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz |
| 29 |
- https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz" |
| 30 |
+ https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz" |
| 31 |
# Gentoo patches to MySQL |
| 32 |
if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then |
| 33 |
SRC_URI="${SRC_URI} |
| 34 |
@@ -189,6 +189,16 @@ src_prepare() { |
| 35 |
echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die |
| 36 |
fi |
| 37 |
|
| 38 |
+ # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux |
| 39 |
+ if [[ -d "${S}/support-files/SELinux" ]] ; then |
| 40 |
+ echo > "${S}/support-files/SELinux/CMakeLists.txt" || die |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
+ if use libressl ; then |
| 44 |
+ sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
| 45 |
+ "${S}/cmake/ssl.cmake" || die |
| 46 |
+ fi |
| 47 |
+ |
| 48 |
local plugin |
| 49 |
local server_plugins=( semisync ) |
| 50 |
local test_plugins=( audit_null daemon_example fulltext ) |
| 51 |
@@ -206,6 +216,7 @@ src_prepare() { |
| 52 |
|
| 53 |
# Don't build example |
| 54 |
_disable_engine example |
| 55 |
+ _disable_engine ndb |
| 56 |
|
| 57 |
cmake-utils_src_prepare |
| 58 |
} |
| 59 |
|
| 60 |
diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild |
| 61 |
index b26f7d2..f91b13d 100644 |
| 62 |
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild |
| 63 |
+++ b/dev-db/mysql/mysql-5.6.40-r1.ebuild |
| 64 |
@@ -326,7 +326,6 @@ src_configure(){ |
| 65 |
|
| 66 |
# Storage engines |
| 67 |
mycmakeargs+=( |
| 68 |
- -DWITH_EXAMPLE_STORAGE_ENGINE=0 |
| 69 |
-DWITH_ARCHIVE_STORAGE_ENGINE=1 |
| 70 |
-DWITH_BLACKHOLE_STORAGE_ENGINE=1 |
| 71 |
-DWITH_CSV_STORAGE_ENGINE=1 |
Archives