perl: For native perl module packages determine the actual non-native

package name to require from the name of the native package. This
makes all native files identical which makes adding new ones easier.

26 files changed, 32 insertions, 68 deletions

diff --git a/packages/perl/libalgorithm-diff-perl-native_1.1902.bb b/packages/perl/libalgorithm-diff-perl-native_1.1902.bb
index 220c1554b6..cf7847d783 100644
--- a/packages/perl/libalgorithm-diff-perl-native_1.1902.bb
+++ b/packages/perl/libalgorithm-diff-perl-native_1.1902.bb
@@ -2,4 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-require libalgorithm-diff-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libarchive-tar-perl-native_1.30.bb b/packages/perl/libarchive-tar-perl-native_1.30.bb
index 172e0d64a9..cf7847d783 100644
--- a/packages/perl/libarchive-tar-perl-native_1.30.bb
+++ b/packages/perl/libarchive-tar-perl-native_1.30.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libarchive-tar-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libcache-cache-perl-native_1.05.bb b/packages/perl/libcache-cache-perl-native_1.05.bb
index 8a66912385..cf7847d783 100644
--- a/packages/perl/libcache-cache-perl-native_1.05.bb
+++ b/packages/perl/libcache-cache-perl-native_1.05.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libcache-cache-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libclass-container-perl-native_0.12.bb b/packages/perl/libclass-container-perl-native_0.12.bb
index 31b1e50bf5..cf7847d783 100644
--- a/packages/perl/libclass-container-perl-native_0.12.bb
+++ b/packages/perl/libclass-container-perl-native_0.12.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libclass-container-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libclass-data-inheritable-perl-native_0.06.bb b/packages/perl/libclass-data-inheritable-perl-native_0.06.bb
index fd12e05eac..cf7847d783 100644
--- a/packages/perl/libclass-data-inheritable-perl-native_0.06.bb
+++ b/packages/perl/libclass-data-inheritable-perl-native_0.06.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libclass-data-inheritable-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libcompress-zlib-perl-native_1.42.bb b/packages/perl/libcompress-zlib-perl-native_1.42.bb
index 002404a4e7..cf7847d783 100644
--- a/packages/perl/libcompress-zlib-perl-native_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl-native_1.42.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libcompress-zlib-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libdevel-stacktrace-perl-native_1.13.bb b/packages/perl/libdevel-stacktrace-perl-native_1.13.bb
index 9121e93656..cf7847d783 100644
--- a/packages/perl/libdevel-stacktrace-perl-native_1.13.bb
+++ b/packages/perl/libdevel-stacktrace-perl-native_1.13.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libdevel-stacktrace-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libdigest-sha1-perl-native_2.11.bb b/packages/perl/libdigest-sha1-perl-native_2.11.bb
index a2f4d3e898..cf7847d783 100644
--- a/packages/perl/libdigest-sha1-perl-native_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl-native_2.11.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libdigest-sha1-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/liberror-perl-native_0.17004.bb b/packages/perl/liberror-perl-native_0.17004.bb
index 3804dd2729..cf7847d783 100644
--- a/packages/perl/liberror-perl-native_0.17004.bb
+++ b/packages/perl/liberror-perl-native_0.17004.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require liberror-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libexception-class-perl-native_1.23.bb b/packages/perl/libexception-class-perl-native_1.23.bb
index efe7bdce73..cf7847d783 100644
--- a/packages/perl/libexception-class-perl-native_1.23.bb
+++ b/packages/perl/libexception-class-perl-native_1.23.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libexception-class-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libextutils-cbuilder-perl-native_0.18.bb b/packages/perl/libextutils-cbuilder-perl-native_0.18.bb
index 91d027f09c..cf7847d783 100644
--- a/packages/perl/libextutils-cbuilder-perl-native_0.18.bb
+++ b/packages/perl/libextutils-cbuilder-perl-native_0.18.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libextutils-cbuilder-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libextutils-parsexs-perl-native_2.16.bb b/packages/perl/libextutils-parsexs-perl-native_2.16.bb
index 9176c524f0..cf7847d783 100644
--- a/packages/perl/libextutils-parsexs-perl-native_2.16.bb
+++ b/packages/perl/libextutils-parsexs-perl-native_2.16.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libextutils-parsexs-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libintl-perl-native_1.11.bb b/packages/perl/libintl-perl-native_1.11.bb
index 5499e713a5..cf7847d783 100644
--- a/packages/perl/libintl-perl-native_1.11.bb
+++ b/packages/perl/libintl-perl-native_1.11.bb
@@ -1,5 +1,5 @@
 SECTION = "libs"
 
-include libintl-perl_1.11.bb
-
 inherit native
