summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:56:17 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:56:17 +0000
commit7acfa9467f7acb4d15663ed81b46cc88fd1bd6a8 (patch)
treedf62c5b38a72b8f2b654e6d17ed1204763c26ce7
parent5c0111cb9db0162d111eed41540de6a702b68e58 (diff)
downloadpoky-7acfa9467f7acb4d15663ed81b46cc88fd1bd6a8.tar.gz
perl: Standardise config.sh location
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/cpan-base.bbclass2
-rw-r--r--meta/classes/cpan.bbclass4
-rw-r--r--meta/classes/cpan_build.bbclass2
-rw-r--r--meta/packages/perl/perl-native_5.8.8.bb6
-rw-r--r--meta/packages/perl/perl.inc4
-rw-r--r--meta/packages/perl/perl_5.8.8.bb5
6 files changed, 12 insertions, 11 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 919a9b06a5..82fd5b459a 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
10# Determine the staged version of perl from the perl configuration file 10# Determine the staged version of perl from the perl configuration file
11def get_perl_version(d): 11def get_perl_version(d):
12 import re 12 import re
13 cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d) 13 cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
14 try: 14 try:
15 f = open(cfg, 'r') 15 f = open(cfg, 'r')
16 except IOError: 16 except IOError:
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index ca5303d97f..66054bc755 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -10,11 +10,13 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
10 10
11# Env var which tells perl where the perl include files are 11# Env var which tells perl where the perl include files are
12export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" 12export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
13export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
14export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
13 15
14cpan_do_configure () { 16cpan_do_configure () {
15 yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} 17 yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
16 if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then 18 if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
17 . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh 19 . ${STAGING_LIBDIR}/perl/config.sh
18 if [ "${IS_NEW_PERL}" = "yes" ]; then 20 if [ "${IS_NEW_PERL}" = "yes" ]; then
19 sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ 21 sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
20 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ 22 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 9cfe72bcb7..6cac85c5fe 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -22,7 +22,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
22cpan_build_do_configure () { 22cpan_build_do_configure () {
23 if [ ${@is_target(d)} == "yes" ]; then 23 if [ ${@is_target(d)} == "yes" ]; then
24 # build for target 24 # build for target
25 . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh 25 . ${STAGING_LIBDIR}/perl/config.sh
26 if [ "${IS_NEW_PERL}" = "yes" ]; then 26 if [ "${IS_NEW_PERL}" = "yes" ]; then
27 perl Build.PL --installdirs vendor \ 27 perl Build.PL --installdirs vendor \
28 --destdir ${D} \ 28 --destdir ${D} \
diff --git a/meta/packages/perl/perl-native_5.8.8.bb b/meta/packages/perl/perl-native_5.8.8.bb
index e2bdaee30a..fb8be281bf 100644
--- a/meta/packages/perl/perl-native_5.8.8.bb
+++ b/meta/packages/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "Artistic|GPL" 4LICENSE = "Artistic|GPL"
5DEPENDS = "virtual/db-native gdbm-native" 5DEPENDS = "virtual/db-native gdbm-native"
6PR = "r13" 6PR = "r14"
7 7
8SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ 8SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
9 file://perl-5.8.8-gcc-4.2.patch;patch=1 \ 9 file://perl-5.8.8-gcc-4.2.patch;patch=1 \
@@ -61,8 +61,8 @@ do_stage_append() {
61 # We need a hostperl link for building perl 61 # We need a hostperl link for building perl
62 ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl 62 ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl
63 # Store native config in non-versioned directory 63 # Store native config in non-versioned directory
64 install -d ${STAGING_DIR}/${HOST_SYS}/perl 64 install -d ${STAGING_LIBDIR}/perl
65 install config.sh ${STAGING_DIR}/${HOST_SYS}/perl 65 install config.sh ${STAGING_LIBDIR}/perl
66} 66}
67 67
68PARALLEL_MAKE = "" 68PARALLEL_MAKE = ""
diff --git a/meta/packages/perl/perl.inc b/meta/packages/perl/perl.inc
index 9e20ae63e6..15ae55cf17 100644
--- a/meta/packages/perl/perl.inc
+++ b/meta/packages/perl/perl.inc
@@ -36,8 +36,8 @@ do_install() {
36} 36}
37 37
38do_stage() { 38do_stage() {
39 install -d ${STAGING_DIR}/${HOST_SYS}/perl/ 39 install -d ${STAGING_LIBDIR}/perl/
40 install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ 40 install config.sh ${STAGING_LIBDIR}/perl/
41} 41}
42 42
43PACKAGES_DYNAMIC = "perl-module-*" 43PACKAGES_DYNAMIC = "perl-module-*"
diff --git a/meta/packages/perl/perl_5.8.8.bb b/meta/packages/perl/perl_5.8.8.bb
index 977852ac21..0696de577f 100644
--- a/meta/packages/perl/perl_5.8.8.bb
+++ b/meta/packages/perl/perl_5.8.8.bb
@@ -137,11 +137,10 @@ do_install() {
137 fi 137 fi
138} 138}
139do_stage() { 139do_stage() {
140 install -d ${STAGING_DIR}/${HOST_SYS}/perl \ 140 install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV} \
141 ${STAGING_LIBDIR_NATIVE}/perl/${PV} \
142 ${STAGING_LIBDIR}/perl/${PV}/CORE 141 ${STAGING_LIBDIR}/perl/${PV}/CORE
143 # target config, used by cpan.bbclass to extract version information 142 # target config, used by cpan.bbclass to extract version information
144 install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ 143 install config.sh ${STAGING_LIBDIR}/perl/
145 # target configuration, used by native perl when cross-compiling 144 # target configuration, used by native perl when cross-compiling
146 install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl 145 install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl
147 # perl shared library headers 146 # perl shared library headers