mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gdal: Use cmake-build-system.

Browse source 
Gdal declared its configure script as deprecated with the release of
version 3.5 and is planning to deprecate it with release 3.6 which is
scheduled for November 2022.

* gnu/packages/geo.scm (gdal)[build-system]: Use cmake-build-system.
  [arguments]: Remove configure flags for library search paths;
  they are found automatically by cmake now. Add
  -DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL and
  -DGDAL_USE_JPEG12_INTERNAL=OFF to get approximately the same results
  as with the old configure script.
  [inputs]: Remove pcre. Add pcre2 and qhull.
This commit is contained in:
Felix Gruber 2022-07-03 19:57:26 +00:00 committed by Björn Höfling
parent 15943fa757
commit 6f909b37fa
No known key found for this signature in database
GPG key ID: BF286CB6593E5FFD
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/geo.scm
View file

@ -969,29 +969,12 @@ (define-public gdal
"frmts/gtiff/libgeotiff" "frmts/gtiff/libgeotiff"
"frmts/zlib" "frmts/zlib"
"ogr/ogrsf_frmts/geojson/libjson")))))) "ogr/ogrsf_frmts/geojson/libjson"))))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:configure-flags #:configure-flags
(let-syntax ((with (syntax-rules () (list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL"
((_ option input) "-DGDAL_USE_JPEG12_INTERNAL=OFF")))
(string-append option "="
(assoc-ref %build-inputs input))))))
(list
;; TODO: --with-pcidsk, --with-pcraster
(with "--with-expat" "expat")
(with "--with-freexl" "freexl")
(with "--with-geotiff" "libgeotiff")
(with "--with-gif" "giflib")
(with "--with-jpeg" "libjpeg-turbo")
(with "--with-libjson-c" "json-c")
(with "--with-libtiff" "libtiff")
(with "--with-libz" "zlib")
(with "--with-png" "libpng")
(with "--with-sqlite3" "sqlite")
(with "--with-webp" "libwebp")
"--without-jpeg12"
"--with-pcre"))))
(inputs (inputs
(list curl (list curl
expat expat
@ -1006,9 +989,10 @@ (define-public gdal
libwebp libwebp
netcdf netcdf
openssl openssl
pcre pcre2
postgresql ; libpq postgresql ; libpq
proj proj
qhull
sqlite sqlite
zlib)) zlib))
(native-inputs (native-inputs