summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2013-12-11 09:50:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-14 09:11:16 +0000
commit22dec67bd0ca9783d0cca148561b674b3dc45898 (patch)
tree35e80903328249f8fd69f5a21cfcb9655b6e2dc5 /meta
parent1cc8a011c4fc32cb3ac6bc92bf938c1a85c658a1 (diff)
downloadpoky-22dec67bd0ca9783d0cca148561b674b3dc45898.tar.gz
perl: remove sysroot path leakage into packaged files
A grep in $D shows a lot of leakage which breaks things like CPAN: [koen@rrmbp image]$ grep sysroot . -rn | grep -v Binary ./usr/lib/perl/5.14.3/cacheout.pl:50:if (open(PARAM,'/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/sys/param.h')) { ./usr/lib/perl/5.14.3/CORE/pp.h:53:#undef SP /* Solaris 2.7 i386 has this in /build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/sys/reg.h */ ./usr/lib/perl/5.14.3/Config.pod:8076:used. Typically F</build/v2013.06/build/tmp>-angstrom_v2013_06-F<eglibc/sysroots/beaglebone/usr/include/string.h> or F</build/v2013.06/build/tmp>-angstrom_v2013_06-F<eglibc/sysroots/beaglebone/usr/include/strings.h>. ./usr/lib/perl/5.14.3/FileCache.pm:119: foreach my $param ( '/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/sys/param.h' ){ ./usr/lib/perl/5.14.3/Config.pm:87: archlibexp => '/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/lib/perl/5.14.3/', ./usr/lib/perl/5.14.3/Config.pm:89: cc => 'arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone', ./usr/lib/perl/5.14.3/Config.pm:101: full_ar => '/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/x86_64-linux/usr/bin/armv7ahf-vfp-neon-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-ar', ./usr/lib/perl/5.14.3/Config.pm:114: ld => 'arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone', ./usr/lib/perl/5.14.3/Config_heavy.pl:169:archlibexp='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/lib/perl/5.14.3/' ./usr/lib/perl/5.14.3/Config_heavy.pl:186:cc="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone" ./usr/lib/perl/5.14.3/Config_heavy.pl:191:ccname="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone" ./usr/lib/perl/5.14.3/Config_heavy.pl:245:cpprun="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone -E" ./usr/lib/perl/5.14.3/Config_heavy.pl:246:cppstdin="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone -E" ./usr/lib/perl/5.14.3/Config_heavy.pl:745:full_ar='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/x86_64-linux/usr/bin/armv7ahf-vfp-neon-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-ar' ./usr/lib/perl/5.14.3/Config_heavy.pl:927:ld="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone" ./usr/lib/perl/5.14.3/Config_heavy.pl:1167:strings='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/string.h' ./usr/lib/perl/5.14.3/Config_heavy.pl:1177:timeincl='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/sys/time.h /build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/time.h ' ./usr/lib/perl/5.14.3/Config_heavy.pl:1229:usrinc='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include' ./usr/lib/perl/5.14.3/ExtUtils/Liblist/Kid.pm:58: push(@libpath, "/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/lib"); ./usr/lib/perl/config.sh:56:archlibexp='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/lib/perl/5.14.3/' ./usr/lib/perl/config.sh:73:cc="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone" ./usr/lib/perl/config.sh:78:ccname="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone" ./usr/lib/perl/config.sh:100:cpprun="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone -E" ./usr/lib/perl/config.sh:101:cppstdin="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone -E" ./usr/lib/perl/config.sh:591:full_ar='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/x86_64-linux/usr/bin/armv7ahf-vfp-neon-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-ar' ./usr/lib/perl/config.sh:769:ld="arm-angstrom-linux-gnueabi-gcc -march=armv7-a -marm -mthumb-interwork -mfloat-abi=hard -mfpu=neon --sysroot=/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone" ./usr/lib/perl/config.sh:986:strings='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/string.h' ./usr/lib/perl/config.sh:996:timeincl='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/sys/time.h /build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include/time.h ' ./usr/lib/perl/config.sh:1042:usrinc='/build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/sysroots/beaglebone/usr/include' (From OE-Core rev: f689f9f905cb8bb07b57edb97d6116290bfbf9a9) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.3.bb18
1 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.14.3.bb b/meta/recipes-devtools/perl/perl_5.14.3.bb
index 1e14e17020..3829d4ba8c 100644
--- a/meta/recipes-devtools/perl/perl_5.14.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.3.bb
@@ -210,7 +210,6 @@ do_install() {
210 install config.sh ${D}${libdir}/perl 210 install config.sh ${D}${libdir}/perl
211 211
212 ln -s Config_heavy.pl ${D}${libdir}/perl/${PV}/Config_heavy-target.pl 212 ln -s Config_heavy.pl ${D}${libdir}/perl/${PV}/Config_heavy-target.pl
213
214} 213}
215 214
216do_install_append_class-nativesdk () { 215do_install_append_class-nativesdk () {
@@ -223,12 +222,14 @@ PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess"
223perl_package_preprocess () { 222perl_package_preprocess () {
224 # Fix up installed configuration 223 # Fix up installed configuration
225 sed -i -e "s,${D},,g" \ 224 sed -i -e "s,${D},,g" \
225 -e "s,--sysroot=${STAGING_DIR_HOST},,g" \
226 -e "s,-isystem${STAGING_INCDIR} ,,g" \ 226 -e "s,-isystem${STAGING_INCDIR} ,,g" \
227 -e "s,${STAGING_LIBDIR},${libdir},g" \ 227 -e "s,${STAGING_LIBDIR},${libdir},g" \
228 -e "s,${STAGING_BINDIR},${bindir},g" \ 228 -e "s,${STAGING_BINDIR},${bindir},g" \
229 -e "s,${STAGING_INCDIR},${includedir},g" \ 229 -e "s,${STAGING_INCDIR},${includedir},g" \
230 -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \ 230 -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
231 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ 231 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
232 -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \
232 ${PKGD}${bindir}/h2xs \ 233 ${PKGD}${bindir}/h2xs \
233 ${PKGD}${bindir}/h2ph \ 234 ${PKGD}${bindir}/h2ph \
234 ${PKGD}${bindir}/pod2man \ 235 ${PKGD}${bindir}/pod2man \
@@ -236,14 +237,17 @@ perl_package_preprocess () {
236 ${PKGD}${bindir}/pod2usage \ 237 ${PKGD}${bindir}/pod2usage \
237 ${PKGD}${bindir}/podchecker \ 238 ${PKGD}${bindir}/podchecker \
238 ${PKGD}${bindir}/podselect \ 239 ${PKGD}${bindir}/podselect \
239 ${PKGD}${libdir}/perl/${PV}/pod/*.pod \ 240 ${PKGD}${libdir}/perl/${PV}/CORE/config.h \
240 ${PKGD}${libdir}/perl/${PV}/cacheout.pl \ 241 ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \
241 ${PKGD}${libdir}/perl/${PV}/FileCache.pm \ 242 ${PKGD}${libdir}/perl/${PV}/CORE/pp.h \
242 ${PKGD}${libdir}/perl/config.sh \
243 ${PKGD}${libdir}/perl/${PV}/Config.pm \ 243 ${PKGD}${libdir}/perl/${PV}/Config.pm \
244 ${PKGD}${libdir}/perl/${PV}/Config.pod \
244 ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \ 245 ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \
245 ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \ 246 ${PKGD}${libdir}/perl/${PV}/ExtUtils/Liblist/Kid.pm \
246 ${PKGD}${libdir}/perl/${PV}/CORE/pp.h 247 ${PKGD}${libdir}/perl/${PV}/FileCache.pm \
248 ${PKGD}${libdir}/perl/${PV}/cacheout.pl \
249 ${PKGD}${libdir}/perl/${PV}/pod/*.pod \
250 ${PKGD}${libdir}/perl/config.sh
247} 251}
248 252
249PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \ 253PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \