[2/4] help2man: rewrite recipe

Submitted by Ross Burton on July 16, 2020, 11:55 a.m. | Patch ID: 174480

Details

Message ID 20200716115546.3724268-2-ross@burtonini.com
State Master Next
Commit cf599d059221d37da6a3262df4d17b56a9042eec
Headers show

Commit Message

Ross Burton July 16, 2020, 11:55 a.m.
From: Ross Burton <ross.burton@arm.com>

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>
---
 ...2man-native_1.47.15.bb => help2man_1.47.15.bb} | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
 rename meta/recipes-devtools/help2man/{help2man-native_1.47.15.bb => help2man_1.47.15.bb} (66%)

Patch hide | download patch | download mbox

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"

Comments

Richard Purdie July 17, 2020, 6:14 a.m.
On Thu, 2020-07-16 at 12:55 +0100, Ross Burton wrote:
> From: Ross Burton <ross.burton@arm.com>
> 
> 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>
> ---
>  ...2man-native_1.47.15.bb => help2man_1.47.15.bb} | 15 ++++++-------
> --
>  1 file changed, 6 insertions(+), 9 deletions(-)
>  rename meta/recipes-devtools/help2man/{help2man-native_1.47.15.bb =>
> help2man_1.47.15.bb} (66%)

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2185

configure: error: perl module Locale::gettext required

(from no-x11 world build)

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#140746): https://lists.openembedded.org/g/openembedded-core/message/140746
Mute This Topic: https://lists.openembedded.org/mt/75539650/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Richard Purdie July 17, 2020, 6:15 a.m.
On Fri, 2020-07-17 at 07:14 +0100, Richard Purdie via
lists.openembedded.org wrote:
> On Thu, 2020-07-16 at 12:55 +0100, Ross Burton wrote:
> > From: Ross Burton <ross.burton@arm.com>
> > 
> > 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>
> > ---
> >  ...2man-native_1.47.15.bb => help2man_1.47.15.bb} | 15 ++++++-----
> > --
> > --
> >  1 file changed, 6 insertions(+), 9 deletions(-)
> >  rename meta/recipes-devtools/help2man/{help2man-native_1.47.15.bb
> > =>
> > help2man_1.47.15.bb} (66%)
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2185
> 
> configure: error: perl module Locale::gettext required
> 
> (from no-x11 world build)

Also, maintainer entry is missing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1165/steps/8/logs/step2d

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#140747): https://lists.openembedded.org/g/openembedded-core/message/140747
Mute This Topic: https://lists.openembedded.org/mt/75539650/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-