summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-08-23 02:16:24 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-08-23 02:24:13 +0200
commit5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29 (patch)
tree5a39f657d1d07071f1fb21c736d0757cc03d7c76 /dev-db/mysql-connector-c
parentsci-mathematics/rstudio: Fix #692728 dep webkit -> webengine (diff)
downloadgentoo-5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29.tar.gz
gentoo-5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29.tar.bz2
gentoo-5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29.zip
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 <whissi@gentoo.org>
Diffstat (limited to 'dev-db/mysql-connector-c')
-rw-r--r--dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch24
-rw-r--r--dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild (renamed from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild)1
2 files changed, 25 insertions, 0 deletions
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 <mysql/udf_registration_types.h>
++#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 <mysql/udf_registration_types.h>
++#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
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
)