summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-07-01 11:51:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-01 23:27:25 +0100
commit46c11ac20e226a1ebb3947ae948339ab16e6dbc9 (patch)
tree85ff80f4d9d2196a17b58712780ed7818cee93b2 /meta
parentffc7ca72c53a7908f8d8bb3597cc8cfdf058bf88 (diff)
downloadpoky-46c11ac20e226a1ebb3947ae948339ab16e6dbc9.tar.gz
perl: Fix package qa rpath warnings.
Fix these kinds of Package QA warnings before they are converted into fetal errors: WARNING: QA Issue: package perl-module-compress contains bad RPATH /build_disk/poky_build/build0/tmp/sysroots/qemux86/usr/lib in file /build_disk/poky_build/build0/tmp/work/i586-poky-linux/perl-5.12.3-r1/packages-split/perl-module-compress/usr/lib/perl/5.12.3/auto/Compress/Raw/Zlib/Zlib.so This fixes this warning for perl recipe as well as libxml-parser-perl recipe. It is a fix to MakeMaker within perl, so all such perl recipes will get fixed with this perl fix. (From OE-Core rev: a67e0c0e01a22718a617a82f54575b77928249ee) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.3/fix_bad_rpath.patch25
-rw-r--r--meta/recipes-devtools/perl/perl_5.12.3.bb6
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/fix_bad_rpath.patch b/meta/recipes-devtools/perl/perl-5.12.3/fix_bad_rpath.patch
new file mode 100644
index 0000000000..7b99857c17
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.3/fix_bad_rpath.patch
@@ -0,0 +1,25 @@
1Upstream-Status:Inappropriate [embedded specific]
2Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
32011/07/01
4
5Fix these Package QA warnings before they are converted into fetal errors:
6
7WARNING: QA Issue: package perl-module-compress contains bad RPATH /build_disk/poky_build/build0/tmp/sysroots/qemux86/usr/lib in file /build_disk/poky_build/build0/tmp/work/i586-poky-linux/perl-5.12.3-r1/packages-split/perl-module-compress/usr/lib/perl/5.12.3/auto/Compress/Raw/Zlib/Zlib.so
8
9This fixes this warning for perl recipe as well as libxml-parser-perl recipe.
10It is a fix to MakeMaker within perl, so all such perl recipes will get
11fixed with this perl fix.
12
13Index: perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
14===================================================================
15--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
16+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
17@@ -54,7 +54,7 @@ sub _unix_os2_ext {
18 my($found) = 0;
19
20 # Debian-specific: don't use LD_RUN_PATH for standard dirs
21- $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
22+ $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib SYSROOTLIB);
23
24 foreach my $thislib (split ' ', $potential_libs) {
25
diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb
index b0534825b4..850eef21c2 100644
--- a/meta/recipes-devtools/perl/perl_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.3.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
8# We need gnugrep (for -I) 8# We need gnugrep (for -I)
9DEPENDS = "virtual/db grep-native" 9DEPENDS = "virtual/db grep-native"
10DEPENDS += "gdbm zlib" 10DEPENDS += "gdbm zlib"
11PR = "r1" 11PR = "r2"
12 12
13# 5.10.1 has Module::Build built-in 13# 5.10.1 has Module::Build built-in
14PROVIDES += "libmodule-build-perl" 14PROVIDES += "libmodule-build-perl"
@@ -68,6 +68,7 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
68 file://native-perlinc.patch \ 68 file://native-perlinc.patch \
69 file://perl-enable-gdbm.patch \ 69 file://perl-enable-gdbm.patch \
70 file://cross-generate_uudmap.patch \ 70 file://cross-generate_uudmap.patch \
71 file://fix_bad_rpath.patch \
71 \ 72 \
72 file://config.sh \ 73 file://config.sh \
73 file://config.sh-32 \ 74 file://config.sh-32 \
@@ -178,7 +179,8 @@ do_configure() {
178do_compile() { 179do_compile() {
179 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL 180 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
180 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in 181 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in
181 sed -i -e 's|/usr/lib|${STAGING_LIBDIR}|g' cpan/Compress-Raw-Zlib/config.in 182 sed -i -e 's|/usr/lib|""|g' cpan/Compress-Raw-Zlib/config.in
183 sed -i -e 's|SYSROOTLIB|${STAGING_LIBDIR}|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
182 184
183 cd Cross 185 cd Cross
184 oe_runmake perl LD="${CCLD}" 186 oe_runmake perl LD="${CCLD}"