* [Buildroot] [PATCH 1/1] package/python-argon2-cffi: use system libargon2
@ 2020-05-15 21:31 James Hilliard
2020-10-17 12:57 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2020-05-15 21:31 UTC (permalink / raw)
To: buildroot
The python-argon2-cffi package can be used with the system libargon2,
we should use that instead of the embedded version.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/python-argon2-cffi/Config.in | 3 +++
package/python-argon2-cffi/python-argon2-cffi.mk | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in
index c1adcbc77d..16bbe6c4e3 100644
--- a/package/python-argon2-cffi/Config.in
+++ b/package/python-argon2-cffi/Config.in
@@ -1,8 +1,11 @@
config BR2_PACKAGE_PYTHON_ARGON2_CFFI
bool "python-argon2-cffi"
+ depends on BR2_USE_MMU # libargon2
+ depends on !BR2_STATIC_LIBS # libargon2
select BR2_PACKAGE_PYTHON_CFFI # runtime
select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
select BR2_PACKAGE_PYTHON_SIX # runtime
+ select BR2_PACKAGE_LIBARGON2
help
The secure Argon2 password hashing algorithm.
diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk
index 0e3e1be3d6..674e089eb7 100644
--- a/package/python-argon2-cffi/python-argon2-cffi.mk
+++ b/package/python-argon2-cffi/python-argon2-cffi.mk
@@ -10,12 +10,13 @@ PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/74/fd/d78e003a
PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools
PYTHON_ARGON2_CFFI_LICENSE = MIT
PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE
-PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi
+PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2
+PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1
ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
-PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SSE2=1
+PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1
else
-PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SSE2=0
+PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0
endif
$(eval $(python-package))
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/python-argon2-cffi: use system libargon2
2020-05-15 21:31 [Buildroot] [PATCH 1/1] package/python-argon2-cffi: use system libargon2 James Hilliard
@ 2020-10-17 12:57 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2020-10-17 12:57 UTC (permalink / raw)
To: buildroot
On Fri, 15 May 2020 15:31:20 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:
> The python-argon2-cffi package can be used with the system libargon2,
> we should use that instead of the embedded version.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
> package/python-argon2-cffi/Config.in | 3 +++
> package/python-argon2-cffi/python-argon2-cffi.mk | 7 ++++---
> 2 files changed, 7 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-17 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-15 21:31 [Buildroot] [PATCH 1/1] package/python-argon2-cffi: use system libargon2 James Hilliard
2020-10-17 12:57 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.