From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mKqfE29VEGQMkgAASxT56A (envelope-from ) for ; Tue, 14 Mar 2023 12:07:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SJBuE29VEGRSLQEAauVa8A (envelope-from ) for ; Tue, 14 Mar 2023 12:07:27 +0100 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 A8CA413CDF for ; Tue, 14 Mar 2023 12:07:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pc2Ui-0004zg-NO; Tue, 14 Mar 2023 07:07:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pc2Uh-0004xv-9v for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pc2Uh-0005qr-1B for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pc2Ug-0006Zx-So for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62183] [PATCH 2/2] gnu: vtk: Remove reference to GCC. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 11:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62183@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 62183-submit@debbugs.gnu.org id=B62183.167879201725271 (code B ref 62183); Tue, 14 Mar 2023 11:07:02 +0000 Received: (at 62183) by debbugs.gnu.org; 14 Mar 2023 11:06:57 +0000 Received: from localhost ([127.0.0.1]:36466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc2Ua-0006ZV-CP for submit@debbugs.gnu.org; Tue, 14 Mar 2023 07:06:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc2UY-0006Z7-2h for 62183@debbugs.gnu.org; Tue, 14 Mar 2023 07:06:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pc2US-0005kK-8G; Tue, 14 Mar 2023 07:06:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=DNZUG+O3bSErmOIQjO3j/lzJfw9VNPDzVHqDOA4U35A=; b=m38HUrsRKdGh5EK2W7jP cDi7gbZCpBE4+W6BoY3tNMJW1+fgQKfXnB+4UMIsPzM8kB3vS031yUEwD19q+Skhc8bU9tdB2WXXW hfG63MyC7VPvkxXb2PjpA7VtyyvGJUBkv5Svf7SY1+4O8rzXJMJ/eXIcnn8IEzrkqYLblWlbeNmol Av2RgLBT2uF85XMWhELy1jPe34cGXvnM5EmkSxPpZTRMa18si6HyATXmKHWI9XoBjKFFq/54k+i7P C+3VYgMnQIVke+S5XTcukB7dI/vrtuqgUtWBNuC/Q0XxoDzl7xAsYaW2DRQl7ONyRqzV0ml/Bu12a wOTJX9UAELtM6w==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pc2UR-0003xH-OR; Tue, 14 Mar 2023 07:06:47 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 14 Mar 2023 12:06:33 +0100 Message-Id: <20230314110633.8729-2-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314110633.8729-1-ludo@gnu.org> References: <20230314110633.8729-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=m38HUrsR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678792047; a=rsa-sha256; cv=none; b=XHfc8vJ7bxPlX5D+bO/8Sns6cheZt82HquKZg6R5V9PEqjY9ac+beUzWO97ZQCEAjX65ui 8WzYLlhn7PtGDDWBKitCbxUll44l/NDjKZ4bOeFjFkxKrYi+3K1bdKvDbxI63/btbM75kp yzUcqfZ0auT29K9hxtTkk/YXlc/hh+8E6JR5oiuoHTEsuwJRYdwwwsBdCal50Gy1ZMHJtJ uMSaWqnigTrUeA2ASSZ4VeGURubo/UN6SVEZIrooDQ71pBv9Wx9hfouMI8HWwORVqR6Z8e dvlLb8+k9/7EQ0Tr+Vx+ihr85Idv0oaxtRZ9SLL6M/jJYpo0iBNC3M4agePugg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678792047; 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=DNZUG+O3bSErmOIQjO3j/lzJfw9VNPDzVHqDOA4U35A=; b=EhQootFXDk9swhM2PW3qtetXsMFsUl9d2PWZV80qO7Jji1NSBaxee2juLN4Q5MJoFMconF +voDWcNY9paeWBK1sVpT3/UidWxxUIeNmeB0XTcBuEKYh4xe1wYuIoGyMptlfWu7FmgHRu FXx11ipLF0JLYVVoWUsUM3LnnWsyCEM6rsN9aIhPsNi7U4tutZFKD48bGPyWA5yLX70Rc2 AutoIDz7AhGZlsjU/gSWynXD9/39sgOmxPkuHvHn/i+n5LV3BO7R/Rq3vDJ/yl8/f8VGfh klUCqa/aw6ESrQqkuperqs7760PgYuL/RnGp9x5PquAYhpqGGhUnWe51pOwVrg== X-Migadu-Spam-Score: -3.12 X-Spam-Score: -3.12 X-Migadu-Queue-Id: A8CA413CDF X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=m38HUrsR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: WMqI1fjI56Q+ From: Ludovic Courtès This removes GCC from the closure of VTK, reducing its size by 200 MiB (17%). * gnu/packages/image-processing.scm (vtk)[arguments]: Change to gexps. Add #:phases. (vtk-7)[arguments]: Turn #:configure-flags into a gexp. --- gnu/packages/image-processing.scm | 87 +++++++++++++++++++------------ 1 file changed, 53 insertions(+), 34 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index a612544232..5c3560174c 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -352,40 +352,59 @@ (define-public vtk (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments - '(#:build-type "Release" ;Build without '-g' to save space. - #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE" - ; ; not honored - "-DVTK_USE_EXTERNAL=OFF" ;; default - "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" - ;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ; breaks IO/CityGML - "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" - "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ; For F3D - "-DVTK_WRAP_PYTHON=ON" - "-DVTK_PYTHON_VERSION:STRING=3" + (list #:build-type "Release" ;Build without '-g' to save space. + #:configure-flags + #~'( ;;"-DBUILD_TESTING:BOOL=TRUE" ;not honored + "-DVTK_USE_EXTERNAL=OFF" ;default + "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" + ;;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ;breaks IO/CityGML + "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" + "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ;for F3D + "-DVTK_WRAP_PYTHON=ON" + "-DVTK_PYTHON_VERSION:STRING=3" - "-DVTK_SMP_ENABLE_OPENNMP=ON" - "-DVTK_SMP_ENABLE_TBB=ON" - "-DVTK_USE_MPI=ON" - ) - #:tests? #f)) ;XXX: test data not included + "-DVTK_SMP_ENABLE_OPENNMP=ON" + "-DVTK_SMP_ENABLE_TBB=ON" + "-DVTK_USE_MPI=ON" + ) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'clear-reference-to-compiler + (lambda _ + (define (choose . files) + (let loop ((files files)) + (if (null? files) + #f + (if (file-exists? (car files)) + (car files) + (loop (cdr files)))))) + + ;; Do not retain a reference to GCC. + (substitute* (choose + "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x + "Common/Core/vtkConfigure.h.in") ;v7.x + (("@CMAKE_CXX_COMPILER@") "c++"))))) + + #:tests? #f)) ;XXX: test data not included (inputs (list double-conversion eigen @@ -452,7 +471,7 @@ (define-public vtk-7 ((#:configure-flags flags) ;; Otherwise, the build would fail with: "error: invalid conversion ;; from ‘const char*’ to ‘char*’ [-fpermissive]". - `(cons "-DCMAKE_CXX_FLAGS=-fpermissive" ,flags)) + #~(cons "-DCMAKE_CXX_FLAGS=-fpermissive" #$flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'remove-kernel-version -- 2.39.2