From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id BRuRC7PagmAPMwEAgWs5BA (envelope-from ) for ; Fri, 23 Apr 2021 16:33:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id JvuGArPagmC6BQAA1q6Kng (envelope-from ) for ; Fri, 23 Apr 2021 14:33:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CAEF1D6F9 for ; Fri, 23 Apr 2021 16:33:22 +0200 (CEST) Received: from localhost ([::1]:41654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwrx-0003H4-VR for larch@yhetil.org; Fri, 23 Apr 2021 10:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrf-00035p-F3 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55147) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrf-0005MJ-7X for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZwre-000772-M6 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 2/6] gnu: Add snappy-with-clang6. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47972 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47972@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 47972-submit@debbugs.gnu.org id=B47972.161918834727242 (code B ref 47972); Fri, 23 Apr 2021 14:33:02 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:27 +0000 Received: from localhost ([127.0.0.1]:38448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr0-00074y-GC for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:27 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwqw-00074l-T2 for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:19 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188336; cv=none; d=zohomail.com; s=zohoarc; b=ROwx4FNvqsOy4+uVCgUxoDVjjYtNFQo7A5+KYoKrgsRIw89z2emUxDJUeq813gKqyExptagJik+J7hij801GRdchYMxu0D2w1y8KVNtVLHJW/MESxFxmX/ebYLOvzK4WDjjjpNvftTzSJRDMz2clV/JB04+yc63vMsfIwSbyNRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188336; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=PQiL4rV/5dSqdjclPECF78Ka9WHKTeSZZr3TccpTBdk=; b=AH64/bUBDRKBR6hlOFV65em/zAxu1PbpUjgglMa9hd+KbACKAzQUaTwPGNSMKupJ2c2hMlepqswx0o+ial6DX0g2sDbJgU5/k+r0Aor4DCo3aZOpi4fuwLBEAn8gDF5bFlbg9QDN3G9+iSZftfjzttzf3+rtDe9FrWiwSUXPagk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1619188336; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=PQiL4rV/5dSqdjclPECF78Ka9WHKTeSZZr3TccpTBdk=; b=dkLG6kxZcgB8HVwekSKNQg7TcXKWAaUm9i94j3uzbPTMog3fN2WR1FK1u3yreGee xSWAjb1vmWOPbdpeF3Z+70ZZrkokZwD/O60TG5+4RDI6horzRzNmdT9J7I2C9/Z5XP7 1JkPabklDS1/HwvOF4G+tETQsUeDvUV8jF0hAqEk= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 1619188333612606.6808557549767; Fri, 23 Apr 2021 07:32:13 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:31:57 +0200 Message-Id: <20210423143201.12831-2-rekado@elephly.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210423143201.12831-1-rekado@elephly.net> References: <20210423143201.12831-1-rekado@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619188402; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PQiL4rV/5dSqdjclPECF78Ka9WHKTeSZZr3TccpTBdk=; b=ZYtMFddxlIdaeP/HmoOJFxXmb/chEMkbNtAqD/KkhR/N3WP7GadXFUTbze6yRXBQGpdych cnKb+HFUrwcSLHNZ9VBQDQqhTxKA4ssH8393KWcVzv5+Anz6WSFe+fu9pF/QXBvLwtIOgl JaNrDH7fAxgkfstFEFzufpcqGOyO24OEkS7tThVXMI11wlSdzhzEcnCIWAySDM9WlznLzF 3eamVNxP1geKIR/BiebHabczzxPDhXkZYmjcFOpbcdJkitj3S1TzWC2Byza6SKFDvSPnQT zKgDqzQX1QJuHLj5nhY/FyF2APFILfNXANXf8nN/zuxlpn9KHgdM1UQ4qKgbDw== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1619188402; a=rsa-sha256; cv=fail; b=sckdQ5TlTgENBGUtxJ/iUfI5MUdxlu9Xej7BbknhSWXiHZWYiERYjk+QF4fuwRrffkFjtz s6oeycJ0OEvkvmnv9K3yNnq+B1kRObG3kMVjmAH//BXunPNEf7RmtH1O4VMOSG8Q1boO4O RW8ZWy6wEWkJ30QbhmZHaaWVIsk/7YuvvSSSiBsImp+hufULjpz2DN5Cg5cNeD4Xq6Gu+q d8OK6QrL3BU9IHZrSY7STiSroAEQ1uaR3HjWySZuGWB4cHqcXxGb+V/8+8LqdarlGHSwD6 x9FuMeKMtQVvEhU1oktEusqMw06A9XRMM0hgiFFYIB7OuamWigOrwSUlPd7O8g== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=dkLG6kxZ; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.06 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=dkLG6kxZ; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: CAEF1D6F9 X-Spam-Score: 3.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: Q8PxbUIe523w * gnu/packages/compression.scm (snappy-with-clang6): New variable. --- gnu/packages/compression.scm | 37 +++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 37a7d230fe..2b1dfcfab1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner @@ -76,6 +76,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages perl) @@ -1132,6 +1133,40 @@ for most inputs, but the resulting compressed files are anywhere from 20% to 100% bigger.") (license license:asl2.0))) +;; We need this for irods. +(define-public snappy-with-clang6 + (package + (inherit snappy) + (name "snappy-with-clang") + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_CXX_COMPILER=clang++" + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi") + #:phases + (modify-phases %standard-phases + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (cons* (string-append (assoc-ref inputs "libcxx+libcxxabi") + "/include/c++/v1") + ;; Hide GCC's C++ headers so that they do not interfere with + ;; the Clang headers. + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:))) + ":")) + (format #true + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")))))))) + (native-inputs + `(("clang" ,clang-toolchain-6) + ("libcxx+libcxxabi" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6))))) + (define-public p7zip (package (name "p7zip") -- 2.31.1