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 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) + endif() -- 2.28.0