From 571132415ea7fe2d91c62948f2b6aa553eafa83d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 16 May 2023 19:40:25 +0100 Subject: meta: depend on autoconf-archive-native, not autoconf-archive autoconf-archive is a collection of m4 autoconf macros needed at build-time, and autoconf-archive-native is a suitable provider as there is nothing in the recipe that needs to be cross-compiled. Also if we use DEPENDS=autoconf-archive then the recipe's -dev package ends up RDEPENDing on autoconf-archive, which isn't correct. Universally change any DEPENDS on autoconf-archive to the -native form, and add any missing dependencies that were implicit before. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni --- meta/recipes-connectivity/neard/neard_0.18.bb | 2 +- meta/recipes-core/dbus/dbus_1.14.6.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +- meta/recipes-extended/wget/wget.inc | 2 +- .../gobject-introspection/gobject-introspection_1.74.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb | 2 +- meta/recipes-kernel/powertop/powertop_2.15.bb | 2 +- meta/recipes-support/icu/icu_72-1.bb | 3 +-- meta/recipes-support/mpfr/mpfr_4.2.0.bb | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) (limited to 'meta') diff --git a/meta/recipes-connectivity/neard/neard_0.18.bb b/meta/recipes-connectivity/neard/neard_0.18.bb index dbd6e3841a..362a7615b6 100644 --- a/meta/recipes-connectivity/neard/neard_0.18.bb +++ b/meta/recipes-connectivity/neard/neard_0.18.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -DEPENDS = "dbus glib-2.0 libnl" +DEPENDS = "dbus glib-2.0 libnl autoconf-archive-native" SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;branch=master \ file://neard.in \ diff --git a/meta/recipes-core/dbus/dbus_1.14.6.bb b/meta/recipes-core/dbus/dbus_1.14.6.bb index a6e18a92cb..da25155773 100644 --- a/meta/recipes-core/dbus/dbus_1.14.6.bb +++ b/meta/recipes-core/dbus/dbus_1.14.6.bb @@ -42,7 +42,7 @@ PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" -DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" +DEPENDS = "expat virtual/libintl autoconf-archive-native glib-2.0" RDEPENDS:${PN} += "${PN}-common ${PN}-tools" RDEPENDS:${PN}:class-native = "" diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index d345b91472..0cb3f0e6a6 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" SECTION = "base" -DEPENDS = "util-linux attr autoconf-archive" +DEPENDS = "util-linux attr autoconf-archive-native" SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 58cb5ca73d..d31756dbc8 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" inherit autotools gettext texinfo update-alternatives pkgconfig -DEPENDS += "autoconf-archive" +DEPENDS += "autoconf-archive-native" EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \ --disable-rpath" diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb index 781ed65da3..d3a7ce2fd9 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb @@ -27,7 +27,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive-native" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb index 1b95cfb432..7831b4986a 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb @@ -13,7 +13,7 @@ DEPENDS += "xorgproto \ xtrans \ libxcb \ xorgproto-native \ - autoconf-archive \ + autoconf-archive-native \ " PROVIDES = "virtual/libx11" diff --git a/meta/recipes-kernel/powertop/powertop_2.15.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb index 0aae4c9397..65c6d0fcd3 100644 --- a/meta/recipes-kernel/powertop/powertop_2.15.bb +++ b/meta/recipes-kernel/powertop/powertop_2.15.bb @@ -2,7 +2,7 @@ SUMMARY = "Power usage tool" DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." HOMEPAGE = "https://01.org/powertop/" BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla" -DEPENDS = "ncurses libnl pciutils autoconf-archive" +DEPENDS = "ncurses libnl pciutils autoconf-archive-native" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" diff --git a/meta/recipes-support/icu/icu_72-1.bb b/meta/recipes-support/icu/icu_72-1.bb index 2b20bdd7b2..c2eae5298f 100644 --- a/meta/recipes-support/icu/icu_72-1.bb +++ b/meta/recipes-support/icu/icu_72-1.bb @@ -6,8 +6,7 @@ same results on all platforms." HOMEPAGE = "http://site.icu-project.org/" LICENSE = "ICU" -DEPENDS = "icu-native autoconf-archive" -DEPENDS:class-native = "autoconf-archive-native" +DEPENDS = "icu-native autoconf-archive-native" CVE_PRODUCT = "international_components_for_unicode" diff --git a/meta/recipes-support/mpfr/mpfr_4.2.0.bb b/meta/recipes-support/mpfr/mpfr_4.2.0.bb index fead5c3833..31804382e0 100644 --- a/meta/recipes-support/mpfr/mpfr_4.2.0.bb +++ b/meta/recipes-support/mpfr/mpfr_4.2.0.bb @@ -9,7 +9,7 @@ inherit autotools texinfo LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ " -DEPENDS = "gmp autoconf-archive" +DEPENDS = "gmp autoconf-archive-native" SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" SRC_URI[sha256sum] = "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993" -- cgit 1.2.3-korg