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, 18 Sep 2016 16:32:17 -0500 Message-ID: <87lgyosxlq.fsf@openmailbox.org> References: <87mvjc1quq.fsf@openmailbox.org> <8737l41qnj.fsf@openmailbox.org> <20160915232412.6bcd757b@scratchpost.org> <871t0ixykh.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]:44099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bljhe-0002xq-16 for guix-devel@gnu.org; Sun, 18 Sep 2016 17:32:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bljhZ-0003DQ-Mj for guix-devel@gnu.org; Sun, 18 Sep 2016 17:32:45 -0400 Received: from smtp8.openmailbox.org ([62.4.1.42]:55535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bljhZ-0003CK-8l for guix-devel@gnu.org; Sun, 18 Sep 2016 17:32:41 -0400 In-Reply-To: <871t0ixykh.fsf@openmailbox.org> (Lukas Gradl's message of "Sat, 17 Sep 2016 11:47:58 -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: Danny Milosavljevic Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain >>> + (zero? (system* "ln" "-s" >>> + (string-append out "/lib/libargon2.so") >>> + (string-append out "/lib/libargon2.so.0"))) >> >> The result of this will be ignored. Did you mean "(and ...)"? > > Oops! Yes, I will send an updated patch later today. > A patch fixing this is attached. Thank you! 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=202fe4bfef5d9d006e2afb982d0eddd5e280d7e559 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 | 40 +++++++++++++++++++++++++++++++++++--= --- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index 7288da6..c0d3168 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,29 @@ 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"))) =2D (install-file "argon2" (string-append out "/bin")) =2D (install-file "libargon2.a" (string-append out "/lib")) =2D (install-file "libargon2.so" (string-append out "/lib")) =2D (copy-recursively "include" =2D (string-append out "/include")))))))) + (and + (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" + (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 buil= ds. + "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 iQIcBAEBCAAGBQJX3wfjAAoJEFP7dyh+2DCRmAoP/RFevZOTOaDcLPgO1mgcupZL gvzORVvBY6xAynC6heDv/QG8oKNWE9a4R9EDviwErT2e4uKd458FHIOPsYHyCjcm Tw6oGAtKtxQoh+OCRJ7pHTLLnMDSN3uk2Os9n9vQIpkuWqOfBGBg48MHBCOwqOa1 MAqIB5QR5n1i7WBMS8zhQYvAp5aC1gODzhYxQsdSn19ty+jjDFvfzqntKM4DFich VWdKBAoyV0O2RurtVQA78klA0YRu/7KpzSn6bCFWXQJqdeY8gU+Ndk8BJU57+x19 nSVjQ6UXVsTEvSWGMigrkYBmwj+9zvWqktuQ7aHjXT4PnMjk/MuFjJ3nizzPN4AV FYeyRMrdNbiilAOB87+MkFQRe4Sio357W7DkSEoprpYcFjDtD1mhK1f6fiLgNw9t +sKD6XuOj0QznAwH2zx8p8ugddVbjBBPal2e96m1OzbzWOaHKTbPhwwsBUCPBmjb xkENxVJa9qZcx4IGfiSpCZ2kp7ZfIjPj10t0CHf2JOAlZ4b1VSHyHNM4Lc7DEsjc mN5B54Qjh4Q79FDokDLRthvsbo9460k3fetTMBElXt72DiLFq3bLsxmO6BiQzK0A /p7PZJoEALO75W6yW3CIAvwqTUbTi1JqAZ1g2HJScA54GYdew2pUIM5+olP6rYNv zr2GUfN9dFC22ZJ1pr6y =VbRL -----END PGP SIGNATURE----- --==-=-=--