From ccec27323e3f552fcd1af2ff90fe099be0c88401 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 19:37:22 +0000
Subject: 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...

---
 packages/perl/libxml-parser-perl-native_2.34.bb | 1 +
 packages/perl/perl-native_5.8.4.bb              | 6 +++---
 packages/perl/perl-native_5.8.7.bb              | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'packages/perl')

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}				\
-- 
cgit v1.2.3