From patchwork Tue Jan 7 15:07:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Janssen X-Patchwork-Id: 19682 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 E5CC517A1F; Tue, 7 Jan 2020 15:34:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 98731179D7 for ; Tue, 7 Jan 2020 15:34:59 +0000 (GMT) Received: from localhost ([::1]:51612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioqsk-0006Tq-Cu for patchwork@mira.cbaines.net; Tue, 07 Jan 2020 10:34:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55890) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioqSi-0003qg-99 for guix-patches@gnu.org; Tue, 07 Jan 2020 10:08:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioqSf-0004Z9-UT for guix-patches@gnu.org; Tue, 07 Jan 2020 10:08:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43054) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioqSf-0004Yx-RU for guix-patches@gnu.org; Tue, 07 Jan 2020 10:08:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ioqSf-0000sN-NJ for guix-patches@gnu.org; Tue, 07 Jan 2020 10:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39013] [PATCH] gnu: Add abseil-cpp. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Jan 2020 15:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39013@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15784096513321 (code B ref -1); Tue, 07 Jan 2020 15:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2020 15:07:31 +0000 Received: from localhost ([127.0.0.1]:49027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioqSB-0000rV-El for submit@debbugs.gnu.org; Tue, 07 Jan 2020 10:07:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:36889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioqS9-0000rN-En for submit@debbugs.gnu.org; Tue, 07 Jan 2020 10:07:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55434) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioqS7-0002Tj-Js for guix-patches@gnu.org; Tue, 07 Jan 2020 10:07:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ioqS7-0004AB-DL for guix-patches@gnu.org; Tue, 07 Jan 2020 10:07:27 -0500 Received: from [143.121.198.62] (port=57380 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ioqS4-0006Bv-38 for guix-patches@gnu.org; Tue, 07 Jan 2020 10:07:25 -0500 Message-ID: <1f9fb8236e2a652ea4389c8d18b663307b275153.camel@gnu.org> From: Roel Janssen Date: Tue, 07 Jan 2020 16:07:21 +0100 X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Dear Guix, The following patch adds abseil-cpp. I want to add it because it seems to be a dependency of tensorflow-1.15.0 (which I am trying to update to). There are two not-so-perfect things with the patch: 1. I had to use the latest Git commit because it adds bits to build shared libraries. 2. I disabled the tests because it attempts to download "googletest". I tried modifying the build system to use "googletest" from Guix but that wasn't succesful. Nevertheless, I hope this patch is acceptable. Kind regards, Roel Janssen From 06ed0284561463c087ec0f16f9c35fc7926f22df Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 7 Jan 2020 16:02:28 +0100 Subject: [PATCH] gnu: Add abseil-cpp. * gnu/packages/machine-learning.scm (abseil-cpp): New variable. --- gnu/packages/machine-learning.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 719401d69a..91cc4fe091 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1316,6 +1316,34 @@ mile of distributed computing to connect devices, mobile applications and browsers to backend services.") (license license:asl2.0))) +(define-public abseil-cpp + ;; We use this commit because it contains changes to the build system to + ;; allow building shared libraries. + (let ((commit "a048203a881f11f4b7b8df5fb563aec85522f8db")) + (package + (name "abseil-cpp") + (version (string-append "20190808-" (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abseil/abseil-cpp.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13v3bkfyhrcl9am0jcz4cfbfc5rn3acm9z4wm01pn36vcgvw2l4s")))) + (build-system cmake-build-system) + (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") + #:tests? #f)) ; Tests attempt to download googletest. + (home-page "https://abseil.io") + (synopsis "Augmented C++ standard library") + (description "Abseil is an open-source collection of C++ library code +designed to augment the C++ standard library. The Abseil library code is +collected from Google's own C++ code base, has been extensively tested and +used in production, and is the same code we depend on in our daily coding +lives.") + (license license:asl2.0)))) + ;; Note that Tensorflow includes a "third_party" directory, which seems to not ;; only contain modified subsets of upstream library source code, but also ;; adapter headers provided by Google (such as the fft.h header, which is not -- 2.17.1