diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-10-19 14:53:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-24 17:27:14 +0100 |
commit | 5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f (patch) | |
tree | 5b7867dec533d001ce29d8bf7b4869299cea254f /meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff | |
parent | 53f7342562a66d1b14ecee234aa76be07951dedc (diff) | |
download | poky-5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f.tar.gz |
perl: upgrade from 5.12.3 to 5.14.2
parallel build fix patches are not needed as they are upstream now.
Got a new set of debian patch set for 5.14.2
perl-rpdepends: fix the autogenerated rdepends mistakes
take out some mdoules which are not going to be built.
[Saul Wold: Remove debug]
(From OE-Core rev: 8dc5f118832a4aca906239ffed82f72497c37f8e)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff new file mode 100644 index 0000000000..ff07ec567d --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff | |||
@@ -0,0 +1,34 @@ | |||
1 | From 0d1acf7af6da3a3f933faba8459ad9ff03fe3e5b Mon Sep 17 00:00:00 2001 | ||
2 | From: Brendan O'Dea <bod@debian.org> | ||
3 | Date: Fri, 16 Dec 2005 01:32:14 +1100 | ||
4 | Subject: Remove overly restrictive DB_File version check. | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/340047 | ||
7 | |||
8 | Package dependencies ensure the correct library is linked at run-time. | ||
9 | |||
10 | Patch-Name: debian/db_file_ver.diff | ||
11 | --- | ||
12 | cpan/DB_File/version.c | 2 ++ | ||
13 | 1 files changed, 2 insertions(+), 0 deletions(-) | ||
14 | |||
15 | diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c | ||
16 | index e01f6f6..544e6ee 100644 | ||
17 | --- a/cpan/DB_File/version.c | ||
18 | +++ b/cpan/DB_File/version.c | ||
19 | @@ -48,6 +48,7 @@ __getBerkeleyDBInfo() | ||
20 | |||
21 | (void)db_version(&Major, &Minor, &Patch) ; | ||
22 | |||
23 | +#ifndef DEBIAN | ||
24 | /* Check that the versions of db.h and libdb.a are the same */ | ||
25 | if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR ) | ||
26 | /* || Patch != DB_VERSION_PATCH) */ | ||
27 | @@ -55,6 +56,7 @@ __getBerkeleyDBInfo() | ||
28 | croak("\nDB_File was build with libdb version %d.%d.%d,\nbut you are attempting to run it with libdb version %d.%d.%d\n", | ||
29 | DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, | ||
30 | Major, Minor, Patch) ; | ||
31 | +#endif /* DEBIAN */ | ||
32 | |||
33 | /* check that libdb is recent enough -- we need 2.3.4 or greater */ | ||
34 | if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4))) | ||