[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Patch 5/10] opendht: Propagate argon2.
From: |
Lukas Gradl |
Subject: |
Re: [Patch 5/10] opendht: Propagate argon2. |
Date: |
Sun, 25 Sep 2016 17:54:36 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Hello,
I noticed that some linker flags are set incorrectly. The result was
that the output of
"objdump -p /gnu/store/...-opendht-0.6.1/lib/libopendht.so"
was missing a 'NEEDED' line for 'libargon2.so.0'.
The attached patch fixes that.
Thank you!
Best,
Lukas
From e7e0b00146f380f96c7ecb8d00ba3d00375d49f9 Mon Sep 17 00:00:00 2001
From: Lukas Gradl <address@hidden>
Date: Tue, 9 Aug 2016 17:00:52 -0500
Subject: [PATCH 05/10] gnu: opendht: Propagate argon2.
* gnu/packages/crypto.scm (opendht)[source]: Add argon2 to pkg-config file.
[inputs]: Remove argon2.
[propagated-inputs]: Add argon2.
---
gnu/packages/crypto.scm | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index ff5b0db..0c3e6c1 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -131,11 +131,20 @@ OpenBSD tool of the same name.")
(delete-file-recursively "src/argon2")
(substitute* "src/Makefile.am"
(("./argon2/libargon2.la") "")
- (("SUBDIRS = argon2") ""))
+ (("SUBDIRS = argon2") "")
+ (("libopendht_la_LDFLAGS = @LDFLAGS@")
+ "libopendht_la_LDFLAGS = @LDFLAGS@ @argon2_LIBS@"))
(substitute* "src/crypto.cpp"
(("argon2/argon2.h") "argon2.h"))
(substitute* "configure.ac"
- (("src/argon2/Makefile") ""))))
+ (("src/argon2/Makefile") "")
+ (("PKG_CHECK_MODULES..GNUTLS.. .gnutls .. 3.1..")
+ "PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.1])\n\
+PKG_CHECK_MODULES([argon2], [argon2 >= 1.0])"))
+ (substitute* "opendht.pc.in"
+ (("Libs: -L..libdir. -lopendht")
+ (string-append "Libs: -L${libdir} -lopendht\n"
+ "Requires: argon2")))))
(sha256
(base32
"09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x"))))
@@ -144,8 +153,9 @@ OpenBSD tool of the same name.")
`(("gnutls" ,gnutls)
("nettle" ,nettle)
("msgpack" ,msgpack)
- ("readline" ,readline)
- ("argon2" ,argon2)))
+ ("readline" ,readline)))
+ (propagated-inputs
+ `(("argon2" ,argon2)))
(native-inputs
`(("autoconf" ,autoconf)
("pkg-config" ,pkg-config)
--
2.9.0
signature.asc
Description: PGP signature
- Re: [Patch 4/10] argon2: Install pkg-config file., (continued)
- Re: [Patch 4/10] argon2: Install pkg-config file., Danny Milosavljevic, 2016/09/15
- Re: [Patch 4/10] argon2: Install pkg-config file., Lukas Gradl, 2016/09/18
- Re: [Patch 4/10] argon2: Install pkg-config file., Danny Milosavljevic, 2016/09/19
- Re: [Patch 4/10] argon2: Install pkg-config file., Lukas Gradl, 2016/09/25
- Re: [Patch 4/10] argon2: Install pkg-config file., Danny Milosavljevic, 2016/09/25
- Re: [Patch 4/10] argon2: Install pkg-config file., Lukas Gradl, 2016/09/25
- Re: [Patch 4/10] argon2: Install pkg-config file., Ludovic Courtès, 2016/09/28
Re: [Patch 5/10] opendht: Propagate argon2., Lukas Gradl, 2016/09/12
- Re: [Patch 5/10] opendht: Propagate argon2.,
Lukas Gradl <=
[Patch 6/10] telephony: Add license prefix., Lukas Gradl, 2016/09/12
[Patch 7/10] opendht: Propagate msgpack., Lukas Gradl, 2016/09/12
[Patch 8/10] Add libring., Lukas Gradl, 2016/09/12
[Patch 9/10] Add libringclient., Lukas Gradl, 2016/09/12
[Patch 10/10] Add ring-client-gnome., Lukas Gradl, 2016/09/12