diff mbox series

[2/4] lzop: improve aclocal.m4 handling

Message ID 20260225123727.2043715-2-ross.burton@arm.com
State New
Headers show
Series [1/4] readline: improve aclocal.m4 handling | expand

Commit Message

Ross Burton Feb. 25, 2026, 12:37 p.m. UTC
This upstream has a hand-maintained aclocal.m4 which we don't want to
delete (autotools.bbclass does this).  For some reason this was worked
around by shipping a copy of aclocal.m4 as acinclude.m4 and dropping
that into the build tree.

A better solution is to just exclude aclocal in EXTRA_AUTORECONF, which
has the side-effect of not removing the file.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-support/lzop/lzop_1.04.bb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Peter Kjellerstedt Feb. 25, 2026, 6:58 p.m. UTC | #1
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Ross Burton via lists.openembedded.org
> Sent: den 25 februari 2026 13:37
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 2/4] lzop: improve aclocal.m4 handling
> 
> This upstream has a hand-maintained aclocal.m4 which we don't want to
> delete (autotools.bbclass does this).  For some reason this was worked
> around by shipping a copy of aclocal.m4 as acinclude.m4 and dropping
> that into the build tree.
> 
> A better solution is to just exclude aclocal in EXTRA_AUTORECONF, which
> has the side-effect of not removing the file.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-support/lzop/lzop_1.04.bb | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-support/lzop/lzop_1.04.bb b/meta/recipes-support/lzop/lzop_1.04.bb
> index c32aa534228..57c2190cf40 100644
> --- a/meta/recipes-support/lzop/lzop_1.04.bb
> +++ b/meta/recipes-support/lzop/lzop_1.04.bb
> @@ -12,15 +12,12 @@ LICENSE = "GPL-2.0-or-later"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> 
> file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8"
> 
> -SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
> -           file://acinclude.m4 \

You forgot to remove the actual acinclude.m4 file.

> -          "
> +SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz"
>  SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41"
> 
>  inherit autotools
> 
> -do_configure:prepend () {
> -    install -Dm 0644 ${UNPACKDIR}/acinclude.m4 ${S}/acinclude.m4
> -}
> +# Ensure we don't delete the shipped aclocal.m4
> +EXTRA_AUTORECONF += "--exclude=aclocal"
> 
>  BBCLASSEXTEND = "native nativesdk"
> --
> 2.43.0

//Peter
diff mbox series

Patch

diff --git a/meta/recipes-support/lzop/lzop_1.04.bb b/meta/recipes-support/lzop/lzop_1.04.bb
index c32aa534228..57c2190cf40 100644
--- a/meta/recipes-support/lzop/lzop_1.04.bb
+++ b/meta/recipes-support/lzop/lzop_1.04.bb
@@ -12,15 +12,12 @@  LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8"
 
-SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
-           file://acinclude.m4 \
-          "
+SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz"
 SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41"
 
 inherit autotools
 
-do_configure:prepend () {
-    install -Dm 0644 ${UNPACKDIR}/acinclude.m4 ${S}/acinclude.m4
-}
+# Ensure we don't delete the shipped aclocal.m4
+EXTRA_AUTORECONF += "--exclude=aclocal"
 
 BBCLASSEXTEND = "native nativesdk"