mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-19 05:57:04 +01:00
gnu: gdal: Use cmake-build-system.
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:
parent
15943fa757
commit
6f909b37fa
1 changed files with 5 additions and 21 deletions
|
@ -969,29 +969,12 @@ (define-public gdal
|
|||
"frmts/gtiff/libgeotiff"
|
||||
"frmts/zlib"
|
||||
"ogr/ogrsf_frmts/geojson/libjson"))))))
|
||||
(build-system gnu-build-system)
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:configure-flags
|
||||
(let-syntax ((with (syntax-rules ()
|
||||
((_ option input)
|
||||
(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"))))
|
||||
(list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL"
|
||||
"-DGDAL_USE_JPEG12_INTERNAL=OFF")))
|
||||
(inputs
|
||||
(list curl
|
||||
expat
|
||||
|
@ -1006,9 +989,10 @@ (define-public gdal
|
|||
libwebp
|
||||
netcdf
|
||||
openssl
|
||||
pcre
|
||||
pcre2
|
||||
postgresql ; libpq
|
||||
proj
|
||||
qhull
|
||||
sqlite
|
||||
zlib))
|
||||
(native-inputs
|
||||
|
|
Loading…
Reference in a new issue