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...

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 853abfd1b317a3a0afc951eac631345c3fe09dc5..78b902f85db369f69bda021624513127e94636d2 100644 (file)
--- 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 12bb476caada076f041ab28163e0c5e5d045938e..55bae665b5ad8df05c9c0f492b87cdede234b177 100644 (file)
--- 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 a4065e999b8e3ddce4111eaa6db115e35d1be0b2..4ec0c0f494a0e3283e6f3bcb0c726640a08865f4 100644 (file)
--- 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 170a0ebf8d1c8843c21533ef35dd798ea7ab075b..ebe6ac95075762fbee1d170875cc88256913585c 100644 (file)
--- 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}                         \