From a9bfc39660b1e56b5fcba64f0563b0e607dcabb7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 28 May 2025 15:44:00 +0200 Subject: [PATCH] package/{atkmm, atmm2_28, gtkmm3, libglade}: propagate at-spi2-core dependencies Since commit d1757fdfb0010d29f20cd68cb6e16f019e236424, at-spi2-core depends on !BR2_STATIC_LIBS, but this wasn't properly propagated to reverse dependencies, so let's do this propagation now. Fixes the following warning: WARNING: unmet direct dependencies detected for BR2_PACKAGE_AT_SPI2_CORE Depends on [n]: BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=y] Selected by [y]: - BR2_PACKAGE_ATKMM [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_7 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/atkmm/Config.in | 6 ++++-- package/atkmm2_28/Config.in | 6 ++++-- package/gtkmm3/Config.in | 6 ++++-- package/libglade/Config.in | 5 +++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index 571d7e69ad..cdae340266 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_ATKMM depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + depends on !BR2_STATIC_LIBS # at-spi2-core select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC @@ -14,7 +15,8 @@ config BR2_PACKAGE_ATKMM http://www.gtkmm.org/ -comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in index e88073b87a..8dc70210fa 100644 --- a/package/atkmm2_28/Config.in +++ b/package/atkmm2_28/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_ATKMM2_28 depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + depends on !BR2_STATIC_LIBS # at-spi2-core select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM2_66 select BR2_PACKAGE_LIBSIGC2 @@ -17,7 +18,8 @@ config BR2_PACKAGE_ATKMM2_28 http://www.gtkmm.org/ -comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in index 76af6b24f9..ac38ba06fc 100644 --- a/package/gtkmm3/Config.in +++ b/package/gtkmm3/Config.in @@ -1,9 +1,10 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS config BR2_PACKAGE_GTKMM3 bool "gtkmm3" @@ -14,6 +15,7 @@ config BR2_PACKAGE_GTKMM3 depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 depends on BR2_PACKAGE_LIBGTK3 + depends on !BR2_STATIC_LIBS # atkmm select BR2_PACKAGE_ATKMM2_28 select BR2_PACKAGE_CAIROMM1_14 select BR2_PACKAGE_GLIBMM2_66 diff --git a/package/libglade/Config.in b/package/libglade/Config.in index 8d0d26f159..0f889542fa 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 + depends on !BR2_STATIC_LIBS # at-spi2-core select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 @@ -14,7 +15,7 @@ config BR2_PACKAGE_LIBGLADE https://download.gnome.org/sources/libglade/ -comment "libglade needs a toolchain w/ wchar, threads" +comment "libglade needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBGTK2 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS