From patchwork Tue Sep 13 02:27:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Gradl X-Patchwork-Id: 15565 Received: (qmail 57328 invoked by uid 89); 13 Sep 2016 02:27:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=nettle X-Spam-Status: No, score=-4.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Sep 2016 02:27:41 +0000 Received: from localhost ([::1]:46110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdRj-0007yZ-Qh for patchwork@sourceware.org; Mon, 12 Sep 2016 22:27:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdRf-0007yT-Cu for guix-devel@gnu.org; Mon, 12 Sep 2016 22:27:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjdRZ-0002EU-Vv for guix-devel@gnu.org; Mon, 12 Sep 2016 22:27:34 -0400 Received: from smtp6.openmailbox.org ([62.4.1.40]:39363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjdRZ-0002EC-Or for guix-devel@gnu.org; Mon, 12 Sep 2016 22:27:29 -0400 Received: by mail2.openmailbox.org (Postfix, from userid 1001) id 4302710171F; Tue, 13 Sep 2016 04:27:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1473733649; bh=yi1pr9y6eCE7cdygQ+P8teSWiAOExVbt/tWcmM3ZpGY=; h=From:To:Subject:References:Date:In-Reply-To:From; b=yALPXUATFJkL3EoYEiICZtZAEf+nCTtnzQVl7gyfefUltjYwLzuS9LLT/b2WD1rta 15zXbNcrTPp004ltlDlSmI6eFvyb+BUddzVl7AC6eH0bdZI2BfVAE+Ax2HPuUppTGW z7Ewj1Fr/h8KzDpOtqj+sCRz16sf2ye0iqo1P4/w= From: Lukas Gradl DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1473733643; bh=yi1pr9y6eCE7cdygQ+P8teSWiAOExVbt/tWcmM3ZpGY=; h=From:To:Subject:References:Date:In-Reply-To:From; b=GzujgvuQH18Qr9tAgJT4nG2xmZ05PRB08wZSkRTG/QhFFHPGSTW1qKsIj00TfqfOl f3Ali6msw/Ly93FYf7PnsnHJjsev+Op11VrSwMy3AA3SGAyHmIAH9U6tLIbmE/ozP/ NhA5tXS2JB7EBiUNVJfe6xgn1Jd4MhE0Wg/bugIU= To: guix-devel@gnu.org Subject: Re: [Patch 5/10] opendht: Propagate argon2. References: <87mvjc1quq.fsf@openmailbox.org> Date: Mon, 12 Sep 2016 21:27:20 -0500 In-Reply-To: <87mvjc1quq.fsf@openmailbox.org> (Lukas Gradl's message of "Mon, 12 Sep 2016 21:22:05 -0500") Message-ID: <87y42wzg8n.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.4.1.40 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" From 5f14484f9d66cc5c40a19de9d58190d0b2b63342 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. --- gnu/packages/crypto.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 5dad97c..850ee71 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -125,7 +125,11 @@ OpenBSD tool of the same name.") (substitute* "src/crypto.cpp" (("argon2/argon2.h") "argon2.h")) (substitute* "configure.ac" - (("src/argon2/Makefile") "")))) + (("src/argon2/Makefile") "")) + (substitute* "opendht.pc.in" + (("Libs: -L..libdir. -lopendht") + (string-append "Libs: -L${libdir} -lopendht\n" + "Requires: argon2"))))) (sha256 (base32 "09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x")))) @@ -134,8 +138,9 @@ OpenBSD tool of the same name.") `(("gnutls" ,gnutls) ("nettle" ,nettle) ("msgpack" ,msgpack) - ("readline" ,readline) - ("argon2" ,argon2))) + ("readline" ,readline))) + (propagated-inputs + `(("argon2" ,argon2))) (native-inputs `(("autoconf" ,autoconf) ("pkg-config" ,pkg-config) -- 2.9.0