From patchwork Fri Jul 12 21:32:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. Arne Babenhauserheide" X-Patchwork-Id: 14619 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 91EFE17217; Fri, 12 Jul 2019 22:34:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3124117214 for ; Fri, 12 Jul 2019 22:34:07 +0100 (BST) Received: from localhost ([::1]:52398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hm3B8-0000Vd-Sv for patchwork@mira.cbaines.net; Fri, 12 Jul 2019 17:34:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50415) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hm3B5-0000VC-EQ for guix-patches@gnu.org; Fri, 12 Jul 2019 17:34:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hm3B4-0006Ky-8g for guix-patches@gnu.org; Fri, 12 Jul 2019 17:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hm3B4-0006Ku-5O for guix-patches@gnu.org; Fri, 12 Jul 2019 17:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hm3B4-000648-1F for guix-patches@gnu.org; Fri, 12 Jul 2019 17:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36623] [PATCH] gnu: gdal: add python support Resent-From: Arne Babenhauserheide Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jul 2019 21:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36623@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156296719823224 (code B ref -1); Fri, 12 Jul 2019 21:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2019 21:33:18 +0000 Received: from localhost ([127.0.0.1]:40821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hm3AM-00062U-6V for submit@debbugs.gnu.org; Fri, 12 Jul 2019 17:33:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:57159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hm3AJ-00062K-NX for submit@debbugs.gnu.org; Fri, 12 Jul 2019 17:33:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50248) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hm3AI-0000Md-Gn for guix-patches@gnu.org; Fri, 12 Jul 2019 17:33:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hm3AH-0005Rt-6E for guix-patches@gnu.org; Fri, 12 Jul 2019 17:33:14 -0400 Received: from mout.web.de ([212.227.15.14]:36571) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hm3AG-0005Q0-Si for guix-patches@gnu.org; Fri, 12 Jul 2019 17:33:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1562967191; bh=jbUP+GXRfHssKLKEGIuwcFdT9mTl8mxA6ADXxAvPU1I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Reply-To; b=MIPBkoDLGRvElvxtyyv7y7wmyfLIMePExMnGpTLc9m3oYCAZSpLoywvC8wl3pM/c6 qx4yinH94WlRJ8/2EwjVZLg9izPakPQejT0wBgzsRYPSBs90ynG/wesGbyv7iKi5L+ TmuG6BIxIaK6XNz/wOE3RD5OdiT7/j+/jAcJPVuQ= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from fluss.speedport.ip ([84.149.83.171]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LwYtb-1iXu803Qdz-018KHP; Fri, 12 Jul 2019 23:33:11 +0200 From: Arne Babenhauserheide Date: Fri, 12 Jul 2019 23:32:47 +0200 Message-Id: <20190712213247.23250-1-arne_bab@web.de> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:A60XBiwz5o/dnWLottx8UFu+ZldoKJc7lMo2blPorEuFonbxOOS To9yV1eqN+XWneohHhYhL6gD7pcr7+UW5qRpykbV++bTjAlSCOq1uPIbtsGfJ7IjWIBq8jh UnCQp/vP9pFKb+6MKUT6PJ+VMVh63oBBLZUw5PKr3npQpP1oq1PZ6FH3U9fROadjhJq7j6b RqfZ3N3IHvTNwtMGqVxCA== X-UI-Out-Filterresults: notjunk:1;V03:K0:0tf9lUoxcwI=:ckdek2E60rYwXVUSDOD46J 9P4SViPUvgRmnfeQNzCT7jc6g4ZzYLAiXq0Mw9i5yzdS8VukSUE9zPd/MLKHzV3O7qb2S9v5R +AHAGaOBYPu3RuYqQoH+aNhhlNElz55WwdOBQDyRjDMCE63rxfWPSqUYJFkzbvFVGUCuRyqoS CjEI9tAuw1bStKBi68NvlzuRzKc/iB6XsQ1ARpOJI434cs7Thg9o2cL0zZBuFWQFFAMc9xajl wC5KA9KzCLRuJYbra/v/zOSbI+sGHc5APHIW+0tCdHLz1DPt3j/wC2KfCt+rQXVcvY/K24V1y Y9si9V92h6rDT+LCbV8BT3av8hJcOzlPtbNCs58zWXXbED/42CGhjtx387d1zKQfJVj9Pqaac MgWvgjrGiWqYDhkjM3PnGlBjGqn0+ZWfGWD/YZ8lBBts9LL9BE+bo/jQCbor5bApzSmujBac+ dixyFjFDqfw91cvbBqdIZurgkOrUKIyxz6HWmhfvZg2SrJjFedTdaGwnKhB8mDQhcYLxMttIn +yR1+bezSrLnomfV2vr+XR/6UCRULS15FR39CsB27pLJHovjFfPLRg+LLsMazRUm4guUREQ3+ 9w5hd/oKutRSpZkESZBIYoYGqzXGquaulsMjWe+hwBM3lVsKJ5wJKDUscx25XXLqacnhcQ0A/ b2L0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arne_bab@web.de Cc: Arne Babenhauserheide Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (gdal): add python support --- gnu/packages/geo.scm | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) -- 2.22.0 diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4cccd97643..3e2ec04b53 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -537,6 +537,8 @@ development.") (build-system gnu-build-system) (arguments `(#:tests? #f + ;; validating runpath does not work yet for Python, so skip this phase. + #:validate-runpath? #f #:configure-flags (let-syntax ((with (syntax-rules () ((_ option input) @@ -544,6 +546,10 @@ development.") (assoc-ref %build-inputs input)))))) (list ;; TODO: --with-pcidsk, --with-pcraster + ;; Add $libdir to the RUNPATH of all the executables. + (string-append "LDFLAGS=-Wl,-rpath=" %output "/apps/.libs") + (string-append "LD_RUN_PATH=" %output "/apps/.libs") + (string-append "LD_LIBRARY_PATH=" %output "/apps/.libs") (with "--with-freexl" "freexl") (with "--with-libjson-c" "json-c") (with "--with-png" "libpng") @@ -553,13 +559,27 @@ development.") (with "--with-libtiff" "libtiff") (with "--with-geotiff" "libgeotiff") (with "--with-libz" "zlib") - "--with-pcre")) + "--with-pcre" + "--with-python")) #:phases (modify-phases %standard-phases (add-before 'build 'fix-path (lambda _ (substitute* "frmts/mrf/mrf_band.cpp" - (("\"../zlib/zlib.h\"") ""))))))) + (("\"../zlib/zlib.h\"") "")))) + (add-after + 'unpack 'patch-test-shebangs + (lambda _ + (substitute* '("apps/GNUmakefile") + (("/bin/sh") (which "sh"))) + #t)) + (add-after + 'unpack 'patch-test-shebangs + (lambda _ + (substitute* '("GDALmake.opt.in") + (("LDFLAGS = @LDFLAGS@") (string-append "LDFLAGS = @LDFLAGS@ -Wl,-rpath=" %output "/apps -Wl,-rpath=" %output "/apps/.libs"))) + #t) + )))) (inputs `(("freexl" ,freexl) ("geos" ,geos) @@ -572,6 +592,11 @@ development.") ("libwebp" ,libwebp) ("pcre" ,pcre) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("python" ,python) + ("python-setuptools" ,python-setuptools))) (home-page "http://www.gdal.org/") (synopsis "Raster and vector geospatial data format library") (description "GDAL is a translator library for raster and vector geospatial