diff options
Diffstat (limited to 'packages/perl')
| -rw-r--r-- | packages/perl/libxml-parser-perl-native_2.34.bb | 3 | ||||
| -rw-r--r-- | packages/perl/perl-native_5.8.4.bb | 6 | ||||
| -rw-r--r-- | packages/perl/perl-native_5.8.7.bb | 6 | ||||
| -rw-r--r-- | packages/perl/perl_5.8.4.bb | 2 | ||||
| -rw-r--r-- | packages/perl/perl_5.8.7.bb | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb index be4ddc6da0..55bae665b5 100644 --- a/packages/perl/libxml-parser-perl-native_2.34.bb +++ b/packages/perl/libxml-parser-perl-native_2.34.bb @@ -1,4 +1,5 @@ SECTION = "libs" -include libxml-parser-perl_${PV}.bb +require libxml-parser-perl_${PV}.bb inherit native DEPENDS = "perl-native expat-native" +EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'" diff --git a/packages/perl/perl-native_5.8.4.bb b/packages/perl/perl-native_5.8.4.bb index a4065e999b..4ec0c0f494 100644 --- a/packages/perl/perl-native_5.8.4.bb +++ b/packages/perl/perl-native_5.8.4.bb @@ -13,9 +13,9 @@ S = "${WORKDIR}/perl-${PV}" do_configure () { ./Configure \ - -Dcc="${BUILD_CC}" \ - -Dcflags="${BUILD_CFLAGS}" \ - -Dldflags="${BUILD_LDFLAGS} -Wl,-rpath,${STAGING_LIBDIR}" \ + -Dcc="${CC}" \ + -Dcflags="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ -Dusethreads \ -Duselargefiles \ -Dprefix=${prefix} \ diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb index 170a0ebf8d..ebe6ac9507 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -18,9 +18,9 @@ PARALLEL_MAKE = "" do_configure () { ./Configure \ - -Dcc="${BUILD_CC}" \ - -Dcflags="${BUILD_CFLAGS}" \ - -Dldflags="${BUILD_LDFLAGS} -Wl,-rpath,${STAGING_LIBDIR}" \ + -Dcc="${CC}" \ + -Dcflags="${CFLAGS}" \ + -Dldflags="$LDFLAGS}" \ -Dusethreads \ -Duselargefiles \ -Dprefix=${prefix} \ diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb index 70ac74a3f6..4d176fb194 100644 --- a/packages/perl/perl_5.8.4.bb +++ b/packages/perl/perl_5.8.4.bb @@ -1,3 +1,3 @@ -include perl.inc +require perl.inc PR = "r2" diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 510505abb5..11f002f676 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -1,6 +1,6 @@ MAINTAINER="David Karlstrom <daka@thg.se>" -include perl.inc +require perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ @@ -71,7 +71,7 @@ RRECOMMENDS_perl-modules = "${PACKAGES}" RPROVIDES_perl-lib = "perl-lib" -include perl-rdepends_${PV}.inc +require perl-rdepends_${PV}.inc # To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc): # daka@DaKa2:/home/slug/slugos/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc |