From patchwork Sat Oct 10 18:18:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 24544 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 E847127BBEA; Sat, 10 Oct 2020 19:20:12 +0100 (BST) 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_H4,RCVD_IN_MSPIKE_WL, 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 D9DE927BBE9 for ; Sat, 10 Oct 2020 19:20:08 +0100 (BST) Received: from localhost ([::1]:60656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRJTU-0001I7-3V for patchwork@mira.cbaines.net; Sat, 10 Oct 2020 14:20:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRJTO-0001Gj-Qv for guix-patches@gnu.org; Sat, 10 Oct 2020 14:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRJTO-0000SG-HZ for guix-patches@gnu.org; Sat, 10 Oct 2020 14:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRJTO-00052y-D7 for guix-patches@gnu.org; Sat, 10 Oct 2020 14:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43913] [PATCH 2/4] gnu: Add aws-checksums. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Oct 2020 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43913 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43913@debbugs.gnu.org Received: via spool by 43913-submit@debbugs.gnu.org id=B43913.160235394319331 (code B ref 43913); Sat, 10 Oct 2020 18:20:02 +0000 Received: (at 43913) by debbugs.gnu.org; 10 Oct 2020 18:19:03 +0000 Received: from localhost ([127.0.0.1]:38480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRJSP-00051T-6f for submit@debbugs.gnu.org; Sat, 10 Oct 2020 14:19:03 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:35140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRJSK-000516-KX for 43913@debbugs.gnu.org; Sat, 10 Oct 2020 14:19:00 -0400 Received: by mail-wr1-f52.google.com with SMTP id n15so13809808wrq.2 for <43913@debbugs.gnu.org>; Sat, 10 Oct 2020 11:18:56 -0700 (PDT) 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=clXW/NsCeM60wlsYTu9wMDxsQNNGZGSoOmNuPgT/C8A=; b=IzyHEAv5RbKiEFVOub3PGkHtF5+4ridfY8Pmgqc5VIMMha0jSIlgzg6Gq4gIzjDq3h nCczsewVgSvTMHoZ/RCeu1/wdwUSdkC1ctP64uTWo7okgtl1VC0dc5OAE/8NpCfO+nv2 SqSiF45H/V6VWfIwJ4KJOQmg4xEVrL7opjvAEppEyvEzWK/6MqoppSchXOzPwRmFDrCB i9JAaAGLzVaTo1/XWHEzeJyhkbUIoy3bulizurx6T3sF1thGMLgQ7xxtzwltRgqyVaS1 JH/EixzPUJ2w3qcUKJBR9imrtKJoDAhVz7nRbtR2CoqgQVmndDKe2LOFToG3/e/9+4Ny tnuw== 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=clXW/NsCeM60wlsYTu9wMDxsQNNGZGSoOmNuPgT/C8A=; b=sTSc7fAPUnU+4XS6pPXTp0IhdyIBkBzc7zNWV7Jwz6aQoyURrUHEYA8GEO4MvRD65R yBxx6QjpxlF8eYzpsYwOWET5ZM+XFwSRqExhTvYIXjg85tMR1cd1BKFpYfv7aGd6Z/Zj egQxTd8SVz4K83lQMTwkpGFcYoP84RdDDRRhfButZRU2XWnA7POkjQHrtfm7Rv2Ii9nA viN5BzTkAef5JkkzOJ4yQETkBc6B7vhIrGZV7yACGuE0GFOSNZ4rGcdlwP4mS33GJ0Fd Alg56YEkDSCOclVoNV6leIqeYIzC+TTdWEo6gQbnTJyrh0zh89vRzcPZVnFbbfz4TBIM rQaA== X-Gm-Message-State: AOAM531caBUZ5IwWjt7kHRhuOeIb+2FKJ5xMjhXJI6yCVimo099CZ5NA KAQQ29vmj1gfZ6uOXuuiPG7A4A74GObL6tsfYhxKNKtzm5lhIc+T X-Google-Smtp-Source: ABdhPJxM2oPjhwS/hsdKg+ux3b5pAoD6csn5hUuYymkq4ik4tcKEtpNBsKwk2MFoyJ4FubfDFqPfsaBCxhg8drLECzM= X-Received: by 2002:a5d:480b:: with SMTP id l11mr21254910wrq.225.1602353930869; Sat, 10 Oct 2020 11:18:50 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Greg Hogan Date: Sat, 10 Oct 2020 14:18:40 -0400 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 b7720ade357d033cd0e162f5bd319a1f7be0e090 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 10 Oct 2020 17:41:08 +0000 Subject: [PATCH 2/4] gnu: Add aws-checksums. * gnu/packages/c.scm (aws-checksums): New variable. --- gnu/local.mk | 1 + gnu/packages/c.scm | 25 +++++++++++++++++++ ...aws-checksums-read-cmake-prefix-path.patch | 13 ++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/aws-checksums-read-cmake-prefix-path.patch + endif() diff --git a/gnu/local.mk b/gnu/local.mk index 155de6c590..87e832d0c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -813,6 +813,7 @@ dist_patch_DATA = \ %D%/packages/patches/avogadro-python-eigen-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ + %D%/packages/patches/aws-checksums-read-cmake-prefix-path.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-completion-directories.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index a86af02258..a30e589753 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -34,6 +34,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu packages) #:use-module (gnu packages bootstrap) #:use-module (gnu packages bison) #:use-module (gnu packages check) @@ -495,3 +496,27 @@ portability.") handling for the AWS SDK for C.") (home-page "https://github.com/awslabs/aws-c-common") (license license:asl2.0))) + +(define-public aws-checksums + (package + (name "aws-checksums") + (version "0.1.9") + (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 + "0s3vfqks3i7jqc12anmcyrjv9rqpxiw0laykfpcmkh2j12017svz")) + (patches (search-patches "aws-checksums-read-cmake-prefix-path.patch")))) + (build-system cmake-build-system) + (inputs + `(("aws-c-common" ,aws-c-common))) + (synopsis "Checksum package for AWS SDK for C") + (description + "Cross-Platform hardware accelerated CRC32c and CRC32 with fallback to +efficient software implementations.") + (home-page "https://github.com/awslabs/aws-checksums") + (license license:asl2.0))) diff --git a/gnu/packages/patches/aws-checksums-read-cmake-prefix-path.patch b/gnu/packages/patches/aws-checksums-read-cmake-prefix-path.patch new file mode 100644 index 0000000000..f6a5c9ad9c --- /dev/null +++ b/gnu/packages/patches/aws-checksums-read-cmake-prefix-path.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,10 @@ + cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags + endif() + ++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)