Skip to contentSkip to conversation

adduser: correct perl installation directory to match new perl recipe

PATCH New Alexander Kanavin 1 participant 3 messages Jan 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 adduser: correct perl installation directory to match new perl recipe

---
 meta-perl/recipes-perl/adduser/adduser_3.118.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-perl/recipes-perl/adduser/adduser_3.118.bb +1 -1
index 660a7f777..e695c5894 100644
@@ -22,7 +22,7 @@ do_install() {
     install -m 0755 ${S}/adduser ${D}${sbindir}
     install -m 0755 ${S}/deluser ${D}${sbindir}
 
-    install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl/${@get_perl_version(d)}/Debian/AdduserCommon.pm
+    install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl5/${@get_perl_version(d)}/Debian/AdduserCommon.pm
     sed -i -e "s/VERSION/${PV}/" ${D}${sbindir}/*
 
     install -d ${D}/${sysconfdir}
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 postgresql: correctly build against target perl

Previously perl-native headers were erroneously included, which was causing issues with the new perl recipe.

---
 meta-oe/recipes-dbs/postgresql/postgresql.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-dbs/postgresql/postgresql.inc +6 -2
index dc8522454..85f19170b 100644
@@ -37,7 +37,7 @@ LEAD_SONAME = "libpq.so"
 # LDFLAGS for shared libraries
 export LDFLAGS_SL = "${LDFLAGS}"
 
-inherit autotools pkgconfig perlnative pythonnative useradd update-rc.d systemd gettext
+inherit autotools pkgconfig perlnative pythonnative useradd update-rc.d systemd gettext cpan-base
 
 CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6"
 
@@ -106,6 +106,10 @@ python populate_packages_prepend() {
 
 }
 
+# This will make native perl use target settings (for include dirs etc.)
+export PERLCONFIGTARGET = "${@is_target(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}"
+
 do_configure() {
     # do_configure
     autotools_do_configure
@@ -119,7 +123,7 @@ do_configure() {
     BLIBNA="\${STAGING_BASE_LIBDIR_NATIVE}"
     sed -i -e "/^perl_archlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
         ${B}/src/Makefile.global
-    sed -i -e "/^perl_privlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
+    sed -i -e "/^perl_privlibexp/s:${libdir}:${STAGING_LIBDIR}:g" \
         ${B}/src/Makefile.global
     # remove the rpath, replace with correct lib path
     sed -i \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/3 openipmi: correctly build against target perl headers

In reply to Alexander Kanavin

Previously it was built with native perl headers, which was okay with perl 5.24, but not with perl 5.28.

---
 meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb +2 -1
index d28ebd484..f0426ce36 100644
@@ -38,7 +38,7 @@ S = "${WORKDIR}/OpenIPMI-${PV}"
 SRC_URI[md5sum] = "1461ac4d78fc516646fd0a6e605a8b05"
 SRC_URI[sha256sum] = "f0f1a0ec732409930b7a31a6daa6cf39b585f52059b62a5f092b7ece21aa75a5"
 
-inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd
+inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd cpan-base
 
 EXTRA_OECONF = "--disable-static \
                 --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \
@@ -78,6 +78,7 @@ do_configure () {
         echo "SAL: STAGING_INCDIR_NATIVE = $STAGING_INCDIR_NATIVE"
         echo "SAL: libdir = $libdir"
         sed -i -e "/^PERL_CFLAGS/s:-I/usr/local/include:-I${STAGING_INCDIR_NATIVE}:g" $i
+        sed -i -e "/^PERL_CFLAGS/s:-I .* :-I ${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}/CORE :g" $i
         sed -i -e "/^PERL_INSTALL_DIR/s:^PERL_INSTALL_DIR = .*:PERL_INSTALL_DIR = ${libdir}/perl/vendor_perl/$perl_ver:g" $i
     done
 }
Signature · 1 line
2.17.1