mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libargon2: support static build

Browse Source 
There are options to build only static or only shared libs. The default
is to build both.

Also update reverse dependencies. Note that lua-argon2 doesn't have the
"# libargon2" comment so presumably it needs shared libs itself.

Signed-off-by: Andreas Mohr <and@gmx.li>
[Arnout: also update reverse dependencies]
Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
Andreas Mohr
2026-05-18 22:02:28 +00:00
committed by Arnout Vandecappelle
parent 1c393bfa63
commit 29ffdc0dda
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/cryptsetup/Config.in
View File

@@ -2,7 +2,7 @@ config BR2_PACKAGE_CRYPTSETUP
bool "cryptsetup" bool "cryptsetup"
depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
depends on BR2_USE_MMU # lvm2, libargon2 depends on BR2_USE_MMU # lvm2, libargon2
depends on !BR2_STATIC_LIBS # lvm2, libargon2 depends on !BR2_STATIC_LIBS # lvm2
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
select BR2_PACKAGE_ARGP_STANDALONE if BR2_PACKAGE_LIBSSH && \ select BR2_PACKAGE_ARGP_STANDALONE if BR2_PACKAGE_LIBSSH && \
(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL) (BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL)

5
package/libargon2/Config.in
View File

@@ -1,12 +1,7 @@
config BR2_PACKAGE_LIBARGON2 config BR2_PACKAGE_LIBARGON2
bool "libargon2" bool "libargon2"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS
help help
A modern password hashing algorithm A modern password hashing algorithm
https://password-hashing.net/#argon2 https://password-hashing.net/#argon2
comment "libargon needs a toolchain w/ dynamic library"
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS

6
package/libargon2/libargon2.mk
View File

@@ -23,6 +23,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
LIBARGON2_OPTS += NO_THREADS=1 LIBARGON2_OPTS += NO_THREADS=1
endif endif
ifeq ($(BR2_STATIC_LIBS),y)
LIBARGON2_OPTS += LIB_SH= LINKED_LIB_SH=
else ifeq ($(BR2_SHARED_LIBS),y)
LIBARGON2_OPTS += LIB_ST=
endif
define LIBARGON2_BUILD_CMDS define LIBARGON2_BUILD_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
$(LIBARGON2_OPTS) $(LIBARGON2_OPTS)

1
package/python-argon2-cffi-bindings/Config.in
View File

@@ -1,7 +1,6 @@
config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS
bool "python-argon2-cffi-bindings" bool "python-argon2-cffi-bindings"
depends on BR2_USE_MMU # libargon2 depends on BR2_USE_MMU # libargon2
depends on !BR2_STATIC_LIBS # libargon2
select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime
select BR2_PACKAGE_LIBARGON2 select BR2_PACKAGE_LIBARGON2
help help