From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Gradl Subject: [Patch 4/10] argon2: Install pkg-config file. Date: Mon, 12 Sep 2016 21:26:24 -0500 Message-ID: <8737l41qnj.fsf@openmailbox.org> References: <87mvjc1quq.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]:53904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdQh-0007pO-EO for guix-devel@gnu.org; Mon, 12 Sep 2016 22:26:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjdQc-0001x4-70 for guix-devel@gnu.org; Mon, 12 Sep 2016 22:26:34 -0400 Received: from smtp6.openmailbox.org ([62.4.1.40]:34956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdQb-0001uw-So for guix-devel@gnu.org; Mon, 12 Sep 2016 22:26:30 -0400 In-Reply-To: <87mvjc1quq.fsf@openmailbox.org> (Lukas Gradl's message of "Mon, 12 Sep 2016 21:22:05 -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/x-patch Content-Disposition: inline; filename=0004-gnu-argon2-Install-pkg-config-file.patch Content-Transfer-Encoding: quoted-printable From=209850d4ef481b134d43d2380904b5db8e0d7fdd98 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 | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index 7288da6..42b116f 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" "a"))) + (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,28 @@ 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")) + (zero? (system* "ln" "-s" + (string-append out "/lib/libargon2.so") + (string-append out "/lib/libargon2.so.0"))) + (zero? (system* ; Fix compatability for libtool based build= s. + "ln" "-s" + (string-append out "/lib/libargon2.so") + (string-append out "/lib/libargon2.so.0.0.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 iQIcBAEBCAAGBQJX12PQAAoJEFP7dyh+2DCRMi8P/ip3cuUfRQqu8BM0mBCbykPA h8hwW/KE2JPF7LWi96oaDLobkWP59XxrK1bv5jIqcYQrrkWWW7HV2xetXrBa7JVO 5rfw2uA6mO/Wg+4m2PyarVIcCfD73QqF11c0EqZwOCRWoVl2IVk2deafKrBeKtjE MbSFe5QJJ/jHgNIPs/HmxkFafh1DH90i4IynvKrNU+WmuXegcabctcyMxZEUfyLA 8DDLGuCws8bBDlRKqR9pesEyT6FPd8Sn4R5rhfxnZ4yyGF1gqg9prjmKu5hXbaQI AJlVqjLHtz5GdsCqNf6mWsGUodL571ursjdcju4KrhL8d7YKD4CKLvEIsbRoi8x6 zU0Kze4VNIM27Z9OBW0HfGQxM+CUa/tmNfJAgdvbJzeSI5OROr0Ptj61JPe7cQFV sxAmmB0eZ5cpEH0Zbm5Nblby+H+pnu+YhvFbQNse0Ynyy3BfinIETaWzCOnMmCw8 kHkRtaGkT2noYbr9pVdMOc83qE03FdMgL3UHdY7dqVxRasdq48XaHbOGDf5iIpt1 N/7lhl3FURLhPCUGFmswj6EJxOPb5J6q7nQLg6acv/g22beQdt3qdoMcErTtm0ww esVYBZz+aajhPcMBe2ZHVyCOCdV2aSUYAjm+EYTcaSE4lzawozi5Vj6Qw6Dd9iMy aM57sFYZrJHGXmafPyz7 =DbeC -----END PGP SIGNATURE----- --==-=-=--