mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

perl: Standardise config.sh location

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-11-16 10:56:17 +00:00
parent 5c0111cb9d
commit 7acfa9467f
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/cpan-base.bbclass
View File

@@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
# Determine the staged version of perl from the perl configuration file # Determine the staged version of perl from the perl configuration file
def get_perl_version(d): def get_perl_version(d):
import re import re
cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d) cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
try: try:
f = open(cfg, 'r') f = open(cfg, 'r')
except IOError: except IOError:

4
meta/classes/cpan.bbclass
View File

@@ -10,11 +10,13 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
# Env var which tells perl where the perl include files are # Env var which tells perl where the perl include files are
export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
cpan_do_configure () { cpan_do_configure () {
yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh . ${STAGING_LIBDIR}/perl/config.sh
if [ "${IS_NEW_PERL}" = "yes" ]; then if [ "${IS_NEW_PERL}" = "yes" ]; then
sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \

2
meta/classes/cpan_build.bbclass
View File

@@ -22,7 +22,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
cpan_build_do_configure () { cpan_build_do_configure () {
if [ ${@is_target(d)} == "yes" ]; then if [ ${@is_target(d)} == "yes" ]; then
# build for target # build for target
. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh . ${STAGING_LIBDIR}/perl/config.sh
if [ "${IS_NEW_PERL}" = "yes" ]; then if [ "${IS_NEW_PERL}" = "yes" ]; then
perl Build.PL --installdirs vendor \ perl Build.PL --installdirs vendor \
--destdir ${D} \ --destdir ${D} \

6
meta/packages/perl/perl-native_5.8.8.bb
View File

@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
SECTION = "libs" SECTION = "libs"
LICENSE = "Artistic|GPL" LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native" DEPENDS = "virtual/db-native gdbm-native"
PR = "r13" PR = "r14"
SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://perl-5.8.8-gcc-4.2.patch;patch=1 \ file://perl-5.8.8-gcc-4.2.patch;patch=1 \
@@ -61,8 +61,8 @@ do_stage_append() {
# We need a hostperl link for building perl # We need a hostperl link for building perl
ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl
# Store native config in non-versioned directory # Store native config in non-versioned directory
install -d ${STAGING_DIR}/${HOST_SYS}/perl install -d ${STAGING_LIBDIR}/perl
install config.sh ${STAGING_DIR}/${HOST_SYS}/perl install config.sh ${STAGING_LIBDIR}/perl
} }
PARALLEL_MAKE = "" PARALLEL_MAKE = ""

4
meta/packages/perl/perl.inc
View File

@@ -36,8 +36,8 @@ do_install() {
} }
do_stage() { do_stage() {
install -d ${STAGING_DIR}/${HOST_SYS}/perl/ install -d ${STAGING_LIBDIR}/perl/
install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ install config.sh ${STAGING_LIBDIR}/perl/
} }
PACKAGES_DYNAMIC = "perl-module-*" PACKAGES_DYNAMIC = "perl-module-*"

5
meta/packages/perl/perl_5.8.8.bb
View File

@@ -137,11 +137,10 @@ do_install() {
fi fi
} }
do_stage() { do_stage() {
install -d ${STAGING_DIR}/${HOST_SYS}/perl \ install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV} \
${STAGING_LIBDIR_NATIVE}/perl/${PV} \
${STAGING_LIBDIR}/perl/${PV}/CORE ${STAGING_LIBDIR}/perl/${PV}/CORE
# target config, used by cpan.bbclass to extract version information # target config, used by cpan.bbclass to extract version information
install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ install config.sh ${STAGING_LIBDIR}/perl/
# target configuration, used by native perl when cross-compiling # target configuration, used by native perl when cross-compiling
install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl
# perl shared library headers # perl shared library headers