[PATCH] help2man: rewrite recipe

[PATCH] help2man: rewrite recipe

[Ross Burton]

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.

Don't explicitly disable NLS, but use the gettext class.

As this recipe isn't needed in early build anymore there's no need to
avoid reconfiguring.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/conf/distro/include/maintainers.inc          |  2 +-
 ...2man-native_1.47.15.bb => help2man_1.47.15.bb} | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/help2man/{help2man-native_1.47.15.bb => help2man_1.47.15.bb} (66%)

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>"
 RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>"
 RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>"
-RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia <hongxu.jia@windriver.com>"
+RECIPE_MAINTAINER_pn-help2man = "Hongxu Jia <hongxu.jia@windriver.com>"
 RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>"
 RECIPE_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
similarity index 66%
rename from meta/recipes-devtools/help2man/help2man-native_1.47.15.bb
rename to meta/recipes-devtools/help2man/help2man_1.47.15.bb
index 4f80a2bdb1..7a913507a3 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,19 @@ 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
+inherit autotools gettext
 
-EXTRA_OECONF = "--disable-nls"
-
-# We don't want to reconfigure things as it would require 'perlnative' to be
-# used.
-do_configure() {
-	oe_runconf
-}
+# This is a hand-maintained aclocal.m4 but our autotools class currently deletes
+# aclocal.m4.
+EXTRA_AUTORECONF += "--exclude=aclocal"
 
 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"
-- 
2.28.0

Re: [OE-core] [PATCH] help2man: rewrite recipe

[Khem Raj]

On Thu, Sep 3, 2020 at 6:02 AM Ross Burton <ross@burtonini.com> wrote:
>
> 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.
>
> Don't explicitly disable NLS, but use the gettext class.
>
> As this recipe isn't needed in early build anymore there's no need to
> avoid reconfiguring.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/conf/distro/include/maintainers.inc          |  2 +-
>  ...2man-native_1.47.15.bb => help2man_1.47.15.bb} | 15 ++++++---------
>  2 files changed, 7 insertions(+), 10 deletions(-)
>  rename meta/recipes-devtools/help2man/{help2man-native_1.47.15.bb => help2man_1.47.15.bb} (66%)
>
> 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>"
>  RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>"
>  RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>"
>  RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>"
> -RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia <hongxu.jia@windriver.com>"
> +RECIPE_MAINTAINER_pn-help2man = "Hongxu Jia <hongxu.jia@windriver.com>"
>  RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>"
>  RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>"
>  RECIPE_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
> similarity index 66%
> rename from meta/recipes-devtools/help2man/help2man-native_1.47.15.bb
> rename to meta/recipes-devtools/help2man/help2man_1.47.15.bb
> index 4f80a2bdb1..7a913507a3 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,19 @@ 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
> +inherit autotools gettext
>
> -EXTRA_OECONF = "--disable-nls"

this means we need perl's gettext module and hence perl. so perhaps
leave it in there.

> -
> -# We don't want to reconfigure things as it would require 'perlnative' to be
> -# used.
> -do_configure() {
> -       oe_runconf
> -}
> +# This is a hand-maintained aclocal.m4 but our autotools class currently deletes
> +# aclocal.m4.
> +EXTRA_AUTORECONF += "--exclude=aclocal"
>
>  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"
> --
> 2.28.0
>
>