From d567c995c3b3aa844e20b5117d54c71d2987d8f2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 4 Sep 2020 16:42:36 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 +- .../help2man/help2man-native_1.47.15.bb | 23 ---------------------- meta/recipes-devtools/help2man/help2man_1.47.15.bb | 22 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-devtools/help2man/help2man-native_1.47.15.bb create mode 100644 meta/recipes-devtools/help2man/help2man_1.47.15.bb 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 " RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal " RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia " +RECIPE_MAINTAINER_pn-help2man = "Hongxu Jia " RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal " RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin " RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal " diff --git a/meta/recipes-devtools/help2man/help2man-native_1.47.15.bb b/meta/recipes-devtools/help2man/help2man-native_1.47.15.bb deleted file mode 100644 index 4f80a2bdb1..0000000000 --- a/meta/recipes-devtools/help2man/help2man-native_1.47.15.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Program for creating simple man pages" -SECTION = "devel" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -DEPENDS = "autoconf-native automake-native" - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "c25a35b30eceb315361484b0ff1f81c924e8ee5c8881576f1ee762f001dbcd1c" - -inherit autotools native - -EXTRA_OECONF = "--disable-nls" - -# We don't want to reconfigure things as it would require 'perlnative' to be -# used. -do_configure() { - oe_runconf -} - -do_install_append () { - # Make sure we use /usr/bin/env perl - sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man -} diff --git a/meta/recipes-devtools/help2man/help2man_1.47.15.bb b/meta/recipes-devtools/help2man/help2man_1.47.15.bb new file mode 100644 index 0000000000..6ab9f6cbe7 --- /dev/null +++ b/meta/recipes-devtools/help2man/help2man_1.47.15.bb @@ -0,0 +1,22 @@ +SUMMARY = "Program for creating simple man pages" +SECTION = "devel" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "c25a35b30eceb315361484b0ff1f81c924e8ee5c8881576f1ee762f001dbcd1c" + +inherit autotools + +# This is a hand-maintained aclocal.m4 but our autotools class currently deletes +# aclocal.m4. +EXTRA_AUTORECONF += "--exclude=aclocal" + +EXTRA_OECONF = "--disable-nls" + +do_install_append () { + # Make sure we use /usr/bin/env perl + sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf