dev-perl/DBD-mysql: Fix compilation with embedded USE flag wrt bug #560314
authorMikle Kolyada <zlogene@gentoo.org>
Sun, 27 Sep 2015 15:39:41 +0000 (18:39 +0300)
committerMikle Kolyada <zlogene@gentoo.org>
Sun, 27 Sep 2015 15:39:41 +0000 (18:39 +0300)
Package-Manager: portage-2.2.20.1

dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild
dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild
dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch [new file with mode: 0644]

index 339d0c61e22b7631d34fca043eec727f4c893da8..d9af44cf6a57d16273afe09992aca11f7bc513a7 100644 (file)
@@ -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 \
index d6bc3e4a6452598d099e6d657c7ebb2d99457e90..a6c1c3999e217ad0d7e0a4a2c714d34953ce78f1 100644 (file)
@@ -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 (file)
index 0000000..d205b43
--- /dev/null
@@ -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]);
+   }