summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-06-22 20:05:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-01 15:39:58 +0100
commitd61804d923e07db592f446955f5bc29690241000 (patch)
tree15da3a3db004cd96329ee8d47f67ca5e46eaf007 /meta
parentae4e9de7c4626517e76d3bf8fc251af9807b3661 (diff)
downloadpoky-d61804d923e07db592f446955f5bc29690241000.tar.gz
perl: fix for ODBM_File.so
Fixed for test case ../ext/ODBM_File/t/odbm.t: ok 1 - use ODBM_File; ok 2 - use Fcntl; ./perl: symbol lookup error: /usr/lib/perl/5.22.0/auto/ODBM_File/ODBM_File.so: undefined symbol: dbminit The checking "if -e $_.'/libgdbm_compat.so'" doesn't work when cross build, so always link libgdbm_compat, since perl depends on gdbm and we always have libgdbm_compat. (From OE-Core rev: 942fb460339c9771e40d2e1bc36ac09b0ac39821) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch35
-rw-r--r--meta/recipes-devtools/perl/perl_5.22.0.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch b/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
new file mode 100644
index 0000000000..994ef7013c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
@@ -0,0 +1,35 @@
1From ba4ed0b5b7baad5353c1e65b655f41d45e01c990 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 22 Jun 2015 20:00:11 -0700
4Subject: [PATCH] ext/ODBM_File/hints/linux.pl: link libgdbm_compat
5
6Fixed for test case ../ext/ODBM_File/t/odbm.t:
7ok 1 - use ODBM_File;
8ok 2 - use Fcntl;
9./perl: symbol lookup error: /usr/lib/perl/5.22.0/auto/ODBM_File/ODBM_File.so: undefined symbol: dbminit
10
11The checking "if -e $_.'/libgdbm_compat.so'" doesn't work when cross
12build, so always link libgdbm_compat, since perl depends on gdbm and we
13always have libgdbm_compat.
14
15Upstream-Status:Inappropriate [embedded specific]
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18---
19 ext/ODBM_File/hints/linux.pl | 6 ------
20 1 file changed, 6 deletions(-)
21
22diff --git a/ext/ODBM_File/hints/linux.pl b/ext/ODBM_File/hints/linux.pl
23index 204bba0..9271b45 100644
24--- a/ext/ODBM_File/hints/linux.pl
25+++ b/ext/ODBM_File/hints/linux.pl
26@@ -1,8 +1,2 @@
27 # uses GDBM dbm compatibility feature - at least on SuSE 8.0
28-$self->{LIBS} = ['-lgdbm'];
29-
30-# Debian/Ubuntu have libgdbm_compat.so but not this file,
31-# so linking may fail
32-foreach (split / /, $Config{libpth}) {
33- $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
34-}
35+$self->{LIBS} = ['-lgdbm -lgdbm_compat'];
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb
index da3dba6ebb..7c7041475f 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -59,6 +59,7 @@ SRC_URI += " \
59 file://config.sh-64-be \ 59 file://config.sh-64-be \
60 file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \ 60 file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
61 file://t-run-switches.t-perl5-perl.patch \ 61 file://t-run-switches.t-perl5-perl.patch \
62 file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \
62" 63"
63 64
64# Fix test case issues 65# Fix test case issues