diff options
| author |   Holger Freyther <zecke@selfish.org> | 2006-08-06 19:37:22 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2006-08-06 19:37:22 +0000 |
| commit | ccec27323e3f552fcd1af2ff90fe099be0c88401 (patch) | |
| tree | 0f8f32106cf5a77e403065c7eb7a577a79f8baa7 | |
| parent | 690e9e12869eb453929481ec5f999bff1e36c9b3 (diff) | |
| download | openembedded-ccec27323e3f552fcd1af2ff90fe099be0c88401.tar.gz | |
clases/cpan.bbclass,packages/perl: add EXTRA_CPANFLAGS, fix native
Add EXTRA_CPANFLAGS to cpan.bbclass, similiar to EXTRA_OECONF
and EXTRA_OEMAKE
Use this in libxml-parser-perl-native to point to the expat
include and libraries
perl-native inherits native already. No need to use BUILD_CC,
BUILD_FOO, BUILD_LDFLAGS but use LDFLAGS and CC directly. LDFLAGS
has rpath already removed...
| -rw-r--r-- | classes/cpan.bbclass | 3 | ||||
| -rw-r--r-- | packages/perl/libxml-parser-perl-native_2.34.bb | 1 | ||||
| -rw-r--r-- | packages/perl/perl-native_5.8.4.bb | 6 | ||||
| -rw-r--r-- | packages/perl/perl-native_5.8.7.bb | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 853abfd1b3..78b902f85d 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -1,7 +1,8 @@ FILES_${PN} += '${libdir}/perl5' +EXTRA_CPANFLAGS = "" cpan_do_configure () { - perl Makefile.PL + perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb index 12bb476caa..55bae665b5 100644 --- a/packages/perl/libxml-parser-perl-native_2.34.bb +++ b/packages/perl/libxml-parser-perl-native_2.34.bb @@ -2,3 +2,4 @@ SECTION = "libs" 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} \ |