summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-05-05 00:15:01 +0100
committerSam James <sam@gentoo.org>2022-05-05 00:17:45 +0100
commit44e06b49c3347e6f660d85af4db4fd5d207d551c (patch)
treee20354110d5b2c592bfb89eac05098a3779450cf /sci-libs/gdal
parentdev-perl/HTML-Template-Pro: add 0.952.400 (diff)
downloadgentoo-44e06b49c3347e6f660d85af4db4fd5d207d551c.tar.gz
gentoo-44e06b49c3347e6f660d85af4db4fd5d207d551c.tar.bz2
gentoo-44e06b49c3347e6f660d85af4db4fd5d207d551c.zip
sci-libs/gdal: restore missing changes from 3.4.2-r2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r--sci-libs/gdal/gdal-3.4.3-r1.ebuild (renamed from sci-libs/gdal/gdal-3.4.3.ebuild)6
1 files changed, 4 insertions, 2 deletions
diff --git a/sci-libs/gdal/gdal-3.4.3.ebuild b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
index 48c279d2b06e..0542e701d8c1 100644
--- a/sci-libs/gdal/gdal-3.4.3.ebuild
+++ b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
DEPEND="
dev-libs/expat
dev-libs/json-c:=
- dev-libs/libpcre
+ dev-libs/libpcre2
dev-libs/libxml2:2
dev-libs/openssl:=
media-libs/tiff
@@ -148,6 +148,7 @@ src_configure() {
--with-libtiff
--with-libtool
--with-libz="${ESYSROOT}"/usr
+ --with-pcre2
--without-blosc
--without-charls
--without-dods-root
@@ -176,6 +177,7 @@ src_configure() {
--without-rasterlite2
# Revisit when OpenEXR 3 / ilmmath migration is more complete in tree
--without-exr
+ --without-pcre
--without-pcraster
--without-pdfium
--without-perl
@@ -294,7 +296,7 @@ src_install() {
if use java; then
# bug #752399
java-pkg_dojar "${S}"/swig/java/gdal.jar
- dolib.so "${S}"/swig/java/.libs/libgdalalljni.so.*
+ dolib.so "${S}"/swig/java/.libs/libgdalalljni.so*
fi
if use perl; then