summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2015-09-27 18:39:41 +0300
committerMikle Kolyada <zlogene@gentoo.org>2015-09-27 18:39:41 +0300
commitf2b6b0f0106efe89395009da132bca115984dfd7 (patch)
tree9addb2e08f0ca4d1bb58034000931d1b8f96970a /dev-perl/DBD-mysql
parentdev-perl/DBD-mysql: Version bump (diff)
downloadgentoo-f2b6b0f0106efe89395009da132bca115984dfd7.tar.gz
gentoo-f2b6b0f0106efe89395009da132bca115984dfd7.tar.bz2
gentoo-f2b6b0f0106efe89395009da132bca115984dfd7.zip
dev-perl/DBD-mysql: Fix compilation with embedded USE flag wrt bug #560314
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-perl/DBD-mysql')
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild4
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild4
-rw-r--r--dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch20
3 files changed, 28 insertions, 0 deletions
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild
index 339d0c61e22b..d9af44cf6a57 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild
@@ -25,6 +25,10 @@ else
SRC_TEST="skip"
fi
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-print_embedded_options.patch
+}
+
src_configure() {
if use test; then
myconf="${myconf} --testdb=test \
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild
index d6bc3e4a6452..a6c1c3999e21 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild
@@ -25,6 +25,10 @@ else
SRC_TEST="skip"
fi
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-print_embedded_options.patch
+}
+
src_configure() {
if use test; then
myconf="${myconf} --testdb=test \
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
new file mode 100644
index 000000000000..d205b43f33ec
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch
@@ -0,0 +1,20 @@
+diff -ubBr old/dbdimp.c new/dbdimp.c
+--- old/dbdimp.c 2015-09-12 17:52:41.328543844 -0400
++++ new/dbdimp.c 2015-09-12 23:21:52.848371578 -0400
+@@ -443,14 +443,14 @@
+ Print out embbedded option settings
+
+ */
+-int print_embedded_options(char ** options_list, int options_count)
++int print_embedded_options(PerlIOl ** Log, char ** options_list, int options_count)
+ {
+ int i;
+
+ for (i=0; i<options_count; i++)
+ {
+ if (options_list[i])
+- PerlIO_printf(DBILOGFP,
++ PerlIO_printf(Log,
+ "Embedded server, parameter[%d]=%s\n",
+ i, options_list[i]);
+ }