From c8557c75b688e8c22680a2afa4960cdb079f1fe5 Mon Sep 17 00:00:00 2001 From: Guillaume Roguez Date: Tue, 9 May 2017 15:36:08 -0400 Subject: [PATCH] contrib: add argon2 library as daemon dependency This patch fixes osx build that not correctly link with Argon2. Change-Id: I2f71179a163643667cac5caaa9517aed5a0de3fc Reviewed-by: Kateryna Kostiuk --- configure.ac | 3 +++ contrib/src/argon2/rules.mak | 2 +- src/Makefile.am | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8d0f13005..927869254 100644 --- a/configure.ac +++ b/configure.ac @@ -573,6 +573,9 @@ AM_CONDITIONAL([BUILD_OPUS], [test "$HAVE_OPUS" -eq 1]) dnl check for openDHT PKG_CHECK_MODULES([OPENDHT], [opendht >= 0.6.1],, AC_MSG_WARN([Missing OpenDHT])) +dnl check for argon2 +PKG_CHECK_MODULES([ARGON2], [libargon2],, AC_MSG_FAILURE([Missing Argon2])) + AC_CHECK_HEADER([cryptopp/cryptlib.h], , AC_MSG_FAILURE([Unable to find the cryptopp headers (you may need to install the dev package).])) LDFLAGS+=" -lcryptopp" AS_IF([test "${SYS}" = "mingw32"],[ diff --git a/contrib/src/argon2/rules.mak b/contrib/src/argon2/rules.mak index c91a3c127..6327e66d0 100644 --- a/contrib/src/argon2/rules.mak +++ b/contrib/src/argon2/rules.mak @@ -2,7 +2,7 @@ ARGON2_VERSION := 1eea0104e7cb2a38c617cf90ffa46ce5db6aceda ARGON2_URL := https://github.com/P-H-C/phc-winner-argon2/archive/$(ARGON2_VERSION).tar.gz -ifeq ($(call need_pkg,'libargon2'),) +ifeq ($(call need_pkg,'libargon2 > 20161029'),) PKGS_FOUND += argon2 endif diff --git a/src/Makefile.am b/src/Makefile.am index fd0259edb..10316e4f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,6 +54,7 @@ libring_la_LDFLAGS = \ @PORTAUDIO_LIBS@ \ @GNUTLS_LIBS@ \ @OPENDHT_LIBS@ \ + @ARGON2_LIBS@ \ @ZLIB_LIBS@ \ $(PCRE_LIBS) \ @LIBS@ @@ -76,7 +77,8 @@ libring_la_CFLAGS = \ @SPEEXDSP_CFLAGS@ \ @PORTAUDIO_CFLAGS@ \ @GNUTLS_CFLAGS@ \ - @OPENDHT_CFLAGS@ + @OPENDHT_CFLAGS@ \ + @ARGON2_CFLAGS@ libring_la_CXXFLAGS = @JSONCPP_CFLAGS@