diff options
| author |   Tomas Mozes <hydrapolic@gmail.com> | 2017-10-25 17:07:43 +0200 |
|---|---|---|
| committer |   Amy Liffey <amynka@gentoo.org> | 2017-10-25 20:48:40 +0200 |
| commit | 772b80658ebe20d659319d68d521254725e37a13 (patch) | |
| tree | b8302b2609312e25ec27540e7b765bdd2d21b4ee | |
| parent | dev-perl/Sys-CpuLoad: Add w/ version 0.30.0 (diff) | |
| download | gentoo-772b80658ebe20d659319d68d521254725e37a13.tar.gz gentoo-772b80658ebe20d659319d68d521254725e37a13.tar.bz2 gentoo-772b80658ebe20d659319d68d521254725e37a13.zip | |
dev-db/mydumper: do not use mariadb server headers (bug #635176)
Closes: #6049
Closes: https://bugs.gentoo.org/635176
Package-Manager: Portage-2.3.12, Repoman-2.3.3
| -rw-r--r-- | dev-db/mydumper/files/mydumper-mariadb-define.patch | 28 | ||||
| -rw-r--r-- | dev-db/mydumper/files/mydumper-mariadb-include-fix.patch | 24 | ||||
| -rw-r--r-- | dev-db/mydumper/mydumper-0.9.3-r1.ebuild (renamed from dev-db/mydumper/mydumper-0.9.3.ebuild) | 2 |
3 files changed, 29 insertions, 25 deletions
diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch new file mode 100644 index 000000000000..ee39a33be818 --- /dev/null +++ b/dev-db/mydumper/files/mydumper-mariadb-define.patch @@ -0,0 +1,28 @@ +--- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000 ++++ b/mydumper.c 2017-10-25 14:53:46.614729185 +0000 +@@ -22,6 +22,11 @@ + #define _FILE_OFFSET_BITS 64 + + #include <mysql.h> ++ ++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION ++ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR ++#endif ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> +--- a/myloader.c 2017-09-07 14:53:02.000000000 +0000 ++++ b/myloader.c 2017-10-25 14:55:34.677729185 +0000 +@@ -19,6 +19,11 @@ + #define _FILE_OFFSET_BITS 64 + + #include <mysql.h> ++ ++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION ++ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR ++#endif ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> diff --git a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch deleted file mode 100644 index 0914b3acff6a..000000000000 --- a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000 -+++ b/mydumper.c 2017-10-06 17:39:34.962315949 +0000 -@@ -22,6 +22,9 @@ - #define _FILE_OFFSET_BITS 64 - - #include <mysql.h> -+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID) -+ #include <server/mysql_version.h> -+#endif - #include <unistd.h> - #include <stdio.h> - #include <string.h> ---- a/myloader.c 2017-09-07 14:53:02.000000000 +0000 -+++ b/myloader.c 2017-10-06 17:39:28.962315949 +0000 -@@ -19,6 +19,9 @@ - #define _FILE_OFFSET_BITS 64 - - #include <mysql.h> -+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID) -+ #include <server/mysql_version.h> -+#endif - #include <unistd.h> - #include <stdio.h> - #include <string.h> diff --git a/dev-db/mydumper/mydumper-0.9.3.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild index b4970ec03bf0..f95deef1be62 100644 --- a/dev-db/mydumper/mydumper-0.9.3.ebuild +++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild @@ -23,7 +23,7 @@ DEPEND="${CDEPEND} doc? ( dev-python/sphinx )" RDEPEND="${CDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-mariadb-include-fix.patch" ) +PATCHES=( "${FILESDIR}/${PN}-mariadb-define.patch" ) src_prepare() { # respect user cflags; do not expand ${CMAKE_C_FLAGS} (!) |