1 |
commit: 5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 23 00:16:24 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 23 00:24:13 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfeaff0 |
7 |
|
8 |
dev-db/mysql-connector-c: Use relative include path for udf_registration_types.h |
9 |
|
10 |
Closes: https://bugs.gentoo.org/692644 |
11 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
...include-path-for-udf_registration_types-h.patch | 24 ++++++++++++++++++++++ |
15 |
...2.ebuild => mysql-connector-c-8.0.17-r3.ebuild} | 1 + |
16 |
2 files changed, 25 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..8fabd9952cc |
21 |
--- /dev/null |
22 |
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch |
23 |
@@ -0,0 +1,24 @@ |
24 |
+https://bugs.gentoo.org/692644 |
25 |
+ |
26 |
+--- a/include/mysql.h.pp |
27 |
++++ b/include/mysql.h.pp |
28 |
+@@ -175,7 +175,7 @@ struct rand_struct { |
29 |
+ unsigned long seed1, seed2, max_value; |
30 |
+ double max_value_dbl; |
31 |
+ }; |
32 |
+-#include <mysql/udf_registration_types.h> |
33 |
++#include "mysql/udf_registration_types.h" |
34 |
+ enum Item_result { |
35 |
+ INVALID_RESULT = -1, |
36 |
+ STRING_RESULT = 0, |
37 |
+--- a/include/mysql_com.h |
38 |
++++ b/include/mysql_com.h |
39 |
+@@ -1002,7 +1002,7 @@ struct rand_struct { |
40 |
+ }; |
41 |
+ |
42 |
+ /* Include the types here so existing UDFs can keep compiling */ |
43 |
+-#include <mysql/udf_registration_types.h> |
44 |
++#include "mysql/udf_registration_types.h" |
45 |
+ |
46 |
+ /** |
47 |
+ @addtogroup group_cs_compresson_constants Constants when using compression |
48 |
|
49 |
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 |
50 |
similarity index 96% |
51 |
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild |
52 |
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild |
53 |
index 3eb18955b0b..f705146ace5 100644 |
54 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild |
55 |
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild |
56 |
@@ -41,6 +41,7 @@ S="${WORKDIR}/mysql-${PV}" |
57 |
|
58 |
PATCHES=( |
59 |
"${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch |
60 |
+ "${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch |
61 |
"${FILESDIR}"/${PN}-8.0.17-libressl.patch |
62 |
) |