From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Gradl Subject: Re: [Patch 5/10] opendht: Propagate argon2. Date: Sun, 25 Sep 2016 17:54:36 -0500 Message-ID: <87ponrpp3n.fsf@openmailbox.org> References: <87mvjc1quq.fsf@openmailbox.org> <87y42wzg8n.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boIJv-0003u7-Nh for guix-devel@gnu.org; Sun, 25 Sep 2016 18:54:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1boIJr-0008Kq-L5 for guix-devel@gnu.org; Sun, 25 Sep 2016 18:54:51 -0400 Received: from smtp29.openmailbox.org ([62.4.1.63]:58264 helo=smtp14.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boIJr-0008KW-Di for guix-devel@gnu.org; Sun, 25 Sep 2016 18:54:47 -0400 In-Reply-To: <87y42wzg8n.fsf@openmailbox.org> (Lukas Gradl's message of "Mon, 12 Sep 2016 21:27:20 -0500") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-opendht-Propagate-argon2.patch Content-Transfer-Encoding: quoted-printable From=20e7e0b00146f380f96c7ecb8d00ba3d00375d49f9 Mon Sep 17 00:00:00 2001 From: Lukas Gradl 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. =2D-- 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 =2D-- 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") "") =2D (("SUBDIRS =3D argon2") "")) + (("SUBDIRS =3D argon2") "") + (("libopendht_la_LDFLAGS =3D @LDFLAGS@") + "libopendht_la_LDFLAGS =3D @LDFLAGS@ @argon2_LIBS@")) (substitute* "src/crypto.cpp" (("argon2/argon2.h") "argon2.h")) (substitute* "configure.ac" =2D (("src/argon2/Makefile") "")))) + (("src/argon2/Makefile") "") + (("PKG_CHECK_MODULES..GNUTLS.. .gnutls .. 3.1..") + "PKG_CHECK_MODULES([GNUTLS], [gnutls >=3D 3.1])\n\ +PKG_CHECK_MODULES([argon2], [argon2 >=3D 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) =2D ("readline" ,readline) =2D ("argon2" ,argon2))) + ("readline" ,readline))) + (propagated-inputs + `(("argon2" ,argon2))) (native-inputs `(("autoconf" ,autoconf) ("pkg-config" ,pkg-config) =2D-=20 2.9.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX6FWtAAoJEFP7dyh+2DCRolQQAK4Pi/o5ep8dYi/T4YEYNMPE floUB7pMy+9XaoEe+zwyLzdgC0YZw8o0BP2lUbEy8YLKMwlROqb3oUIdDGOvucX9 XVEPDbKKlAG+1wwlX8j+PygERjaaZ15YjHbpw/veefTNLvMnat8UE/0n5D5u7eGx BlaBS7ahfPc4OgVHrBdWIjTvChXq/ZOq5JpwuMJOrT0oXiLBWgOBtl7gtMmr67Na vQj2wf9VJIsnAq9CWeYAVyKuZnRkVGK58ZiBrxKPUrgq02Pc8AoLqEKRa8PMFmhl qo/QCLB8uitnTYi/2tvmmQHr2pIf0qZkTMTRqLh5lgraYaD8VM+kaLC0gUq71EQs H0zu296H+lMtbyG0TBuAP8LgQAXWzRdZrBoXijy3MiOzJzCU3mqc8WYUf0rxF6EB ck7Lq8llxKdM+RohAVCWnyHkxOR66waQSD/xb6A0sq8RgS5MeA7jFxvj8MieFcIq kYku/tGxxhVJKM+mv9z/uRENzz0cvTxMf6newd3QyAa3nBSgEZCEtATTEHu0mEkq Ltl0AxkfXCcIrtJbzfCIvUqUbQvMAWVk3nTIiiDMpr4ECuxxjRjZqbW3BbNUKpNo jrqiOxsv7SLD6y+aGTJM3bHkrsm7BBqAucqd8d/qCIN4FH3viJvI7jsuetsuVram 5TCCHIbJww2jqm4CigZi =kGDh -----END PGP SIGNATURE----- --==-=-=--