1 |
commit: f2b6b0f0106efe89395009da132bca115984dfd7 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 27 15:39:41 2015 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 27 15:39:41 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b6b0f0 |
7 |
|
8 |
dev-perl/DBD-mysql: Fix compilation with embedded USE flag wrt bug #560314 |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild | 4 ++++ |
13 |
dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild | 4 ++++ |
14 |
.../files/DBD-mysql-print_embedded_options.patch | 20 ++++++++++++++++++++ |
15 |
3 files changed, 28 insertions(+) |
16 |
|
17 |
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild |
18 |
index 339d0c6..d9af44c 100644 |
19 |
--- a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild |
20 |
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild |
21 |
@@ -25,6 +25,10 @@ else |
22 |
SRC_TEST="skip" |
23 |
fi |
24 |
|
25 |
+src_prepare() { |
26 |
+ epatch "${FILESDIR}"/${PN}-print_embedded_options.patch |
27 |
+} |
28 |
+ |
29 |
src_configure() { |
30 |
if use test; then |
31 |
myconf="${myconf} --testdb=test \ |
32 |
|
33 |
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild |
34 |
index d6bc3e4..a6c1c39 100644 |
35 |
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild |
36 |
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild |
37 |
@@ -25,6 +25,10 @@ else |
38 |
SRC_TEST="skip" |
39 |
fi |
40 |
|
41 |
+src_prepare() { |
42 |
+ epatch "${FILESDIR}"/${PN}-print_embedded_options.patch |
43 |
+} |
44 |
+ |
45 |
src_configure() { |
46 |
if use test; then |
47 |
myconf="${myconf} --testdb=test \ |
48 |
|
49 |
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch b/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch |
50 |
new file mode 100644 |
51 |
index 0000000..d205b43 |
52 |
--- /dev/null |
53 |
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch |
54 |
@@ -0,0 +1,20 @@ |
55 |
+diff -ubBr old/dbdimp.c new/dbdimp.c |
56 |
+--- old/dbdimp.c 2015-09-12 17:52:41.328543844 -0400 |
57 |
++++ new/dbdimp.c 2015-09-12 23:21:52.848371578 -0400 |
58 |
+@@ -443,14 +443,14 @@ |
59 |
+ Print out embbedded option settings |
60 |
+ |
61 |
+ */ |
62 |
+-int print_embedded_options(char ** options_list, int options_count) |
63 |
++int print_embedded_options(PerlIOl ** Log, char ** options_list, int options_count) |
64 |
+ { |
65 |
+ int i; |
66 |
+ |
67 |
+ for (i=0; i<options_count; i++) |
68 |
+ { |
69 |
+ if (options_list[i]) |
70 |
+- PerlIO_printf(DBILOGFP, |
71 |
++ PerlIO_printf(Log, |
72 |
+ "Embedded server, parameter[%d]=%s\n", |
73 |
+ i, options_list[i]); |
74 |
+ } |