summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-05-05 11:28:10 +0200
committerKoen Kooi <koen@openembedded.org>2010-05-05 11:32:28 +0200
commit90760a78fd930f2d66cae9dd4e467df408443ed6 (patch)
tree5677a1cac54f00b2f2e145ed9a3527574aa36ca1
parent37f967dd9bbd92e53c0f6c44eaa3abdcf6946f2a (diff)
perl-native: attempt to repair staging, bump PR
this should make things work again after http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=12c5d82663ff4436f4d979b4de1d4475694c7b9f
-rw-r--r--recipes/perl/perl-native_5.10.1.bb14
-rw-r--r--recipes/perl/perl-native_5.8.8.bb14
2 files changed, 14 insertions, 14 deletions
diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/perl-native_5.10.1.bb
index b5db0d126b..aec8339015 100644
--- a/recipes/perl/perl-native_5.10.1.bb
+++ b/recipes/perl/perl-native_5.10.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native"
-PR = "r1"
+PR = "r2"
NATIVE_INSTALL_WORKS = "1"
# Not tested enough
@@ -71,13 +71,13 @@ do_install() {
oe_runmake DESTDIR="${D}" install.perl
# We need a hostperl link for building perl
- ln -sf ${D}${STAGING_BINDIR_NATIVE}/perl${PV} ${D}${STAGING_BINDIR_NATIVE}/hostperl
+ ln -sf perl${PV} ${D}${bindir}/hostperl
# Store native config in non-versioned directory
- install -d ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \
+ install -d ${D}${libdir}/perl/${PV}/CORE \
${D}${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils
install config.sh ${D}${STAGING_LIBDIR}/perl
# target configuration
- install lib/Config.pm ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/
+ install lib/Config.pm ${D}${libdir}/perl/${PV}/
install lib/ExtUtils/xsubpp ${D}${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/
install lib/ExtUtils/typemap ${D}${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/
# perl shared library headers
@@ -90,15 +90,15 @@ do_install() {
nostdio.h overload.h parser.h perlapi.h perlvars.h util.h \
dosish.h form.h iperlsys.h opcode.h perl.h perly.h regcomp.h \
thread.h warnings.h; do
- install $i ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE
+ install $i ${D}${libdir}/perl/${PV}/CORE
done
# Fix Errno.pm for target builds
- sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/Errno.pm
+ sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${D}${libdir}/perl/${PV}/Errno.pm
}
do_install_append_nylon() {
# get rid of definitions not supported by the gcc version we use for nylon...
- for i in ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${D}${STAGING_LIBDIR}/perl/config.sh; do
+ for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${STAGING_LIBDIR}/perl/config.sh; do
perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
done
}
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index 85b666a436..e8706e8f24 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native"
-PR = "r17"
+PR = "r18"
NATIVE_INSTALL_WORKS = "1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
@@ -68,15 +68,15 @@ do_install() {
oe_runmake DESTDIR="${D}" install.perl
# We need a hostperl link for building perl
- ln -sf ${D}${STAGING_BINDIR_NATIVE}/perl${PV} ${D}${STAGING_BINDIR_NATIVE}/hostperl
+ ln -sf perl${PV} ${D}${bindir}/hostperl
# Store native config in non-versioned directory
- install -d ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \
+ install -d ${D}${libdir}/perl/${PV}/CORE \
${D}${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils
install config.sh ${D}${STAGING_LIBDIR}/perl
# Fix Errno.pm for target builds
- sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/Errno.pm
+ sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${D}${libdir}/perl/${PV}/Errno.pm
# target configuration
- install lib/Config.pm ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/
+ install lib/Config.pm ${D}${libdir}/perl/${PV}/
install lib/ExtUtils/typemap ${D}${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/
# perl shared library headers
for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \
@@ -88,13 +88,13 @@ do_install() {
nostdio.h perlapi.h perlvars.h reentr.inc thrdvar.h util.h \
dosish.h form.h iperlsys.h opcode.h perl.h perly.h regcomp.h \
thread.h warnings.h; do
- install $i ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE
+ install $i ${D}${libdir}/perl/${PV}/CORE
done
}
do_install_append_nylon() {
# get rid of definitions not supported by the gcc version we use for nylon...
- for i in ${D}${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${D}${STAGING_LIBDIR}/perl/config.sh; do
+ for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${STAGING_LIBDIR}/perl/config.sh; do
perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
done
}