[4/4] recipes: adjust to the new perl recipe

Submitted by Alexander Kanavin on Dec. 2, 2018, 4:58 p.m. | Patch ID: 156810

Details

Message ID c6e0886760873100bb51adbf2395ee5198db9f9d.1543769657.git.alex.kanavin@gmail.com
State Master Next
Commit 18b11cbb6acdc081476df2a0a2f37252a065f0d1
Headers show

Commit Message

Alexander Kanavin Dec. 2, 2018, 4:58 p.m.
This mostly means setting native RDEPENDS to an empty string (as there is no
longer a separate perl-native recipe), and removing the use of nativeperl binary
as that is no longer provided either.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../docbook-xml/docbook-xsl-stylesheets_1.79.1.bb               | 1 +
 meta/recipes-devtools/intltool/intltool_0.51.0.bb               | 2 +-
 meta/recipes-devtools/rpm/rpm_4.14.2.1.bb                       | 1 +
 meta/recipes-extended/groff/groff_1.22.3.bb                     | 1 +
 meta/recipes-extended/texinfo/texinfo_6.5.bb                    | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
index 07d32ce9795..f4ff4241d9c 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
+++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
@@ -59,5 +59,6 @@  do_install_append_class-native () {
 }
 
 RDEPENDS_${PN} += "perl"
+RDEPENDS_${PN}_class-native = ""
 FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml"
 FILES_${PN}-doc = "${datadir}/doc/*"
diff --git a/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/meta/recipes-devtools/intltool/intltool_0.51.0.bb
index ecff2faf253..f2f8bb511ce 100644
--- a/meta/recipes-devtools/intltool/intltool_0.51.0.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.51.0.bb
@@ -21,7 +21,7 @@  DEPENDS_class-native = "libxml-parser-perl-native gettext-native"
 inherit autotools pkgconfig perlnative
 
 export PERL = "${bindir}/env perl"
-PERL_class-native = "/usr/bin/env nativeperl"
+PERL_class-native = "/usr/bin/env perl"
 PERL_class-nativesdk = "/usr/bin/env perl"
 
 # gettext is assumed to exist on the host
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index ef5d631917c..a0883c59525 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -141,6 +141,7 @@  FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*"
 RPROVIDES_${PN} += "rpm-build"
 
 RDEPENDS_${PN} = "bash perl python3-core"
+RDEPENDS_${PN}_class-native = ""
 
 PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess"
 
diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb
index ba90cadd88c..35d737c09b4 100644
--- a/meta/recipes-extended/groff/groff_1.22.3.bb
+++ b/meta/recipes-extended/groff/groff_1.22.3.bb
@@ -20,6 +20,7 @@  SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6
 DEPENDS = "groff-native"
 DEPENDS_class-native = ""
 RDEPENDS_${PN} += "perl sed"
+RDEPENDS_${PN}_class-native = ""
 
 inherit autotools texinfo multilib_script
 
diff --git a/meta/recipes-extended/texinfo/texinfo_6.5.bb b/meta/recipes-extended/texinfo/texinfo_6.5.bb
index f966457f881..866c20fd9c3 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.5.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.5.bb
@@ -77,6 +77,7 @@  FILES_info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \
 
 FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo"
 RDEPENDS_${PN} = "perl"
+RDEPENDS_${PN}_class-native = ""
 FILES_${PN}-doc = "${infodir}/texinfo* \
                    ${datadir}/${tex_texinfo} \
                    ${mandir}/man1 ${mandir}/man5"