From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Gradl Subject: Re: [Patch 4/10] argon2: Install pkg-config file. Date: Sun, 25 Sep 2016 18:32:43 -0500 Message-ID: <87shsno8ro.fsf@openmailbox.org> References: <87mvjc1quq.fsf@openmailbox.org> <8737l41qnj.fsf@openmailbox.org> <20160915232412.6bcd757b@scratchpost.org> <87d1k0sx3s.fsf@openmailbox.org> <20160919211515.1f63db1d@scratchpost.org> <8760pjr43x.fsf@openmailbox.org> <20160926011356.3e31e740@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]:39903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boIul-00056K-By for guix-devel@gnu.org; Sun, 25 Sep 2016 19:32:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1boIuh-0003AA-8S for guix-devel@gnu.org; Sun, 25 Sep 2016 19:32:54 -0400 Received: from smtp23.openmailbox.org ([62.4.1.57]:60038 helo=smtp8.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boIug-0003A1-TU for guix-devel@gnu.org; Sun, 25 Sep 2016 19:32:51 -0400 In-Reply-To: <20160926011356.3e31e740@scratchpost.org> (Danny Milosavljevic's message of "Mon, 26 Sep 2016 01:13:56 +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 Hi, Danny Milosavljevic writes: > Yes. I think that is a good approach. > > Could you send an updated patchset? The attached patch implements everything as discussed. Thank you for your explanation and your help! I am a lot happier with this package now than before. Best, Lukas --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-argon2-Install-pkg-config-file.patch Content-Transfer-Encoding: quoted-printable From=205fb85fef7b1475baca6c29beb26799ca8f3d814a Mon Sep 17 00:00:00 2001 From: Lukas Gradl Date: Tue, 9 Aug 2016 16:49:19 -0500 Subject: [PATCH 04/10] gnu: argon2: Install pkg-config file. * gnu/packages/password-utils.scm (argon2)[source]: Create pkg-config file. [arguments]: Install it. =2D-- gnu/packages/password-utils.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index 7288da6..f62d041 100644 =2D-- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -311,6 +311,21 @@ through the pass command.") "https://codeload.github.com/P-H-C/phc-winner-" name "/tar.gz/" version)) (file-name (string-append name "-" version ".tar.gz")) + (snippet + '(let ((p (open-file "argon2.pc" "w"))) + (begin + (display + (string-append "prefix=3D/usr/local\n" + "exec_prefix=3D${prefix}\n" + "includedir=3D${prefix}/include\n" + "libdir=3D${prefix}/lib\n\n" + "Name: Argon2\n" + "Description: " + "The Argon2 password hashing algorithm\n" + "Version: 1.0.0\n" + "Cflags: -I${includedir}/\n" + "Libs: -L${libdir} -largon2\n") p) + (close-output-port p)))) (sha256 (base32 "0g6wa94sh639xl1qc8z21q43r1mp8y77r1zf8nwx5pfsxd8fmyzv")))) @@ -321,14 +336,23 @@ through the pass command.") #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'fix-pkg-config + (lambda _ + (substitute* "argon2.pc" + (("/usr/local") + (assoc-ref %outputs "out"))))) (replace 'install (lambda _ (let ((out (assoc-ref %outputs "out"))) (install-file "argon2" (string-append out "/bin")) (install-file "libargon2.a" (string-append out "/lib")) (install-file "libargon2.so" (string-append out "/lib")) + (install-file "argon2.pc" + (string-append out "/lib/pkgconfig")) (copy-recursively "include" =2D (string-append out "/include")))))))) + (string-append out "/include")) + (symlink (string-append out "/lib/libargon2.so") + (string-append out "/lib/libargon2.so.0")))))))) (home-page "https://www.argon2.com/") (synopsis "Password hashing library") (description "Argon2 provides a key derivation function that was decla= red =2D-=20 2.9.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX6F6bAAoJEFP7dyh+2DCRH/0P/3luvbo8ebUZkA2GN0xQhIrp Q83qqjE6IDqZ+22R73liX3w9j5Ppy2u/n+xz7Mb0CwcKmFvW0tn3UoHRpx3GlBwO AOW+dVdM6hVkUNjI+AJnDUNqKYUs2dKK5vRDP2opuxOa2t/jmcOrQwzvS0zrz+HP 6G7FNTOvGGIqfEH4u2NsFGCX0ytfwpiuVzr2RhbuswWs3Uz5RzJ0dyemS3jQvTTi mCH+nmmLHBsQ3PpEHBsM5LlGY+RwiVS9YUQ6L7sFwVHzm4Y48QcxSteDEcSbh3y6 N/+Z8eggdhPBpnLP6v3A+rN+8bGjAK1FFdeLmJ+guVSkBr+I6kvcL0fVxE8Grj+9 sBXBlOZQ2+QYnq6Sb2Xcab7K1ENYd1mdxoVZjVxz6tY42YnA/Mc7vrDYAMhxgWPp RqgNilhU5sr4xtXTRpzNs5nR5NoTxU1869UK62eRnmT+bBJ+rQqkvnRPaYHKNlq4 2U3vhRMhe4w9aWnNKmtOKSUTPxVNt37dIx7R87voBgGQjMFdNlpgkEd92BB8+oOp Y59dm3y+4WuAHILOiMTv7ymWZdZDXLzWuRB0h47W90Gn+YI+X2kK+Be8XKxA/i+g ZtbVQ0SjR+COtbqKMY9CVRU7IHgdHCVe1RFp9rSkyXsTNFgMVTvu/ZyXoms9RQA9 BVuBEMPA9XrSOR0cGi+l =l4Lb -----END PGP SIGNATURE----- --==-=-=--