summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-09 22:11:07 +0000
committerSam James <sam@gentoo.org>2021-03-09 22:11:07 +0000
commit111add5983433f78e9854bfbfeaf4605833dbe13 (patch)
tree40882212a07e93bb982e5178371947c7f245fe31
parentsci-libs/gdal: update libdir patch slightly (diff)
downloadgentoo-111add5983433f78e9854bfbfeaf4605833dbe13.tar.gz
gentoo-111add5983433f78e9854bfbfeaf4605833dbe13.tar.bz2
gentoo-111add5983433f78e9854bfbfeaf4605833dbe13.zip
sci-libs/gdal: remove some patch metadata
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sci-libs/gdal/files/gdal-3.2.1-libdir.patch27
1 files changed, 1 insertions, 26 deletions
diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
index fcf20dd8bed4..3cd65b647849 100644
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -1,30 +1,5 @@
https://github.com/OSGeo/gdal/pull/3560
-
-From fbb2adf5b67741f561036b41ab196c72b5978517 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 9 Mar 2021 21:57:57 +0000
-Subject: [PATCH] Respect --libdir parameter
-
-When searching for various libraries, we want to use
-the libdir passed in to autotools (--libdir)
-to ensure that we find the library
-for the correct ABI.
-
-It is possible that we pick up the wrong
-copy from e.g. /usr/lib/ where a 32-bit
-copy of e.g. zlib exists
-when we're in the middle of a 64-bit build.
-
-Use ${libdir} to ensure we respect
-any preferences/information given and
-search for libraries in the right place.
-
-No behaviour should change here as
---libdir defaults to 'lib'.
-
-Bug: https://bugs.gentoo.org/696106
-Signed-off-by: Sam James <sam@gentoo.org>
-
+https://bugs.gentoo.org/696106
--- a/gdal/configure.ac
+++ b/gdal/configure.ac
@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;