diff mbox series

[6/9] valkey: don't inherit autotools

Message ID 20250319120836.982987-6-ross.burton@arm.com
State New
Headers show
Series [1/9] rdisk: don't inherit autotools | expand

Commit Message

Ross Burton March 19, 2025, 12:08 p.m. UTC
This upstream does not in fact use autotools, so remove the inherit and
clean up do_compile().

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-oe/recipes-extended/valkey/valkey_8.0.2.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Khem Raj March 19, 2025, 4:26 p.m. UTC | #1
On Wed, Mar 19, 2025 at 5:09 AM Ross Burton via lists.openembedded.org
<ross.burton=arm.com@lists.openembedded.org> wrote:
>
> This upstream does not in fact use autotools, so remove the inherit and
> clean up do_compile().
>

I had a similar fix for this in master-next and I squashed both of the
patches together
thanks for the series.

> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta-oe/recipes-extended/valkey/valkey_8.0.2.bb | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb b/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb
> index af56e54590..04ed342556 100644
> --- a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb
> +++ b/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb
> @@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
>
>  RPROVIDES:${PN} = "virtual-redis"
>
> -inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
> +inherit pkgconfig update-rc.d systemd useradd
>
>  FINAL_LIBS:x86:toolchain-clang = "-latomic"
>  FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
> @@ -42,8 +42,9 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
>
>  EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
>
> -do_compile:prepend() {
> -    (cd deps && oe_runmake hiredis lua linenoise)
> +do_compile() {
> +    oe_runmake -C deps hiredis lua linenoise
> +    oe_runmake
>  }
>
>  do_install() {
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#116073): https://lists.openembedded.org/g/openembedded-devel/message/116073
> Mute This Topic: https://lists.openembedded.org/mt/111787466/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb b/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb
index af56e54590..04ed342556 100644
--- a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb
+++ b/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb
@@ -23,7 +23,7 @@  S = "${WORKDIR}/git"
 
 RPROVIDES:${PN} = "virtual-redis"
 
-inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
+inherit pkgconfig update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
 FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
@@ -42,8 +42,9 @@  PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
 
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
-do_compile:prepend() {
-    (cd deps && oe_runmake hiredis lua linenoise)
+do_compile() {
+    oe_runmake -C deps hiredis lua linenoise
+    oe_runmake
 }
 
 do_install() {