From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL. Resent-Message-ID: From: Marius Bakke Date: Mon, 20 Jan 2020 00:20:04 +0100 Message-Id: <20200119232006.12303-2-mbakke@fastmail.com> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39197@debbugs.gnu.org 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") -- 2.24.1