+
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libintl-perl-native_1.16.bb b/packages/perl/libintl-perl-native_1.16.bb
index 17b6789bda..cf7847d783 100644
--- a/packages/perl/libintl-perl-native_1.16.bb
+++ b/packages/perl/libintl-perl-native_1.16.bb
@@ -2,4 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-include libintl-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libio-zlib-perl-native_1.04.bb b/packages/perl/libio-zlib-perl-native_1.04.bb
index 721aee026e..cf7847d783 100644
--- a/packages/perl/libio-zlib-perl-native_1.04.bb
+++ b/packages/perl/libio-zlib-perl-native_1.04.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libio-zlib-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libipc-sharelite-perl-native_0.09.bb b/packages/perl/libipc-sharelite-perl-native_0.09.bb
index 5749e620bf..cf7847d783 100644
--- a/packages/perl/libipc-sharelite-perl-native_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl-native_0.09.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libipc-sharelite-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/liblocale-gettext-perl-native_1.05.bb b/packages/perl/liblocale-gettext-perl-native_1.05.bb
index 14561664d3..cf7847d783 100644
--- a/packages/perl/liblocale-gettext-perl-native_1.05.bb
+++ b/packages/perl/liblocale-gettext-perl-native_1.05.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require liblocale-gettext-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/liblog-dispatch-perl-native_2.13.bb b/packages/perl/liblog-dispatch-perl-native_2.13.bb
index 39e20176ca..cf7847d783 100644
--- a/packages/perl/liblog-dispatch-perl-native_2.13.bb
+++ b/packages/perl/liblog-dispatch-perl-native_2.13.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require liblog-dispatch-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/liblog-log4perl-perl-native_1.06.bb b/packages/perl/liblog-log4perl-perl-native_1.06.bb
index a9281a75f7..cf7847d783 100644
--- a/packages/perl/liblog-log4perl-perl-native_1.06.bb
+++ b/packages/perl/liblog-log4perl-perl-native_1.06.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require liblog-log4perl-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libmodule-build-perl-native_0.2805.bb b/packages/perl/libmodule-build-perl-native_0.2805.bb
index 65db79b150..cf7847d783 100644
--- a/packages/perl/libmodule-build-perl-native_0.2805.bb
+++ b/packages/perl/libmodule-build-perl-native_0.2805.bb
@@ -1,4 +1,5 @@
 SECTION = "libs"
-require libmodule-build-perl_${PV}.bb
+
 inherit native
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libnet-ip-perl-native_1.25.bb b/packages/perl/libnet-ip-perl-native_1.25.bb
index 58ed7e8edf..cf7847d783 100644
--- a/packages/perl/libnet-ip-perl-native_1.25.bb
+++ b/packages/perl/libnet-ip-perl-native_1.25.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libnet-ip-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libparams-validate-perl-native_0.86.bb b/packages/perl/libparams-validate-perl-native_0.86.bb
index 74618981ed..cf7847d783 100644
--- a/packages/perl/libparams-validate-perl-native_0.86.bb
+++ b/packages/perl/libparams-validate-perl-native_0.86.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libparams-validate-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libtext-diff-perl-native_0.35.bb b/packages/perl/libtext-diff-perl-native_0.35.bb
index a386d814bc..cf7847d783 100644
--- a/packages/perl/libtext-diff-perl-native_0.35.bb
+++ b/packages/perl/libtext-diff-perl-native_0.35.bb
@@ -2,4 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-require libtext-diff-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libversion-perl-native_0.6701.bb b/packages/perl/libversion-perl-native_0.6701.bb
index f0dfd2a084..cf7847d783 100644
--- a/packages/perl/libversion-perl-native_0.6701.bb
+++ b/packages/perl/libversion-perl-native_0.6701.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libversion-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb
index 55bae665b5..5398563f2e 100644
--- a/packages/perl/libxml-parser-perl-native_2.34.bb
+++ b/packages/perl/libxml-parser-perl-native_2.34.bb
@@ -1,5 +1,8 @@
 SECTION = "libs"
-require libxml-parser-perl_${PV}.bb
+
 inherit native
+
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb
+
 DEPENDS = "perl-native expat-native"
 EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
diff --git a/packages/perl/libyaml-perl-native_0.62.bb b/packages/perl/libyaml-perl-native_0.62.bb
index 365e6084a7..cf7847d783 100644
--- a/packages/perl/libyaml-perl-native_0.62.bb
+++ b/packages/perl/libyaml-perl-native_0.62.bb
@@ -2,6 +2,4 @@ SECTION = "libs"
 
 inherit native
 
-EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
-
-require libyaml-perl_${PV}.bb
+require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb