From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2EB81382C5 for ; Tue, 9 Mar 2021 22:11:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 154BEE0869; Tue, 9 Mar 2021 22:11:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F206BE0869 for ; Tue, 9 Mar 2021 22:11:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98F9B335D0A for ; Tue, 9 Mar 2021 22:11:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E75D56F for ; Tue, 9 Mar 2021 22:11:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615327867.111add5983433f78e9854bfbfeaf4605833dbe13.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/files/gdal-3.2.1-libdir.patch X-VCS-Directories: sci-libs/gdal/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 111add5983433f78e9854bfbfeaf4605833dbe13 X-VCS-Branch: master Date: Tue, 9 Mar 2021 22:11:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5a32208-0802-4998-a5ce-e9f5930443e1 X-Archives-Hash: 2e8c96b24f0c10ff55b1cab0a658e65b commit: 111add5983433f78e9854bfbfeaf4605833dbe13 Author: Sam James gentoo org> AuthorDate: Tue Mar 9 22:11:07 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 9 22:11:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111add59 sci-libs/gdal: remove some patch metadata Signed-off-by: Sam James gentoo.org> sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 27 +-------------------------- 1 file changed, 1 insertion(+), 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 fcf20dd8bed..3cd65b64784 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 -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 - +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" ;