diff options
Diffstat (limited to 'dev-db/mydumper')
| -rw-r--r-- | dev-db/mydumper/Manifest | 4 | ||||
| -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 |
4 files changed, 31 insertions, 27 deletions
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest index 2efcf3f1785b..759a5b3d256c 100644 --- a/dev-db/mydumper/Manifest +++ b/dev-db/mydumper/Manifest @@ -1,8 +1,8 @@ -AUX mydumper-mariadb-include-fix.patch 696 SHA256 b7c2998f31453360d1891e10856210e98672055ecf81b9133eda22564c90af53 SHA512 e4343f00f0f61d63ec8621d42537411158a995e624562f71d322357a7322b46aef8859252e8b8c5c51370247ff70d2cb5187ff33be56e964e54a2e392124fc7c WHIRLPOOL edca806761d639eee3f671dd400ff3d60b5ec66b46b998e7ae771cd21b3eca5bec46aa586505c7062bc8ff2aa8e4fc3ecf0e23fb4b2478878fb82c7944183457 +AUX mydumper-mariadb-define.patch 766 SHA256 3a8df19403d426fe4a42747cea0c165971933037e2861f0b18ce310ad4359e14 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53 WHIRLPOOL 8b899b5e9c8def712ee08b9b0b31620fef49f5d6b1150092d0d380fe458068ed917b7556cb730c5411817ae6d4d2e2332d6985905147c71a429e688a673d52aa DIST mydumper-0.6.2.tar.gz 40165 SHA256 fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330 SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83 WHIRLPOOL 867b7efa6ca00dcfbb32f5dda2b63de038d0da3ac1a127059cbfdae9af577fef74868c38dad2bd5b5a9b4de76f7d108fcb6232b27c41d3062f413eac4cac843b DIST mydumper-0.9.3.tar.gz 45320 SHA256 2cd6a074bac7072905bd044ec20955c53c81b10e877ac9c644509940a8d201fb SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898 WHIRLPOOL 09988aa314ede6e56ce82c6eade9d29770ca2cbc39d4b2f1cd3f8403f9521e1aa5a372fda7992885c1c25743cc59d4c41cdce8d86eb79b8c7725631c2919c9ae EBUILD mydumper-0.6.2.ebuild 949 SHA256 d5de40f9acb0ff0b489b81a763e494d4d3831f7798bde1aa1492d4ed38c9aba2 SHA512 4b5078ef47b20819915e187121d1ff42e31d910e515ab1ec70289fdc775b48ff2da50bd549cb9fbe526dd453b9d09bd5631da12206bb254613a6ed4c0f5d7818 WHIRLPOOL 5886604cbeb5eb0a11aa33365fb00cfecbcd79d60db8f39f72dc816c4f4271a42bf06481057a5f6845c710a20e529ad827e6b07a362fa8fab1f31e195a617d8c -EBUILD mydumper-0.9.3.ebuild 1030 SHA256 452452ce20ac7136f8b77d7310197dd728dc2a9432757d4bbffdf92167deaa40 SHA512 9d0514b4d1690855c8e828ee29e767410ab19f6726f10eb381c9bed0a0c42e63fa7eed88fc278e532d951f49652d0675d839e3d14c650eb352831cd5f7eacccf WHIRLPOOL 60584b90fec8bc5bc1c3c28eaa6767862923410f17612d7ca7c2e6f9e36c8b7bef090b79ce6650bd18e4db891b23aab2bb050d21286ebdbce5331f1cc6cdeea8 +EBUILD mydumper-0.9.3-r1.ebuild 1025 SHA256 6f234c291bafd0e79feb96f217915479ed8d84e04efec0556a363d1238114306 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a WHIRLPOOL 392642348de86a4ce5a996b2b25a0fb4268531e15c89350be0dd1766454b81bb74450db850f40d1e8a6a4f8262d3f4de29e4753fab13eed95b227d67374025cf MISC ChangeLog 2725 SHA256 d1ecaf2b0c71e99c461f83588d14e73b773277a4aecf10aeda571f84b4a342f8 SHA512 c9eb636071b042ccae43a5b8af330dfed81f2547467931146ad66a360fae0c058abcab3d9a18451d8e5d323c92fe5c8db1e4325b7b76c54477df94cf290a91c6 WHIRLPOOL ef094c02e8427ec6fcaf2e10b6e10e6dd8eb2045b69831de35711398607e28eaaf5b5c0ac76af0d6040602201c799208901f8c24bb75356614f6d2fbb00d7a41 MISC ChangeLog-2015 1534 SHA256 c65362f5aafb0d2cafc22db7177e28dce95edd3f8bf5d38711440872c3e72c0e SHA512 e269d766dbba9ce8913397f4321d30545bb06e58042619eed88d2de19d69c9f21ec1a0146cc10e9226e6b6394d5b37469754ae1d27cf33a4ddf93a15f1d6ff9b WHIRLPOOL 6640ffed60e7253d2373db39d26c6459803387b55ffa10483d8ce0c69fbb697630e5e33f77904bb5c7e6b8c8c02b317ecf8541d3c958612792e8ed14979a88f3 MISC metadata.xml 448 SHA256 f67c25fe06defd93c231d0c47d8c25dc1b9e9209f3ce8ab50e2b5b3c5da8e9a8 SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353 WHIRLPOOL bf616b518dbc668cbc7d3bc41955253dcca574778a96268bfc8474995b7e658e282fea428940c1e465b7d31d2c9444d7bd3f027febbc13b91b208e8c1b5b51b2 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} (!) |