Skip to contentSkip to conversation

package/at-spi2-core: propagate !static dependency

PATCH In review Peter Korsgaard 2 participants 3 messages Feb 12, 2025 – Feb 13, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/at-spi2-core: propagate !static dependency

Fixes http://autobuild.buildroot.net/results/06fb1275a6c67d0bb6e8e6c0ab31cce2587d5a0f/

Commit d1757fdfb001 ("package/at-spi2-core: bump to version 2.48.0") added a dependency on !static but forgot to propagate it to the reverse dependencies. Fix that.

---
 package/atkmm/Config.in     | 6 ++++--
 package/atkmm2_28/Config.in | 6 ++++--
 package/libglade/Config.in  | 6 ++++--
 package/libgtk2/Config.in   | 5 +++--
 package/libgtk3/Config.in   | 5 +++--
 5 files changed, 18 insertions(+), 10 deletions(-)
package/atkmm/Config.in +4 -2
index 571d7e69ad..e7ac0606f0 100644
@@ -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/ dynamic library, C++, wchar, threads, gcc >= 7"
 	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
package/atkmm2_28/Config.in +4 -2
index e88073b87a..e62a8e729b 100644
@@ -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/ dynamic library, C++, wchar, threads, gcc >= 4.9"
 	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
package/libglade/Config.in +4 -2
index 8d0d26f159..419b2717be 100644
@@ -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,8 @@ config BR2_PACKAGE_LIBGLADE
 
 	  https://download.gnome.org/sources/libglade/
 
-comment "libglade needs a toolchain w/ wchar, threads"
+comment "libglade needs a toolchain w/ dynamic library, wchar, threads"
 	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
package/libgtk2/Config.in +3 -2
index f8821ba246..6a2145ebed 100644
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBGTK2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
+	depends on !BR2_STATIC_LIBS # at-spi2-core
 	select BR2_PACKAGE_AT_SPI2_CORE
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
@@ -33,10 +34,10 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 
 endif
 
-comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "libgtk2 needs a toolchain w/ dynamic library, wchar, threads, C++, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/libgtk3/Config.in +3 -2
index 52ee50db49..ab2ab57c35 100644
@@ -1,10 +1,10 @@
-comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "libgtk3 needs a toolchain w/ dynamic library, wchar, threads, C++, gcc >= 4.9"
 	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
 comment "libgtk3 needs an OpenGL or an OpenGL-EGL backend"
 	depends on BR2_USE_MMU
@@ -21,6 +21,7 @@ config BR2_PACKAGE_LIBGTK3
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
+	depends on !BR2_STATIC_LIBS # at-spi2-core
 	depends on BR2_PACKAGE_HAS_LIBEGL || \
 		BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_AT_SPI2_CORE
Signature · 6 lines
2.39.5

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello Peter,

Le 12/02/2025 à 10:45, Peter Korsgaard a écrit :

Quoted 43 lines

Fixes http://autobuild.buildroot.net/results/06fb1275a6c67d0bb6e8e6c0ab31cce2587d5a0f/

Commit d1757fdfb001 ("package/at-spi2-core: bump to version 2.48.0") added a dependency on !static but forgot to propagate it to the reverse dependencies. Fix that.

---
 package/atkmm/Config.in     | 6 ++++--
 package/atkmm2_28/Config.in | 6 ++++--
 package/libglade/Config.in  | 6 ++++--
 package/libgtk2/Config.in   | 5 +++--
 package/libgtk3/Config.in   | 5 +++--
 5 files changed, 18 insertions(+), 10 deletions(-)
package/atkmm/Config.in +4 -2
index 571d7e69ad..e7ac0606f0 100644
@@ -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/ dynamic library, C++, wchar, threads, gcc >= 7"
 	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
package/atkmm2_28/Config.in +0 -0
index e88073b87a..e62a8e729b 100644

package/atkmm2_28/Config.in config BR2_PACKAGE_ATKMM2_28 · line 8

Quoted 4 lines
package/atkmm2_28/Config.in +1 -0
@@ -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

Now the dependency must be propagated to packages that select atkmm2_28 package:(gtkmm3).

gtkmm3 itself is selected by Transmission package.

Quoted 42 lines
package/atkmm2_28/Config.in +3 -2
 	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/ dynamic library, C++, wchar, threads, gcc >= 4.9"
 	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
package/libglade/Config.in +4 -2
index 8d0d26f159..419b2717be 100644
@@ -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,8 @@ config BR2_PACKAGE_LIBGLADE
 
 	  https://download.gnome.org/sources/libglade/
 
