From 5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 23 Aug 2019 02:16:24 +0200 Subject: [PATCH] dev-db/mysql-connector-c: Use relative include path for udf_registration_types.h Closes: https://bugs.gentoo.org/692644 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann --- ...de-path-for-udf_registration_types-h.patch | 24 +++++++++++++++++++ ...ild => mysql-connector-c-8.0.17-r3.ebuild} | 1 + 2 files changed, 25 insertions(+) create mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch rename dev-db/mysql-connector-c/{mysql-connector-c-8.0.17-r2.ebuild => mysql-connector-c-8.0.17-r3.ebuild} (96%) diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch new file mode 100644 index 000000000000..8fabd9952cc4 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/692644 + +--- a/include/mysql.h.pp ++++ b/include/mysql.h.pp +@@ -175,7 +175,7 @@ struct rand_struct { + unsigned long seed1, seed2, max_value; + double max_value_dbl; + }; +-#include ++#include "mysql/udf_registration_types.h" + enum Item_result { + INVALID_RESULT = -1, + STRING_RESULT = 0, +--- a/include/mysql_com.h ++++ b/include/mysql_com.h +@@ -1002,7 +1002,7 @@ struct rand_struct { + }; + + /* Include the types here so existing UDFs can keep compiling */ +-#include ++#include "mysql/udf_registration_types.h" + + /** + @addtogroup group_cs_compresson_constants Constants when using compression diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild similarity index 96% rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild index 3eb18955b0bf..f705146ace58 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild @@ -41,6 +41,7 @@ S="${WORKDIR}/mysql-${PV}" PATCHES=( "${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch + "${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch "${FILESDIR}"/${PN}-8.0.17-libressl.patch ) -- 2.26.2