summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-05-16 19:40:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-22 10:53:48 +0100
commit19d9114042c4c31f627c7d4c7ebd66a2d31504c0 (patch)
tree31c5dc4b8f9cb995555858940003b802e0749bbc
parent4c0c0201c0a89b816c46c0cff12771cdacb8d5ee (diff)
downloadpoky-19d9114042c4c31f627c7d4c7ebd66a2d31504c0.tar.gz
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. (From OE-Core rev: 571132415ea7fe2d91c62948f2b6aa553eafa83d) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/neard/neard_0.18.bb2
-rw-r--r--meta/recipes-core/dbus/dbus_1.14.6.bb2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc2
-rw-r--r--meta/recipes-extended/wget/wget.inc2
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb2
-rw-r--r--meta/recipes-kernel/powertop/powertop_2.15.bb2
-rw-r--r--meta/recipes-support/icu/icu_72-1.bb3
-rw-r--r--meta/recipes-support/mpfr/mpfr_4.2.0.bb2
9 files changed, 9 insertions, 10 deletions
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 \
6 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ 6 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
7 " 7 "
8 8
9DEPENDS = "dbus glib-2.0 libnl" 9DEPENDS = "dbus glib-2.0 libnl autoconf-archive-native"
10 10
11SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;branch=master \ 11SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;branch=master \
12 file://neard.in \ 12 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,,,"
42PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit" 42PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit"
43PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" 43PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
44 44
45DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" 45DEPENDS = "expat virtual/libintl autoconf-archive-native glib-2.0"
46RDEPENDS:${PN} += "${PN}-common ${PN}-tools" 46RDEPENDS:${PN} += "${PN}-common ${PN}-tools"
47RDEPENDS:${PN}:class-native = "" 47RDEPENDS:${PN}:class-native = ""
48 48
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 \
17 file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ 17 file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
18 file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" 18 file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
19SECTION = "base" 19SECTION = "base"
20DEPENDS = "util-linux attr autoconf-archive" 20DEPENDS = "util-linux attr autoconf-archive-native"
21 21
22SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https" 22SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https"
23S = "${WORKDIR}/git" 23S = "${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"
11 11
12inherit autotools gettext texinfo update-alternatives pkgconfig 12inherit autotools gettext texinfo update-alternatives pkgconfig
13 13
14DEPENDS += "autoconf-archive" 14DEPENDS += "autoconf-archive-native"
15 15
16EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \ 16EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
17 --disable-rpath" 17 --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"
27 27
28MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" 28MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner"
29 29
30DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" 30DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive-native"
31 31
32# target build needs qemu to run temporary introspection binaries created 32# target build needs qemu to run temporary introspection binaries created
33# on the fly by g-ir-scanner and a native version of itself to run 33# 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 \
13 xtrans \ 13 xtrans \
14 libxcb \ 14 libxcb \
15 xorgproto-native \ 15 xorgproto-native \
16 autoconf-archive \ 16 autoconf-archive-native \
17 " 17 "
18 18
19PROVIDES = "virtual/libx11" 19PROVIDES = "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"
2DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." 2DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
3HOMEPAGE = "https://01.org/powertop/" 3HOMEPAGE = "https://01.org/powertop/"
4BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla" 4BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla"
5DEPENDS = "ncurses libnl pciutils autoconf-archive" 5DEPENDS = "ncurses libnl pciutils autoconf-archive-native"
6LICENSE = "GPL-2.0-only" 6LICENSE = "GPL-2.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" 7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
8 8
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."
6HOMEPAGE = "http://site.icu-project.org/" 6HOMEPAGE = "http://site.icu-project.org/"
7 7
8LICENSE = "ICU" 8LICENSE = "ICU"
9DEPENDS = "icu-native autoconf-archive" 9DEPENDS = "icu-native autoconf-archive-native"
10DEPENDS:class-native = "autoconf-archive-native"
11 10
12CVE_PRODUCT = "international_components_for_unicode" 11CVE_PRODUCT = "international_components_for_unicode"
13 12
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
9LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
10 file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ 10 file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
11 " 11 "
12DEPENDS = "gmp autoconf-archive" 12DEPENDS = "gmp autoconf-archive-native"
13 13
14SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" 14SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz"
15SRC_URI[sha256sum] = "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993" 15SRC_URI[sha256sum] = "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993"