From d3854f0cbde5db354d3a0295733e23e4f40ab852 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 24 Oct 2017 16:19:44 +0800 Subject: gnome-common: add PACKAGECONFIG for autoconf-archive Add PACKAGECONFIG for autoconf-archive. Default to enable it to avoid m4 file conflicts between gnome-common and autoconf-archive. e.g. IMAGE_INSTALL_append = " gnome-common autoconf-archive-dev" bitbake We enable autoconf-archive PACKAGECONFIG to avoid the following error. Error: Transaction check error: file /usr/share/aclocal/ax_check_enable_debug.m4 conflicts between attempted installs of gnome-common-3.18.0-r0.noarch and autoconf-archive-dev-2016.09.16-r0.core2_64 file /usr/share/aclocal/ax_code_coverage.m4 conflicts between attempted installs of gnome-common-3.18.0-r0.noarch and autoconf-archive-dev-2016.09.16-r0.core2_64 Signed-off-by: Chen Qi Signed-off-by: Armin Kuster --- meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-oe/recipes-gnome') diff --git a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb index 06f3bb34cf..d874164540 100644 --- a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb +++ b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb @@ -14,6 +14,10 @@ SRC_URI[archive.sha256sum] = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fd EXTRA_AUTORECONF = "" DEPENDS = "" +# Default to enable autoconf-archive to avoid conflicts +PACKAGECONFIG ??= "autoconf-archive" +PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive" + FILES_${PN} += "${datadir}/aclocal" FILES_${PN}-dev = "" -- cgit 1.2.3-korg