From 5f998a5cdbbb3034c3948b3e73cc90b656ef8431 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 10 Oct 2020 17:03:28 +0000 Subject: gnu: Add aws-c-common. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-common): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/c.scm') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 7a7408b4d7..628e8c0dad 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages bootstrap) @@ -536,3 +538,24 @@ avoiding distractions when studying code that uses @code{#ifdef} heavily for portability.") (license (list license:bsd-2 ;all files except... license:bsd-3)))) ;...the unidef.1 manual page + +(define-public aws-c-common + (package + (name "aws-c-common") + (version "0.4.63") + (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 + "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9")))) + (build-system cmake-build-system) + (synopsis "Amazon Web Services core C library") + (description + "This library provides common C99 primitives, configuration, data + structures, and error handling for the @acronym{AWS,Amazon Web Services} SDK.") + (home-page "https://github.com/awslabs/aws-c-common") + (license license:asl2.0))) -- cgit v1.2.3 From 4c66a8deb5f51fd4f944fb62c43aa1e2a477711c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 10 Oct 2020 17:41:08 +0000 Subject: gnu: Add aws-checksums. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-checksums): New variable. * gnu/packages/patches/aws-checksums-cmake-prefix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/c.scm | 25 ++++++++++++++++++++++ .../patches/aws-checksums-cmake-prefix.patch | 13 +++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/aws-checksums-cmake-prefix.patch (limited to 'gnu/packages/c.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2f267e8aee..0daac5746b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -823,6 +823,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-cmake-prefix.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 628e8c0dad..bb3d90e1cd 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -36,6 +36,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) @@ -559,3 +560,27 @@ portability.") structures, and error handling for the @acronym{AWS,Amazon Web Services} SDK.") (home-page "https://github.com/awslabs/aws-c-common") (license license:asl2.0))) + +(define-public aws-checksums + (package + (name "aws-checksums") + (version "0.1.10") + (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 + "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb")) + (patches (search-patches "aws-checksums-cmake-prefix.patch")))) + (build-system cmake-build-system) + (inputs + `(("aws-c-common" ,aws-c-common))) + (synopsis "Amazon Web Services checksum library") + (description + "This library provides cross-Platform hardware accelerated CRC32c and CRC32 +with fallback to efficient C99 software implementations.") + (home-page "https://github.com/awslabs/aws-checksums") + (license license:asl2.0))) diff --git a/gnu/packages/patches/aws-checksums-cmake-prefix.patch b/gnu/packages/patches/aws-checksums-cmake-prefix.patch new file mode 100644 index 0000000000..f6a5c9ad9c --- /dev/null +++ b/gnu/packages/patches/aws-checksums-cmake-prefix.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() -- cgit v1.2.3 From ddab5244dfa85e5ad73da80c3169fe790387743b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 10 Oct 2020 17:47:45 +0000 Subject: gnu: Add aws-c-event-stream. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-event-stream): New variable. * gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/c.scm | 27 ++++++++++++++++++++++ .../patches/aws-c-event-stream-cmake-prefix.patch | 13 +++++++++++ 3 files changed, 41 insertions(+) create mode 100644 gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch (limited to 'gnu/packages/c.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 0daac5746b..aef413abdf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -823,6 +823,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-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index bb3d90e1cd..2ea9c2ac51 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -584,3 +584,30 @@ portability.") with fallback to efficient C99 software implementations.") (home-page "https://github.com/awslabs/aws-checksums") (license license:asl2.0))) + +(define-public aws-c-event-stream + (package + (name "aws-c-event-stream") + (version "0.1.6") + (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 + "1vl9ainc4klv0g9gk1iv4833bsllni6jxn6mwb0fnv2dnlz7zv9q")) + (patches (search-patches "aws-c-event-stream-cmake-prefix.patch")))) + (build-system cmake-build-system) + (propagated-inputs + `(("aws-c-common" ,aws-c-common))) + (inputs + `(("aws-checksums" ,aws-checksums))) + (synopsis "Amazon Web Services client-server message format library") + (description + "This library is a C99 implementation for @acronym{AWS,Amazon Web Services} +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))) diff --git a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch b/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch new file mode 100644 index 0000000000..79655a910b --- /dev/null +++ b/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,10 @@ + cmake_minimum_required (VERSION 3.1) + project (aws-c-event-stream C) + ++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() -- cgit v1.2.3