NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libzip: depend on !BR2_STATIC_LIBS

Browse Source 
Since version 1.2.0 libzip requires dynamic library capabilities. Add
it to Config.in and propagate this dependency to packages selecting
libzip.

Fixes:

  http://autobuild.buildroot.net/results/c50ffa5bf565e75333192edc89e2d39044d07f26/

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bartosz Golaszewski 2017-07-05 09:56:20 +02:00 committed by Thomas Petazzoni
parent 421b9d175f
commit 7d9d406832
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/libsigrok/Config.in
View File

@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSIGROK
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS # libzip
# std=c11 # std=c11
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
select BR2_PACKAGE_LIBZIP select BR2_PACKAGE_LIBZIP
@ -34,6 +35,7 @@ comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8"
endif 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_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

4
package/libzip/Config.in
View File

@ -1,8 +1,12 @@
config BR2_PACKAGE_LIBZIP config BR2_PACKAGE_LIBZIP
bool "libzip" bool "libzip"
depends on !BR2_STATIC_LIBS # dlsym()
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
C library for reading, creating, and modifying zip archives. This C library for reading, creating, and modifying zip archives. This
package also contains zipcmp, ziptorrent and zipmerge utilities. package also contains zipcmp, ziptorrent and zipmerge utilities.
http://www.nih.at/libzip/ http://www.nih.at/libzip/
comment "libzip needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS

6
package/pulseview/Config.in
View File

@ -6,6 +6,8 @@ config BR2_PACKAGE_PULSEVIEW
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
# libsigrok->libzip
depends on !BR2_STATIC_LIBS
# libsigrok # libsigrok
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
select BR2_PACKAGE_LIBSIGROK select BR2_PACKAGE_LIBSIGROK
@ -24,8 +26,8 @@ config BR2_PACKAGE_PULSEVIEW
http://sigrok.org/wiki/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_USE_MMU
depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ 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

7
package/sigrok-cli/Config.in
View File

@ -4,6 +4,8 @@ config BR2_PACKAGE_SIGROK_CLI
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU depends on BR2_USE_MMU
# libsigrok->libzip
depends on !BR2_STATIC_LIBS
# libsigrok # libsigrok
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
select BR2_PACKAGE_LIBSIGROK select BR2_PACKAGE_LIBSIGROK
@ -13,6 +15,7 @@ config BR2_PACKAGE_SIGROK_CLI
http://sigrok.org/wiki/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_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