diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-05-23 16:38:00 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-05-23 16:38:11 +0200 |
| commit | a69704c313996267099dfa3c72041d003d951b9a (patch) | |
| tree | 33ba4438f71b77164b27832d2e22dcbf376b3ff5 | |
| parent | dev-db/mariadb: update patch set to avoid collision with perror.1 (diff) | |
| download | gentoo-a69704c3.tar.gz gentoo-a69704c3.tar.bz2 gentoo-a69704c3.zip | |
dev-db/mariadb: drop perror.1 sed workaround
sed call no longer works after upstream changes [Link 1].
We are now patching CMakeLists.txt directly as part of our
cmake: build without client libs and tools
patch.
Link 1: https://github.com/MariaDB/server/commit/5271d43648957141b55159958b66fd635d80ac85
Link 2: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fd815cdb09de08a302b80746fd40c65d30d69e
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | dev-db/mariadb/mariadb-10.1.45.ebuild | 1 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.32.ebuild | 1 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.3.23.ebuild | 1 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.4.13.ebuild | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild index 5b6926dcb645..7997e6089495 100644 --- a/dev-db/mariadb/mariadb-10.1.45.ebuild +++ b/dev-db/mariadb/mariadb-10.1.45.ebuild @@ -270,7 +270,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die cmake-utils_src_prepare diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild index 78c9b9647437..021ce65734e6 100644 --- a/dev-db/mariadb/mariadb-10.2.32.ebuild +++ b/dev-db/mariadb/mariadb-10.2.32.ebuild @@ -277,7 +277,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die # Fix galera_recovery.sh script diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild index 3e0a6b1ad7bc..eca052d12161 100644 --- a/dev-db/mariadb/mariadb-10.3.23.ebuild +++ b/dev-db/mariadb/mariadb-10.3.23.ebuild @@ -288,7 +288,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die # Fix galera_recovery.sh script diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild index bc071222e2a6..036c71ff86bc 100644 --- a/dev-db/mariadb/mariadb-10.4.13.ebuild +++ b/dev-db/mariadb/mariadb-10.4.13.ebuild @@ -280,7 +280,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die # Fix galera_recovery.sh script |