From: Roman Scherer <roman@burningswell.com>
To: 68606@debbugs.gnu.org
Cc: Roman Scherer <roman@burningswell.com>
Subject: [bug#68606] [PATCH v2 1/3] gnu: gdal: Update to 3.8.3.
Date: Sun, 21 Jan 2024 14:54:17 +0100 [thread overview]
Message-ID: <056f13e780254afc311925b568d747eeba65db27.1705844923.git.roman@burningswell.com> (raw)
In-Reply-To: <cover.1705844923.git.roman@burningswell.com>
* gnu/packages/geo.scm (gdal): Update to 3.8.3.
Change-Id: Ib36177e1cb37e3852475cc0c1da3eb8747aac6d5
---
gnu/packages/geo.scm | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 14e2d9f16b..3c82f2f3af 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1172,7 +1172,7 @@ (define-public spatialite-gui
(define-public gdal
(package
(name "gdal")
- (version "3.6.1")
+ (version "3.8.3")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1180,7 +1180,7 @@ (define-public gdal
version ".tar.gz"))
(sha256
(base32
- "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf"))
+ "1sj9l1hjfs5d0mnv71iy8zk2xprn46h8gxq0cai9v7i3m23h78zp"))
(modules '((guix build utils)))
(snippet
`(begin
@@ -1193,14 +1193,33 @@ (define-public gdal
"frmts/jpeg/libjpeg12"
"frmts/gtiff/libtiff"
"frmts/gtiff/libgeotiff"
- "frmts/zlib"
"ogr/ogrsf_frmts/geojson/libjson"))))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f
- #:configure-flags
- (list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL"
- "-DGDAL_USE_JPEG12_INTERNAL=OFF")))
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL"
+ "-DGDAL_USE_JPEG12_INTERNAL=OFF")
+ #:modules '((guix build cmake-build-system)
+ (guix build utils)
+ (ice-9 rdelim)
+ (ice-9 popen))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'fix-rpath
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((libdir (string-append (assoc-ref outputs "out") "/lib")))
+ (for-each
+ (lambda (file)
+ (let* ((pipe (open-pipe* OPEN_READ "patchelf"
+ "--print-rpath" file))
+ (line (read-line pipe)))
+ (and (zero? (close-pipe pipe))
+ (invoke "patchelf" "--set-rpath"
+ (string-append libdir ":" line)
+ file))))
+ (find-files libdir ".*\\.so$"))))))))
(inputs
(list curl
expat
@@ -1227,7 +1246,8 @@ (define-public gdal
zlib
zstd))
(native-inputs
- (list pkg-config
+ (list patchelf
+ pkg-config
python))
(propagated-inputs
(list python-numpy))
--
2.41.0
next prev parent reply other threads:[~2024-01-21 13:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-20 11:29 [bug#68606] [PATCH 0/2] Update GDAL and build Java bindings Roman Scherer
2024-01-20 11:30 ` [bug#68606] [PATCH 1/2] gnu: gdal: Update to 3.8.3 Roman Scherer
2024-01-20 11:30 ` [bug#68606] [PATCH 2/2] gnu: gdal: Build Java bindings Roman Scherer
2024-01-21 13:54 ` [bug#68606] [PATCH v2 0/3] Update GDAL and build " Roman Scherer
2024-01-21 13:54 ` Roman Scherer [this message]
2024-01-21 13:54 ` [bug#68606] [PATCH v2 2/3] gnu: gdal: Build " Roman Scherer
2024-01-21 13:54 ` [bug#68606] [PATCH v2 3/3] gnu: patchelf: Update to 0.18.0 Roman Scherer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=056f13e780254afc311925b568d747eeba65db27.1705844923.git.roman@burningswell.com \
--to=roman@burningswell.com \
--cc=68606@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).