summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-01 15:51:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commite73deac6dc7861c64ced49d2a35f781d655db79a (patch)
treedf7352dd791d9714ef62d4a6a87b64e2a90903e2 /meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff
parent93d77b6ca83e55f3ecbc09f5502d8ae928f2bd91 (diff)
downloadpoky-e73deac6dc7861c64ced49d2a35f781d655db79a.tar.gz
perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0
Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff
new file mode 100644
index 0000000000..9557560a1c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff
@@ -0,0 +1,34 @@
1From 4da39e2ce6c5a510409c2da1c7b24e0e7ff87f31 Mon Sep 17 00:00:00 2001
2From: Brendan O'Dea <bod@debian.org>
3Date: Fri, 16 Dec 2005 01:32:14 +1100
4Subject: Remove overly restrictive DB_File version check.
5
6Bug-Debian: http://bugs.debian.org/340047
7
8Package dependencies ensure the correct library is linked at run-time.
9
10Patch-Name: debian/db_file_ver.diff
11---
12 cpan/DB_File/version.c | 2 ++
13 1 file changed, 2 insertions(+)
14
15diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c
16index 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)))