From patchwork Sun Jul 3 19:57:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 40492 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9FDB127BBEA; Sun, 3 Jul 2022 20:59:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4C80127BBE9 for ; Sun, 3 Jul 2022 20:59:12 +0100 (BST) Received: from localhost ([::1]:46908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o85kN-0000zc-Ej for patchwork@mira.cbaines.net; Sun, 03 Jul 2022 15:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o85kE-0000wU-B0 for guix-patches@gnu.org; Sun, 03 Jul 2022 15:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o85kD-0003JP-WE for guix-patches@gnu.org; Sun, 03 Jul 2022 15:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o85kD-0003Yq-V0 for guix-patches@gnu.org; Sun, 03 Jul 2022 15:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56370] [PATCH] gnu: gdal: Use cmake-build-system. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Jul 2022 19:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56370 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56370@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165687828213617 (code B ref -1); Sun, 03 Jul 2022 19:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2022 19:58:02 +0000 Received: from localhost ([127.0.0.1]:45525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o85jG-0003XZ-9q for submit@debbugs.gnu.org; Sun, 03 Jul 2022 15:58:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:43470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o85jB-0003X8-Af for submit@debbugs.gnu.org; Sun, 03 Jul 2022 15:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o85jB-00009r-0C for guix-patches@gnu.org; Sun, 03 Jul 2022 15:57:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o85j8-0003Fi-Lq for guix-patches@gnu.org; Sun, 03 Jul 2022 15:57:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9B454240108 for ; Sun, 3 Jul 2022 21:57:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1656878269; bh=kKBIF2XOu/1+OMuIIUv2Tof04eXI8Pa/NvqC2xHGiv8=; h=From:To:Cc:Subject:Date:From; b=q6kQURFtVFl3DNM6cVFPBlw8DkUSIraiRYi+vEJcwSY/58bpwtuRYejLcEKArs+1z QhJxmk3D2pf9NN+r3JO/VfvoqZPGqb9HwVSL/BdCk+QGoww/l+ts/H4GRSkVb2+DEc 5LmyET/G/H0y5YZ8Cr1VXeNL1Dvp4yDvSAlGbujBY1/3pbjO8PVC4EN7W0ZABl8V9x 4dU+y7lvcWbBeqSOLq19qlnO9F4nuF2iMXqK9jixlTmuyojdpqvoYkE75QSy1nSpPw 7udhaWI/awALqRD90NKWCWwGGT51rj3fijDYdLRr10YlTEBmKFx0qZzGAN2QtlQcP0 PqH5sQIH71y/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Lbfqd0dg6z9rxK; Sun, 3 Jul 2022 21:57:48 +0200 (CEST) From: Felix Gruber Date: Sun, 3 Jul 2022 19:57:26 +0000 Message-Id: <20220703195726.24827-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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