diff --git a/component/percona-toolkit/buildout.cfg b/component/percona-toolkit/buildout.cfg index ef68fbaadc36cc1ba7556c7d2642321f900001eb..6542ff6eb2f1547b86fe6ad048d52c85f19bb2a1 100644 --- a/component/percona-toolkit/buildout.cfg +++ b/component/percona-toolkit/buildout.cfg @@ -2,7 +2,7 @@ extends = ../perl/buildout.cfg ../perl-DBI/buildout.cfg - ../perl-DBD-mariadb/buildout.cfg + ../perl-DBD-MySQL/buildout.cfg parts = percona-toolkit diff --git a/component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch b/component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch deleted file mode 100644 index 10370c7d52c682b0b9322223ac1e7ff61472541a..0000000000000000000000000000000000000000 --- a/component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- DBD-mysql-4.019.back/Makefile.PL 2011-05-09 03:12:07.000000000 +0200 -+++ DBD-mysql-4.019/Makefile.PL 2011-06-22 11:44:06.478371893 +0200 -@@ -358,7 +358,14 @@ - 'Data::Dumper' => 0 }; - } - --ExtUtils::MakeMaker::WriteMakefile(%o); -+ -+my %config; -+if (defined($ENV{'OTHERLDFLAGS'})) { -+ $config{dynamic_lib} = { OTHERLDFLAGS => " $ENV{'OTHERLDFLAGS'} " }; -+} -+ -+ -+ExtUtils::MakeMaker::WriteMakefile(%o, %config); - exit 0; - - - diff --git a/component/perl-DBD-MySQL/buildout.cfg b/component/perl-DBD-MySQL/buildout.cfg index 64a2a34e45ffb8096dfcfc008a0aeca3f2bbc640..8ac04afae5f75053fb3f35ce7fd5f9af63c4e89a 100644 --- a/component/perl-DBD-MySQL/buildout.cfg +++ b/component/perl-DBD-MySQL/buildout.cfg @@ -1,22 +1,32 @@ [buildout] extends = ../mysql-tritonn-5.0/buildout.cfg + ../mariadb/buildout.cfg parts = perl-DBD-MySQL -[perl-DBD-MySQL] +[perl-DBD-MySQL-common] recipe = slapos.recipe.cmmi -version = 4.019 depends = ${perl:version} ${perl-DBI:version} -url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz -md5sum = 566d98ab8ffac9626a31f6f6d455558e +url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.027.tar.gz +md5sum = 11fa6449715ba9d3fa5f4ee5ae688d6f patches = - ${:_profile_base_location_}/DBD-mysql-4.019.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc + ${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03 patch-options = -p1 + +[perl-DBD-MySQL] +<= perl-DBD-MySQL-common configure-command = ${perl:location}/bin/perl Makefile.PL --mysql_config=${mysql-tritonn-5.0:location}/bin/mysql_config environment = OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib + +[perl-DBD-mariadb] +<= perl-DBD-MySQL-common +configure-command = + ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config +environment = + OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib diff --git a/component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch b/component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch deleted file mode 100644 index 10370c7d52c682b0b9322223ac1e7ff61472541a..0000000000000000000000000000000000000000 --- a/component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- DBD-mysql-4.019.back/Makefile.PL 2011-05-09 03:12:07.000000000 +0200 -+++ DBD-mysql-4.019/Makefile.PL 2011-06-22 11:44:06.478371893 +0200 -@@ -358,7 +358,14 @@ - 'Data::Dumper' => 0 }; - } - --ExtUtils::MakeMaker::WriteMakefile(%o); -+ -+my %config; -+if (defined($ENV{'OTHERLDFLAGS'})) { -+ $config{dynamic_lib} = { OTHERLDFLAGS => " $ENV{'OTHERLDFLAGS'} " }; -+} -+ -+ -+ExtUtils::MakeMaker::WriteMakefile(%o, %config); - exit 0; - - - diff --git a/component/perl-DBD-mariadb/buildout.cfg b/component/perl-DBD-mariadb/buildout.cfg deleted file mode 100644 index 093d3e24293ce9e7f55a56b66d441fe66865f4a9..0000000000000000000000000000000000000000 --- a/component/perl-DBD-mariadb/buildout.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[buildout] -extends = - ../mariadb/buildout.cfg - -parts = - perl-DBD-mariadb - -[perl-DBD-mariadb] -recipe = slapos.recipe.cmmi -version = 4.019 -# binary library should be rebuilt when perl is updated. -depends = - ${mariadb:version} - ${perl:version} - ${perl:revision} - ${perl-DBI:version} -url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz -md5sum = 566d98ab8ffac9626a31f6f6d455558e -patches = - ${:_profile_base_location_}/DBD-mysql-4.019.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc -patch-options = -p1 -configure-command = - ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config -environment = - OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib