[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/12: gnu: vtk: Remove reference to GCC.
From: |
guix-commits |
Subject: |
04/12: gnu: vtk: Remove reference to GCC. |
Date: |
Tue, 21 Mar 2023 14:15:24 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 037f0611f4c2fddfa41ecaede02626a59b385509
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Tue Mar 14 11:39:16 2023 +0100
gnu: vtk: Remove reference to GCC.
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 c8786d8edd..7652b24e1a 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -352,40 +352,59 @@ many popular formats.")
(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
@@ -453,7 +472,7 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
((#: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
- branch master updated (4f63b4b86d -> 2120c768f2), guix-commits, 2023/03/21
- 01/12: services: static-networking: 'eval-when' for code used at expansion-time., guix-commits, 2023/03/21
- 04/12: gnu: vtk: Remove reference to GCC.,
guix-commits <=
- 03/12: gnu: vtk: Enable OpenMP, TBB, and Open MPI support., guix-commits, 2023/03/21
- 05/12: gnu: fennel: Update to 1.3.0., guix-commits, 2023/03/21
- 06/12: gnu: fnlfmt: Update to 0.3.0., guix-commits, 2023/03/21
- 07/12: gnu: Add dvisvgm., guix-commits, 2023/03/21
- 08/12: gnu: go-filippo-io-age: Update to 1.1.1., guix-commits, 2023/03/21
- 09/12: gnu: pass-age: Update to 1.7.4a1., guix-commits, 2023/03/21
- 10/12: gnu: ssh-to-age: Update to 1.1.2., guix-commits, 2023/03/21
- 12/12: gnu: python-pypandoc: Upgrade to 1.7.5., guix-commits, 2023/03/21
- 02/12: gnu: gnulib: Depend on git-minimal/pinned., guix-commits, 2023/03/21
- 11/12: gnu: pocl: Update to 3.1, guix-commits, 2023/03/21