public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
From: James Hilliard <james.hilliard1@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: use system libargon2
Date: Fri, 15 May 2020 15:31:20 -0600	[thread overview]
Message-ID: <20200515213120.1174774-1-james.hilliard1@gmail.com> (raw)

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

             reply	other threads:[~2020-05-15 21:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15 21:31 James Hilliard [this message]
2020-10-17 12:57 ` [Buildroot] [PATCH 1/1] package/python-argon2-cffi: use system libargon2 Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200515213120.1174774-1-james.hilliard1@gmail.com \
    --to=james.hilliard1@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox