From c27bb63d7ea6487f065cb56dca952b510650288c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 18 Jun 2015 00:57:22 -0700 Subject: perl: use perl.inc for target and native perl It can reduce the duplicated code. Signed-off-by: Robert Yang --- meta/recipes-devtools/perl/perl-native_5.22.0.bb | 12 ++---------- meta/recipes-devtools/perl/perl.inc | 8 ++++++++ meta/recipes-devtools/perl/perl_5.22.0.bb | 19 +++++-------------- 3 files changed, 15 insertions(+), 24 deletions(-) create mode 100644 meta/recipes-devtools/perl/perl.inc diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb b/meta/recipes-devtools/perl/perl-native_5.22.0.bb index dbfd82d23f..488871a51d 100644 --- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb +++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb @@ -1,12 +1,6 @@ -SUMMARY = "Perl scripting language" -HOMEPAGE = "http://www.perl.org/" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" +require perl.inc -LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ - file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3" - -SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \ +SRC_URI += "\ file://Configure-multilib.patch \ file://perl-configpm-switch.patch \ file://native-nopacklist.patch \ @@ -19,8 +13,6 @@ SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \ SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79" SRC_URI[sha256sum] = "be83ead0c5c26cbbe626fa4bac1a4beabe23a9eebc15d35ba49ccde11878e196" -S = "${WORKDIR}/perl-${PV}" - inherit native NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" diff --git a/meta/recipes-devtools/perl/perl.inc b/meta/recipes-devtools/perl/perl.inc new file mode 100644 index 0000000000..0d9716c235 --- /dev/null +++ b/meta/recipes-devtools/perl/perl.inc @@ -0,0 +1,8 @@ +SUMMARY = "Perl scripting language" +HOMEPAGE = "http://www.perl.org/" +SECTION = "devel" +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ + file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3" + +SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz" diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb index 8022f47275..e749078a0f 100644 --- a/meta/recipes-devtools/perl/perl_5.22.0.bb +++ b/meta/recipes-devtools/perl/perl_5.22.0.bb @@ -1,16 +1,9 @@ -SUMMARY = "Perl scripting language" -HOMEPAGE = "http://www.perl.org/" -SECTION = "devel" -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ - file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3" +require perl.inc + # We need gnugrep (for -I) DEPENDS = "virtual/db grep-native" DEPENDS += "gdbm zlib" -SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \ -" - # Pick up patches from debian # http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.22.0-1.debian.tar.xz SRC_URI += " \ @@ -54,11 +47,9 @@ SRC_URI += " \ file://native-perlinc.patch \ file://perl-enable-gdbm.patch \ file://cross-generate_uudmap.patch \ - file://fix_bad_rpath.patch \ - file://perl-archlib-exp.patch \ - file://dynaloaderhack.patch \ - \ - \ + file://fix_bad_rpath.patch \ + file://perl-archlib-exp.patch \ + file://dynaloaderhack.patch \ file://config.sh \ file://config.sh-32 \ file://config.sh-32-le \ -- cgit 1.2.3-korg