From patchwork Sun Jan 19 23:20:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 19917 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 157A817AB4; Sun, 19 Jan 2020 23:21:19 +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,FREEMAIL_FROM, T_DKIM_INVALID,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 5F9F117AB4 for ; Sun, 19 Jan 2020 23:21:18 +0000 (GMT) Received: from localhost ([::1]:55074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJsb-0004rC-Kd for patchwork@mira.cbaines.net; Sun, 19 Jan 2020 18:21:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58395) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJsP-0004pu-5R for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itJsN-0001K1-NC for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itJsM-0001JE-KK for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1itJsM-0007Yq-HJ for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jan 2020 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39197@debbugs.gnu.org Received: via spool by 39197-submit@debbugs.gnu.org id=B39197.157947602628977 (code B ref 39197); Sun, 19 Jan 2020 23:21:02 +0000 Received: (at 39197) by debbugs.gnu.org; 19 Jan 2020 23:20:26 +0000 Received: from localhost ([127.0.0.1]:44134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itJre-0007Wt-Lz for submit@debbugs.gnu.org; Sun, 19 Jan 2020 18:20:26 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itJra-0007WR-T9 for 39197@debbugs.gnu.org; Sun, 19 Jan 2020 18:20:15 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CC0822148D for <39197@debbugs.gnu.org>; Sun, 19 Jan 2020 18:20:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 19 Jan 2020 18:20:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=fm1; bh= /WIBjJP9DgrzviJd4ip+OoDfk1m8axesGwnIt2AGMgo=; b=ChUnvRh8hpUZI/BM FVBVKboT3MAZRAQKgTngxWhbh+WaJYhCiwExRZoWMJSGgMEmL30exL3ZTuPn3ujz TGDP9a96B5xcxXi/7tQuTD87FaQh94SWfF2CFGUVrUjUXJ30eNuR32/eiT+66RQk rYW8dE70ZYchK8N3iRcaUX45ft84cnxar+HSuKCc+o7wtZctfprhQSCZAmu/vsbu Yop5K1nEDFgJh//ays4ZlWnLrTULnNOhj+nGuTaLOjmvHFav3HGa+nA6Wu2nHj1e WZUMIYLXHjuGDpyBZZNFqdHpJ8YQboRy2tjX7Cax1RJZ+kAroT/sgAgDA09tE5Ax 0xbsIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=/WIBjJP9DgrzviJd4ip+OoDfk1m8axesGwnIt2AGM go=; b=rGea2mP6DxcpI5fSpweZN+sUBsrfwygYvuKnEA8TwXuWV/vMweghrRyJF GGVtGgpRVBXAhUtM3EMCvASeQrbnZfWSJCXfMTN5DKM0kUM/mVo0SAccNP9QCIGs ftKYeyYUSWQeYJZuWDjreHTsv42fGHHdeMIBwaY4RMMF9+MlqDV47MsKOgAo9QJg IK1x3FSPEaa4onRBNtcU4H1A1OjfILVwZJFjxF3eOtPh1PuLT0rI9uG7pUn7rGw8 NBZdNySp0P0AzT1ZIkjNF3CMfaFFJqifrt97/WgJcACDU8PHOPBhtce1uApb2alB 520qQZOqYA57ZOxq1N6pDxVkHT9Og== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudeggddtjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecuffhomhgrihhnpehhrgiggidrshgvnecukfhppeekgedrvd dtvddrieelrddvheefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (ti0006q161-3035.bb.online.no [84.202.69.253]) by mail.messagingengine.com (Postfix) with ESMTPA id 4BEE480061 for <39197@debbugs.gnu.org>; Sun, 19 Jan 2020 18:20:09 -0500 (EST) From: Marius Bakke Date: Mon, 20 Jan 2020 00:20:04 +0100 Message-Id: <20200119232006.12303-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200119232006.12303-1-mbakke@fastmail.com> References: <20200119231651.11874-1-mbakke@fastmail.com> <20200119232006.12303-1-mbakke@fastmail.com> MIME-Version: 1.0 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 This is necessary to avoid a circular dependency in the next commit. * gnu/packages/curl.scm (curl-minimal): New public variable. * gnu/packages/cmake.scm (cmake-minimal)[inputs]: Change from CURL to CURL-MINIMAL. (cmake)[inputs]: Do the opposite. --- gnu/packages/cmake.scm | 5 ++++- gnu/packages/curl.scm | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e24b6dea7d..d053935a86 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -152,7 +152,7 @@ (apply invoke "./configure" configure-flags)))))) (native-inputs `(("bzip2" ,bzip2) - ("curl" ,curl) + ("curl" ,curl-minimal) ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) @@ -221,6 +221,9 @@ and workspaces that can be used in the compiler environment of your choice.") `(,@(package-native-inputs cmake-minimal) ("python-sphinx" ,python-sphinx) ("texinfo" ,texinfo))) + (inputs + `(("curl" ,curl) + ,@(alist-delete "curl" (package-inputs cmake-minimal)))) (outputs '("out" "doc")) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 3d230dc1f0..4a73b1f34c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Ludovic Courtès ;;; Copyright © 2016, 2017, 2019 Leo Famulari -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Roel Janssen @@ -46,7 +46,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (srfi srfi-1)) (define-public curl (package @@ -154,6 +155,17 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) +;; This package is used to solve a cyclic dependency between 'cmake-minimal' and +;; packages that use cmake-build-system such as 'libjpeg-turbo' (via ghostscript). +;; It must not depend on anything that uses cmake-build-system. +(define-public curl-minimal + (hidden-package + (package/inherit + curl + (name "curl-minimal") + (native-inputs (alist-delete "groff" (package-native-inputs curl))) + (inputs (alist-delete "openldap" (package-inputs curl)))))) + (define-public kurly (package (name "kurly")