| 1 |
commit: a69704c313996267099dfa3c72041d003d951b9a |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 23 14:38:00 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 23 14:38:11 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69704c3 |
| 7 |
|
| 8 |
dev-db/mariadb: drop perror.1 sed workaround |
| 9 |
|
| 10 |
sed call no longer works after upstream changes [Link 1]. |
| 11 |
|
| 12 |
We are now patching CMakeLists.txt directly as part of our |
| 13 |
|
| 14 |
cmake: build without client libs and tools |
| 15 |
|
| 16 |
patch. |
| 17 |
|
| 18 |
Link 1: https://github.com/MariaDB/server/commit/5271d43648957141b55159958b66fd635d80ac85 |
| 19 |
Link 2: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fd815cdb09de08a302b80746fd40c65d30d69e |
| 20 |
|
| 21 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 22 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 23 |
|
| 24 |
dev-db/mariadb/mariadb-10.1.45.ebuild | 1 - |
| 25 |
dev-db/mariadb/mariadb-10.2.32.ebuild | 1 - |
| 26 |
dev-db/mariadb/mariadb-10.3.23.ebuild | 1 - |
| 27 |
dev-db/mariadb/mariadb-10.4.13.ebuild | 1 - |
| 28 |
4 files changed, 4 deletions(-) |
| 29 |
|
| 30 |
diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild |
| 31 |
index 5b6926dcb64..7997e608949 100644 |
| 32 |
--- a/dev-db/mariadb/mariadb-10.1.45.ebuild |
| 33 |
+++ b/dev-db/mariadb/mariadb-10.1.45.ebuild |
| 34 |
@@ -270,7 +270,6 @@ src_prepare() { |
| 35 |
|
| 36 |
# Don't clash with dev-db/mysql-connector-c |
| 37 |
sed -i -e 's/ my_print_defaults.1//' \ |
| 38 |
- -e 's/ perror.1//' \ |
| 39 |
"${S}"/man/CMakeLists.txt || die |
| 40 |
|
| 41 |
cmake-utils_src_prepare |
| 42 |
|
| 43 |
diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild |
| 44 |
index 78c9b964743..021ce65734e 100644 |
| 45 |
--- a/dev-db/mariadb/mariadb-10.2.32.ebuild |
| 46 |
+++ b/dev-db/mariadb/mariadb-10.2.32.ebuild |
| 47 |
@@ -277,7 +277,6 @@ src_prepare() { |
| 48 |
|
| 49 |
# Don't clash with dev-db/mysql-connector-c |
| 50 |
sed -i -e 's/ my_print_defaults.1//' \ |
| 51 |
- -e 's/ perror.1//' \ |
| 52 |
"${S}"/man/CMakeLists.txt || die |
| 53 |
|
| 54 |
# Fix galera_recovery.sh script |
| 55 |
|
| 56 |
diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild |
| 57 |
index 3e0a6b1ad7b..eca052d1216 100644 |
| 58 |
--- a/dev-db/mariadb/mariadb-10.3.23.ebuild |
| 59 |
+++ b/dev-db/mariadb/mariadb-10.3.23.ebuild |
| 60 |
@@ -288,7 +288,6 @@ src_prepare() { |
| 61 |
|
| 62 |
# Don't clash with dev-db/mysql-connector-c |
| 63 |
sed -i -e 's/ my_print_defaults.1//' \ |
| 64 |
- -e 's/ perror.1//' \ |
| 65 |
"${S}"/man/CMakeLists.txt || die |
| 66 |
|
| 67 |
# Fix galera_recovery.sh script |
| 68 |
|
| 69 |
diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild |
| 70 |
index bc071222e2a..036c71ff86b 100644 |
| 71 |
--- a/dev-db/mariadb/mariadb-10.4.13.ebuild |
| 72 |
+++ b/dev-db/mariadb/mariadb-10.4.13.ebuild |
| 73 |
@@ -280,7 +280,6 @@ src_prepare() { |
| 74 |
|
| 75 |
# Don't clash with dev-db/mysql-connector-c |
| 76 |
sed -i -e 's/ my_print_defaults.1//' \ |
| 77 |
- -e 's/ perror.1//' \ |
| 78 |
"${S}"/man/CMakeLists.txt || die |
| 79 |
|
| 80 |
# Fix galera_recovery.sh script |
Archives