libzip: depend on !BR2_STATIC_LIBS
PATCH v2 1/1 libzip: depend on !BR2_STATIC_LIBS
Since version 1.2.0 libzip requires dynamic library capabilities. Add it to Config.in and propagate this dependency to packages selecting libzip.
Signed-off-by Bartosz Golaszewski <[email protected]>
---v1->v2:
- added comments explaining the !BR2_STATIC_LIBS dependency
- propagated the dependency to packages selecting libzip
package/libsigrok/Config.in | 6 ++++-- package/libzip/Config.in | 4 ++++ package/pulseview/Config.in | 6 ++++-- package/sigrok-cli/Config.in | 7 +++++-- 4 files changed, 17 insertions(+), 6 deletions(-)
package/libsigrok/Config.in +4 -2
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSIGROK depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS # libzip # std=c11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 select BR2_PACKAGE_LIBZIP
@@ -34,6 +35,7 @@ comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8" endif -comment "libsigrok needs a toolchain w/ wchar, threads, gcc >= 4.7" +comment "libsigrok needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.7" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
package/libzip/Config.in +4 -0
@@ -1,8 +1,12 @@ config BR2_PACKAGE_LIBZIP bool "libzip" + depends on !BR2_STATIC_LIBS # dlsym() select BR2_PACKAGE_ZLIB help C library for reading, creating, and modifying zip archives. This package also contains zipcmp, ziptorrent and zipmerge utilities. http://www.nih.at/libzip/ + +comment "libzip needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS
package/pulseview/Config.in +4 -2
@@ -6,6 +6,8 @@ config BR2_PACKAGE_PULSEVIEW depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP + # libsigrok->libzip + depends on !BR2_STATIC_LIBS # libsigrok depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 select BR2_PACKAGE_LIBSIGROK
@@ -24,8 +26,8 @@ config BR2_PACKAGE_PULSEVIEW http://sigrok.org/wiki/PulseView -comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "pulseview needs a toolchain w/ wchar, threads, dynamic library, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_PACKAGE_QT5 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
package/sigrok-cli/Config.in +5 -2
@@ -4,6 +4,8 @@ config BR2_PACKAGE_SIGROK_CLI depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU + # libsigrok->libzip + depends on !BR2_STATIC_LIBS # libsigrok depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 select BR2_PACKAGE_LIBSIGROK
@@ -13,6 +15,7 @@ config BR2_PACKAGE_SIGROK_CLI http://sigrok.org/wiki/Sigrok-cli -comment "sigrok-cli needs a toolchain w/ wchar, threads, gcc >= 4.7" +comment "sigrok-cli needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.7" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
Signature · 1 line
2.13.2
Thomas Petazzoni
AppliedPATCH v2 1/1 libzip: depend on !BR2_STATIC_LIBS
Hello,
Quoted 10 lines · Bartosz Golaszewski
Since version 1.2.0 libzip requires dynamic library capabilities. Add it to Config.in and propagate this dependency to packages selecting libzip.
Signed-off-by Bartosz Golaszewski <[email protected]>---
v1->v2:
- added comments explaining the !BR2_STATIC_LIBS dependency
- propagated the dependency to packages selecting libzip
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com