-comment "libglade needs a toolchain w/ wchar, threads"
+comment "libglade needs a toolchain w/ dynamic library, wchar, threads"
 	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
package/libgtk2/Config.in +0 -0
index f8821ba246..6a2145ebed 100644

package/libgtk2/Config.in config BR2_PACKAGE_LIBGTK2 · line 10

Quoted 4 lines
package/libgtk2/Config.in +1 -0
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBGTK2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
+	depends on !BR2_STATIC_LIBS # at-spi2-core

package/cwiid/Config.in:28: select BR2_PACKAGE_LIBGTK2
package/gkrellm/Config.in:28: select BR2_PACKAGE_LIBGTK2
package/libfm/Config.in:12: select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
package/pcmanfm/Config.in:13: select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
package/pinentry/Config.in:58: select BR2_PACKAGE_LIBGTK2
package/xscreensaver/Config.in:14: select BR2_PACKAGE_LIBGTK2

Quoted 34 lines
package/libgtk2/Config.in +2 -2
 	select BR2_PACKAGE_AT_SPI2_CORE
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
@@ -33,10 +34,10 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 
 endif
 
-comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "libgtk2 needs a toolchain w/ dynamic library, wchar, threads, C++, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/libgtk3/Config.in +2 -2
index 52ee50db49..ab2ab57c35 100644
@@ -1,10 +1,10 @@
-comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "libgtk3 needs a toolchain w/ dynamic library, wchar, threads, C++, gcc >= 4.9"
 	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
 comment "libgtk3 needs an OpenGL or an OpenGL-EGL backend"
 	depends on BR2_USE_MMU

package/libgtk3/Config.in config BR2_PACKAGE_LIBGTK3 · line 24

Quoted 4 lines
package/libgtk3/Config.in +1 -0
@@ -21,6 +21,7 @@ config BR2_PACKAGE_LIBGTK3
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
+	depends on !BR2_STATIC_LIBS # at-spi2-core

package/vte/Config.in:14: select BR2_PACKAGE_LIBGTK3

Best regards,
Romain

package/libgtk3/Config.in config BR2_PACKAGE_LIBGTK3 · line 27

Quoted 3 lines
package/libgtk3/Config.in +0 -0
 	depends on BR2_PACKAGE_HAS_LIBEGL || \
 		BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_AT_SPI2_CORE

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
Quoted 46 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

Hello Peter,
Le 12/02/2025 à 10:45, Peter Korsgaard a écrit :

Quoted 42 lines

Fixes http://autobuild.buildroot.net/results/06fb1275a6c67d0bb6e8e6c0ab31cce2587d5a0f/

Commit d1757fdfb001 ("package/at-spi2-core: bump to version 2.48.0") added a dependency on !static but forgot to propagate it to the reverse dependencies. Fix that.

---

package/atkmm/Config.in     | 6 ++++--
package/atkmm2_28/Config.in | 6 ++++--
package/libglade/Config.in  | 6 ++++--
package/libgtk2/Config.in   | 5 +++--
package/libgtk3/Config.in   | 5 +++--
5 files changed, 18 insertions(+), 10 deletions(-)
package/atkmm/Config.in +0 -0
index 571d7e69ad..e7ac0606f0 100644
@@ -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

package/atkmm/Config.in +1 -0
+	depends on !BR2_STATIC_LIBS # at-spi2-core

select BR2_PACKAGE_AT_SPI2_CORE
select BR2_PACKAGE_GLIBMM
select BR2_PACKAGE_LIBSIGC

package/atkmm/Config.in +0 -0
@@ -14,7 +15,8 @@ config BR2_PACKAGE_ATKMM
 

http://www.gtkmm.org/

package/atkmm/Config.in +1 -1
-comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7"
+comment "atkmm needs a toolchain w/ dynamic library, C++, wchar, threads, gcc >= 7"

depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \

package/atkmm/Config.in +2 -1
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| BR2_STATIC_LIBS
package/atkmm2_28/Config.in +0 -0
index e88073b87a..e62a8e729b 100644
Quoted 8 lines

package/atkmm2_28/Config.in

Quoted 5 lines
package/atkmm2_28/Config.in +0 -0
@@ -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

package/atkmm2_28/Config.in +1 -0
+	depends on !BR2_STATIC_LIBS # at-spi2-core

Now the dependency must be propagated to packages that select atkmm2_28 package:(gtkmm3).

Argh, indeed. I'll send a v2.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot