summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-09-04 16:42:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-05 22:19:20 +0100
commitd567c995c3b3aa844e20b5117d54c71d2987d8f2 (patch)
tree9b52848aab15577d4335c36af34f62619bff1df3
parentb325f0bf30efe20a65314a819143e94ccf6be469 (diff)
downloadpoky-d567c995c3b3aa844e20b5117d54c71d2987d8f2.tar.gz
help2man: rewrite recipe
This recipe was originally explicitly minimal because it was needed to bootstrap autotools, but that isn't the case anymore. Instead of being explicitly native, use BBCLASSEXTEND. No need to explicitly depend on autoconf-native automake-native, because the autotools class does that. As this recipe isn't needed in early build anymore there's no need to avoid reconfiguring. (From OE-Core rev: 1e98edf46d0b96da2aea7dabd1d7cf3ce6c5e7bd) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/maintainers.inc2
-rw-r--r--meta/recipes-devtools/help2man/help2man_1.47.15.bb (renamed from meta/recipes-devtools/help2man/help2man-native_1.47.15.bb)15
2 files changed, 8 insertions, 9 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 9f80970309..a094b39b2a 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -255,7 +255,7 @@ RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin <alex.kanavin@gmail.com>"
255RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>" 255RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>"
256RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>" 256RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>"
257RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>" 257RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>"
258RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia <hongxu.jia@windriver.com>" 258RECIPE_MAINTAINER_pn-help2man = "Hongxu Jia <hongxu.jia@windriver.com>"
259RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>" 259RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>"
260RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>" 260RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>"
261RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal <anuj.mittal@intel.com>" 261RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-devtools/help2man/help2man-native_1.47.15.bb b/meta/recipes-devtools/help2man/help2man_1.47.15.bb
index 4f80a2bdb1..6ab9f6cbe7 100644
--- a/meta/recipes-devtools/help2man/help2man-native_1.47.15.bb
+++ b/meta/recipes-devtools/help2man/help2man_1.47.15.bb
@@ -2,22 +2,21 @@ SUMMARY = "Program for creating simple man pages"
2SECTION = "devel" 2SECTION = "devel"
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" 4LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
5DEPENDS = "autoconf-native automake-native"
6 5
7SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" 6SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz"
8SRC_URI[sha256sum] = "c25a35b30eceb315361484b0ff1f81c924e8ee5c8881576f1ee762f001dbcd1c" 7SRC_URI[sha256sum] = "c25a35b30eceb315361484b0ff1f81c924e8ee5c8881576f1ee762f001dbcd1c"
9 8
10inherit autotools native 9inherit autotools
11 10
12EXTRA_OECONF = "--disable-nls" 11# This is a hand-maintained aclocal.m4 but our autotools class currently deletes
12# aclocal.m4.
13EXTRA_AUTORECONF += "--exclude=aclocal"
13 14
14# We don't want to reconfigure things as it would require 'perlnative' to be 15EXTRA_OECONF = "--disable-nls"
15# used.
16do_configure() {
17 oe_runconf
18}
19 16
20do_install_append () { 17do_install_append () {
21 # Make sure we use /usr/bin/env perl 18 # Make sure we use /usr/bin/env perl
22 sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man 19 sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
23} 20}
21
22BBCLASSEXTEND = "native nativesdk"