Bugfix update to 4.0.28
Fix for different parameters between mysql_config versions (MariaDB vs MySQL)
This commit is contained in:
parent
1881adc15f
commit
856c5bfd04
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.40 2014/09/13 18:09:20 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.41 2014/12/06 14:26:44 giovanni Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= MySQL drivers for the Perl DBI
|
||||
|
||||
DISTNAME= DBD-mysql-4.027
|
||||
REVISION= 0
|
||||
DISTNAME= DBD-mysql-4.028
|
||||
CATEGORIES= databases
|
||||
|
||||
MAINTAINER= Giovanni Bechis <giovanni@openbsd.org>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (DBD-mysql-4.027.tar.gz) = LgDx61giqgl7MQID/2Ed1jX50ADbnffOHosEk8CCvkE=
|
||||
SIZE (DBD-mysql-4.027.tar.gz) = 137476
|
||||
SHA256 (DBD-mysql-4.028.tar.gz) = WEKySv/avOixcSL5EM1bWyU78mbX5QhK9d9CSFI4Ee0=
|
||||
SIZE (DBD-mysql-4.028.tar.gz) = 138614
|
||||
|
@ -1,7 +1,45 @@
|
||||
$OpenBSD: patch-Makefile_PL,v 1.2 2014/07/11 14:11:12 giovanni Exp $
|
||||
--- Makefile.PL.orig Thu Jul 10 21:43:40 2014
|
||||
+++ Makefile.PL Thu Jul 10 21:44:05 2014
|
||||
@@ -175,15 +175,6 @@ for my $key (sort { $a cmp $b} keys %$opt)
|
||||
$OpenBSD: patch-Makefile_PL,v 1.3 2014/12/06 14:26:44 giovanni Exp $
|
||||
|
||||
remove MariaDB mysql_config invalid options
|
||||
|
||||
--- Makefile.PL.orig Wed Jul 30 00:14:24 2014
|
||||
+++ Makefile.PL Thu Nov 20 17:26:17 2014
|
||||
@@ -19,23 +19,9 @@ our $opt = { "help" => \&Usage, };
|
||||
Getopt::Long::GetOptions(
|
||||
$opt,
|
||||
"help",
|
||||
- "testdb=s",
|
||||
- "testhost=s",
|
||||
- "testport=s",
|
||||
- "testuser=s",
|
||||
- "testpassword=s",
|
||||
- "testsocket=s",
|
||||
"cflags=s",
|
||||
"libs=s",
|
||||
- "verbose",
|
||||
- "ps-protocol",
|
||||
- "bind-type-guessing",
|
||||
- "nocatchstderr",
|
||||
- "ssl!",
|
||||
- "nofoundrows!",
|
||||
- "embedded=s",
|
||||
"mysql_config=s",
|
||||
- "force-embedded",
|
||||
"with-mysql=s"
|
||||
) || die Usage();
|
||||
|
||||
@@ -78,9 +64,7 @@ MSG
|
||||
$opt->{'mysql_config'} = "mysql_config";
|
||||
}
|
||||
|
||||
-for my $key (qw/testdb testhost testuser testpassword testsocket testport
|
||||
- cflags embedded libs nocatchstderr ssl nofoundrows
|
||||
- ps-protocol bind-type-guessing force-embedded/)
|
||||
+for my $key (qw/cflags embedded libs/)
|
||||
{
|
||||
Configure($opt, $source, $key);
|
||||
}
|
||||
@@ -175,15 +159,6 @@ for my $key (sort { $a cmp $b} keys %$opt)
|
||||
$key, $source->{$key}, $opt->{$key})
|
||||
}
|
||||
|
||||
@ -17,3 +55,19 @@ $OpenBSD: patch-Makefile_PL,v 1.2 2014/07/11 14:11:12 giovanni Exp $
|
||||
eval { require File::Spec };
|
||||
my $dsn= '';
|
||||
if (exists $opt->{'ps-protocol'}) {
|
||||
@@ -430,7 +405,6 @@ it can be found):
|
||||
mysql_config --cflags
|
||||
mysql_config --libs
|
||||
mysql_config --embedded
|
||||
- mysql_config --testdb
|
||||
|
||||
and so on. See DBD::mysql::INSTALL for details.
|
||||
USAGE
|
||||
@@ -467,6 +441,7 @@ sub Configure {
|
||||
}
|
||||
|
||||
# First try to get options values from mysql_config
|
||||
+
|
||||
my $command = $opt->{'mysql_config'} . " --$param";
|
||||
eval
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user