GNU bug report logs - #56370
[PATCH] gnu: gdal: Use cmake-build-system.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56370 in the body.
You can then email your comments to 56370 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH] gnu: gdal: Use cmake-build-system.
Date: Sun,  3 Jul 2022 19:57:26 +0000

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.
---
 gnu/packages/geo.scm | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d8e642f349..c934ee9e27 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -969,29 +969,12 @@ development.")
                        "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 @@ development.")
            libwebp
            netcdf
            openssl
-           pcre
+           pcre2
            postgresql ; libpq
            proj
+           qhull
            sqlite
            zlib))
     (native-inputs
-- 
2.30.2

Message #10 received at 56370-done <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Felix Gruber <felgru <at> posteo.net>
Cc: 56370-done <at> debbugs.gnu.org
Subject: Re: [bug#56370] [PATCH] gnu: gdal: Use cmake-build-system.
Date: Fri, 8 Jul 2022 17:14:42 +0200

[Message part 1 (text/plain, inline)]

On Sun,  3 Jul 2022 19:57:26 +0000
Felix Gruber <felgru <at> posteo.net> wrote:

> 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.

LGTM.

I built it and checked that gdalinfo xxx.tif still works.

Pushed as

6f909b37fa12ebf2002c609944b56e0feb77e841

Thanks.

Björn

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.