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 18:43:45 -0500 Message-ID: <87oa3bo89a.fsf@openmailbox.org> References: <87mvjc1quq.fsf@openmailbox.org> <87y42wzg8n.fsf@openmailbox.org> <87ponrpp3n.fsf@openmailbox.org> <20160926012419.601feaf2@scratchpost.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]:41218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boJ5X-0007U4-Od for guix-devel@gnu.org; Sun, 25 Sep 2016 19:44:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1boJ5U-0005Ht-Kz for guix-devel@gnu.org; Sun, 25 Sep 2016 19:44:03 -0400 Received: from smtp16.openmailbox.org ([62.4.1.50]:46633 helo=smtp1.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boJ5U-0005He-AB for guix-devel@gnu.org; Sun, 25 Sep 2016 19:44:00 -0400 In-Reply-To: <20160926012419.601feaf2@scratchpost.org> (Danny Milosavljevic's message of "Mon, 26 Sep 2016 01:24:19 +0200") 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: Danny Milosavljevic Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Danny Milosavljevic writes: > Hi Lukas, > > On Sun, 25 Sep 2016 17:54:36 -0500 > Lukas Gradl wrote: > >> 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. > > I'd also add a comment that the purpose of all that is to unbundle argon2 and then re-add the installed argon2 library. Done. An updated patch is attached. 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=20fd1f5d43844ad80fe516607f869dcbda82b23a1f 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 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ff5b0db..5f5e0c2 100644 =2D-- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -127,15 +127,26 @@ OpenBSD tool of the same name.") (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet + ;; These changes remove the bundled 'argon2' and instead use the + ;; package argon2. '(begin (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 +155,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 iQIcBAEBCAAGBQJX6GEyAAoJEFP7dyh+2DCRt74QALRrkLPmO49n00vY8EGx3eAD eDbmBJXJcNeNH/wmrJHsnZJYYSduLAZBUi5Xjsqb3FN2fSDB1U1y1ojQull6qPgb FUYU5GL9zrbuh2FPRNiXCDUrMJBAmhHbjE4QND+mFcMHqpwfXP6Tt4D28ZwFkocx RX8bsj9b1EGvYOgzcp/7QfaIFiGgWYADBE06w5X1QescNQIrJqYGu2qVaRa1iFto d6TMskc66WHMeKzg8Y3J79dhzbE+hrF9h5YWylQTXvgSXdcYdNEzqiYVEUYM8shp fZYXW/K+Ye+kU7Cj6g2XeIaO7qm1SfRHjIc/d+LPmmeeiCL3o6WiO92g0Vk0POrz UXkjJs2+gduKNLP8tQUNketgc0KQRJohn2waOFveKxOJ/QRVlxaysd0lf7ESRmtM qsznQNqgpLf6ea3b8sdwc/fheviT3QZc4JbSdoqgk6Y22ArGvhPR0rufGbxtBHmz q6tAim6hd+RQdzzIhj/p4RwPA2d1FMTnSLIQK+JB88BhHs22ljCUKMiL4rbhziGp +9E5DAh5PElEM5jOKnT6ROJNFjMl9Y+VFOpU6HllRGZvwLM1PLi7FK0wWt6jEB7X 2FvWZKS8FqBmMC4z/QPw/oQS/uZbli+PfO+mU0zE4kV1w7NplUBJtnWujpW6tT2x 21Kp4beznG738Io0YDzD =bYj8 -----END PGP SIGNATURE----- --==-=-=--