Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos
Commits
48cd5d8b
Commit
48cd5d8b
authored
May 10, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up : perl-DBD-MySQLQ 4.027. cleanup.
parent
62f91b7e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
69 deletions
+16
-69
component/percona-toolkit/buildout.cfg
component/percona-toolkit/buildout.cfg
+1
-1
component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch
component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch
+0
-19
component/perl-DBD-MySQL/buildout.cfg
component/perl-DBD-MySQL/buildout.cfg
+15
-5
component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch
...onent/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch
+0
-19
component/perl-DBD-mariadb/buildout.cfg
component/perl-DBD-mariadb/buildout.cfg
+0
-25
No files found.
component/percona-toolkit/buildout.cfg
View file @
48cd5d8b
...
...
@@ -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
...
...
component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch
deleted
100644 → 0
View file @
62f91b7e
--- 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;
component/perl-DBD-MySQL/buildout.cfg
View file @
48cd5d8b
[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.0
19
.tar.gz
md5sum =
566d98ab8ffac9626a31f6f6d455558e
url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.0
27
.tar.gz
md5sum =
11fa6449715ba9d3fa5f4ee5ae688d6f
patches =
${:_profile_base_location_}/DBD-mysql-4.0
19.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc
${:_profile_base_location_}/DBD-mysql-4.0
27.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
component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch
deleted
100644 → 0
View file @
62f91b7e
--- 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;
component/perl-DBD-mariadb/buildout.cfg
deleted
100644 → 0
View file @
62f91b7e
[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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment