Skip to contentSkip to conversation

perl: fix whitespace

PATCH New Ross Burton 1 participant 2 messages Jul 30, 2019

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

PATCH 1/2 perl: fix whitespace

There was some tabs embedded in spaces, fix those.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-devtools/perl/perl_5.30.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/perl/perl_5.30.0.bb +2 -2
index e3664290e30..ce280cb1cbd 100644
@@ -179,7 +179,7 @@ perl_package_preprocess () {
             ${PKGD}${libdir}/perl5/${PV}/Config.pm \
             ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config.pm \
             ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config.pod \
-	    ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_git.pl \
+            ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_git.pl \
             ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy.pl \
             ${PKGD}${libdir}/perl5/${PV}/ExtUtils/Liblist/Kid.pm \
             ${PKGD}${libdir}/perl5/${PV}/FileCache.pm \

@@ -192,7 +192,7 @@ require perl-ptest.inc
 FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/libperl.so* \
                ${libdir}/perl5/site_perl \
                ${libdir}/perl5/${PV}/Config.pm \
-	       ${libdir}/perl5/${PV}/*/Config_git.pl \
+               ${libdir}/perl5/${PV}/*/Config_git.pl \
                ${libdir}/perl5/${PV}/*/Config_heavy-target.pl \
                ${libdir}/perl5/config.sh \
                ${libdir}/perl5/${PV}/strict.pm \
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 2/2 perl: add PACKAGECONFIG for db

perl-cross makes it easy to cleanly disable the use of Berkeley DB if desired, so add a PACKAGECONFIG for this.

More of the dependencies (such as gdbm) can be controlled in the same way, but Berkeley DB is a prime contender: it's a large library which we have to ship an old release for due to licensing issues, so there are users who may want to strip it out of builds entirely.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-devtools/perl/perl_5.30.0.bb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
meta/recipes-devtools/perl/perl_5.30.0.bb +10 -4
index ce280cb1cbd..a221bce52bd 100644
@@ -35,10 +35,13 @@ S = "${WORKDIR}/perl-${PV}"
 
 inherit upstream-version-is-even
 
-DEPENDS += "db gdbm zlib virtual/crypt"
+DEPENDS += "gdbm zlib virtual/crypt"
 
 PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
 
+PACKAGECONFIG ??= "bdb"
+PACKAGECONFIG[bdb] = ",-Ui_db,db"
+
 # Don't generate comments in enc2xs output files. They are not reproducible
 export ENC2XS_NO_COMMENTS = "1"
 

@@ -56,7 +59,8 @@ do_configure_class-target() {
     -Duseshrplib \
     -Dsoname=libperl.so.5 \
     -Dvendorprefix=${prefix} \
-    -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux
+    -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \
+    ${PACKAGECONFIG_CONFARGS}
 
     #perl.c uses an ARCHLIB_EXP define to generate compile-time code that
     #adds the archlibexp path to @INC during run-time initialization of a

@@ -79,7 +83,8 @@ do_configure_class-nativesdk() {
     -Duseshrplib \
     -Dsoname=libperl.so.5 \
     -Dvendorprefix=${prefix} \
-    -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux
+    -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \
+    ${PACKAGECONFIG_CONFARGS}
 
     # See the comment above
     sed -i -e "s,${STAGING_LIBDIR},${libdir},g" config.h

@@ -91,7 +96,8 @@ do_configure_class-native() {
     -Duseshrplib \
     -Dsoname=libperl.so.5 \
     -Dvendorprefix=${prefix} \
-    -Ui_xlocale
+    -Ui_xlocale \
+    ${PACKAGECONFIG_CONFARGS}
 }
 
 do_configure_append() {
Signature · 1 line
2.20.1