commit: f2b6b0f0106efe89395009da132bca115984dfd7 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Sun Sep 27 15:39:41 2015 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Sun Sep 27 15:39:41 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b6b0f0
dev-perl/DBD-mysql: Fix compilation with embedded USE flag wrt bug #560314 Package-Manager: portage-2.2.20.1 dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild | 4 ++++ dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild | 4 ++++ .../files/DBD-mysql-print_embedded_options.patch | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) 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 339d0c6..d9af44c 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 d6bc3e4..a6c1c39 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 0000000..d205b43 --- /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]); + }