From patchwork Tue Feb 23 23:16:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 27223 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0CB6627BC4B; Tue, 23 Feb 2021 23:17:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56C2027BC4A for ; Tue, 23 Feb 2021 23:17:11 +0000 (GMT) Received: from localhost ([::1]:54972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEgvT-0002ys-EQ for patchwork@mira.cbaines.net; Tue, 23 Feb 2021 18:17:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEgvN-0002yl-TQ for guix-patches@gnu.org; Tue, 23 Feb 2021 18:17:01 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEgvN-00040r-MU for guix-patches@gnu.org; Tue, 23 Feb 2021 18:17:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEgvN-0003ct-Im for guix-patches@gnu.org; Tue, 23 Feb 2021 18:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46728] [PATCH 3/7] gnu: Add aws-c-cal. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 23:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46728@debbugs.gnu.org Received: via spool by 46728-submit@debbugs.gnu.org id=B46728.161412219913908 (code B ref 46728); Tue, 23 Feb 2021 23:17:01 +0000 Received: (at 46728) by debbugs.gnu.org; 23 Feb 2021 23:16:39 +0000 Received: from localhost ([127.0.0.1]:60900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEgv0-0003cF-SM for submit@debbugs.gnu.org; Tue, 23 Feb 2021 18:16:39 -0500 Received: from mail-il1-f179.google.com ([209.85.166.179]:44207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEguy-0003c2-Lx for 46728@debbugs.gnu.org; Tue, 23 Feb 2021 18:16:37 -0500 Received: by mail-il1-f179.google.com with SMTP id o1so49246ila.11 for <46728@debbugs.gnu.org>; Tue, 23 Feb 2021 15:16:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=8evI+avkQfvXT3MxugbnnHF05t5vGgu+nrz5XUTdG1I=; b=uUZvrmNv5WaGP7o6AbEmJRTBHAQynKN+yEMYaNnbJ2tDNygNvrdflptwDOhz4jeFD8 dZaM8WSPdkobD3jgQ7i2e5aqYoRj/n1Y/31Bgx+bMOUJR/gyA2w9GHHJeIykDRDEU2qL qtiStgUg0xg2vRjKj7RLFC54xRp9dd1taiACeX4UsLqufQ3yltrb2dMeQxfkmzQf6t4M fEMox6Niv1A2AH8wdmAihdnhyCeRpzKzFxS8dQMF0mzf1IDsOP5iSAD4USH4baxOI7Vm KlehiUNTtG1NqDvCkAGWLg7aK9+AX7ir/A3Jnv5c8hRx/DmEzSmcYSJQY0BeayAUTmyH 8BtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=8evI+avkQfvXT3MxugbnnHF05t5vGgu+nrz5XUTdG1I=; b=OC01r2mPKcrDNfWfc0IZf3BTWES2W4Wx3K5O9q7EmhPj2gV0zrHDJST6pQu+Kmznfc CwMKu0v5SxV2a4aQ1EYoaaIDYU4mqep8ZCBxFisF/9in6GuLQ3C4AmI7z+ZvRWBkcJLC HViUPRlchf9k8CJ2Tx/tpp8iX8x4z010yll8l+7Kxtxjp4/eW/R/ngAViaEDWCpUD48O p92tVo3P+M6wEPTTk8LePhmC18f8zlMejSgmNXu74YVqTsXKzCxpcm4b1Jtv1b+nZNlv SU0xDlWcOGTWtpokJIKar2Y0HMFdeMO/y2AULHPPpNM+qfUT9DDH5eXVc1Lye6eFqnEf Kecg== X-Gm-Message-State: AOAM531TFsUSGdFmyDioqnFBy+UaJBvhPp6RpjZaNlSJe6zbKvau0REh K0/k9V9zDgyVzCMoU6YzoIKFhpgeVGuTU0FCAnXBrp5ADjj2dtM/ X-Google-Smtp-Source: ABdhPJz6k61UIZ6LNY4+beLe2ClDqeI6Xp9on0BqSopwDPt4MANMnisp1QCGZB/syO4kH9DOiKEfrR4D9WQFWZyDKOw= X-Received: by 2002:a92:5404:: with SMTP id i4mr19107513ilb.193.1614122191138; Tue, 23 Feb 2021 15:16:31 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Greg Hogan Date: Tue, 23 Feb 2021 18:16:20 -0500 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 1085752d13ead6359e7a59b96bb41edec3986d88 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:51:36 +0000 Subject: [PATCH 3/7] gnu: Add aws-c-cal. * gnu/packages/c.scm (aws-c-cal): New variable. * gnu/packages/patches/aws-c-cal-cmake-prefix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/c.scm | 27 +++++++++++++++++++ .../patches/aws-c-cal-cmake-prefix.patch | 13 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 gnu/packages/patches/aws-c-cal-cmake-prefix.patch + endif() -- 2.30.1 diff --git a/gnu/local.mk b/gnu/local.mk index ae5a65cfcf..f16c1ae240 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -830,6 +830,7 @@ dist_patch_DATA = \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ + %D%/packages/patches/aws-c-cal-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 7230972a68..48230b41c3 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages gettext) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public tcc @@ -614,3 +615,29 @@ event stream encoding, a binary format for bidirectional client-server communication.") (home-page "https://github.com/awslabs/aws-c-event-stream") (license license:asl2.0))) + +(define-public aws-c-cal + (package + (name "aws-c-cal") + (version "0.4.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/awslabs/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6")) + (patches (search-patches "aws-c-cal-cmake-prefix.patch")))) + (build-system cmake-build-system) + (propagated-inputs + `(("aws-c-common" ,aws-c-common))) + (inputs + `(("openssl" ,openssl) + ("openssl:static" ,openssl "static"))) + (synopsis "Amazon Web Services Crypto Abstraction Layer") + (description "This library provides a C99 wrapper for hash, HMAC, and ECC +cryptographic primitives for the @acronym{AWS,Amazon Web Services} SDK.") + (home-page "https://github.com/awslabs/aws-c-cal") + (license license:asl2.0))) diff --git a/gnu/packages/patches/aws-c-cal-cmake-prefix.patch b/gnu/packages/patches/aws-c-cal-cmake-prefix.patch new file mode 100644 index 0000000000..1ee7aa851d --- /dev/null +++ b/gnu/packages/patches/aws-c-cal-cmake-prefix.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,10 @@ endif() + + option(BYO_CRYPTO "Set this if you want to provide your own cryptography implementation. This will cause the defaults to not be compiled." OFF) + ++if (DEFINED ENV{CMAKE_PREFIX_PATH}) ++ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) ++endif() ++ + if (DEFINED CMAKE_PREFIX_PATH) + file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)