From 709a2e49fc13fefe34c393299510e1c804c219b6 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Sun, 18 Oct 2020 17:07:06 +0200 Subject: [PATCH 1/9] Added expat build support. --- G/GDAL/build_tarballs.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 7dce8ab1fb9..89c3ade944b 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -43,6 +43,7 @@ rm -f ${prefix}/lib/*.la --with-geos=${bindir}/geos-config \ --with-proj=$prefix \ --with-libz=$prefix \ + --with-expat=$prefix \ --with-sqlite3=$prefix \ --with-curl=${bindir}/curl-config \ --with-openjpeg \ @@ -92,6 +93,7 @@ dependencies = [ Dependency("SQLite_jll"), Dependency("LibCURL_jll"), Dependency("OpenJpeg_jll"), + Dependency("Expat_jll"), ] # Build the tarballs, and possibly a `build.jl` as well. From c4d106971b647cc36953d5dacd34199e0e7966dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 19 Oct 2020 00:35:04 +0100 Subject: [PATCH 2/9] [GDAL] Explicit list `LibCURL_jll` dependencies --- G/GDAL/build_tarballs.jl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 89c3ade944b..462b014508c 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -94,6 +94,11 @@ dependencies = [ Dependency("LibCURL_jll"), Dependency("OpenJpeg_jll"), Dependency("Expat_jll"), + # The following libraries are dependencies of LibCURL_jll which is now a + # stdlib, but the stdlib doesn't explicitly list its dependencies + Dependency("LibSSH2_jll"), + Dependency("MbedTLS_jll"), + Dependency("nghttp2_jll"), ] # Build the tarballs, and possibly a `build.jl` as well. From abc1c1ec425b043a653daec414818fdf707382c6 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Mon, 19 Oct 2020 13:56:49 +0200 Subject: [PATCH 3/9] Enable zstd and webp drivers as well. --- G/GDAL/build_tarballs.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 462b014508c..8d20107038d 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -44,6 +44,8 @@ rm -f ${prefix}/lib/*.la --with-proj=$prefix \ --with-libz=$prefix \ --with-expat=$prefix \ + --with-zstd=$prefix \ + --with-webp=$prefix \ --with-sqlite3=$prefix \ --with-curl=${bindir}/curl-config \ --with-openjpeg \ @@ -94,6 +96,8 @@ dependencies = [ Dependency("LibCURL_jll"), Dependency("OpenJpeg_jll"), Dependency("Expat_jll"), + Dependency("Zstd_jll"), + Dependency("libwebp_jll"), # The following libraries are dependencies of LibCURL_jll which is now a # stdlib, but the stdlib doesn't explicitly list its dependencies Dependency("LibSSH2_jll"), From bd82363e2d29988e425a3cd6f34282ede862c0fb Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Mon, 19 Oct 2020 16:51:47 +0200 Subject: [PATCH 4/9] Enabled -lstdc++. --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 8d20107038d..a4102515ede 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -31,7 +31,7 @@ elif [[ "${target}" == *-linux-* ]]; then export EXTRA_GEOS_LIBS="${EXTRA_GEOS_LIBS} -lm" export EXTRA_SQLITE3_LIBS="-lm" # libpthread and libldl are needed for libgdal, so let's always use them - export LDFLAGS="-lpthread -ldl" + export LDFLAGS="-lpthread -ldl -lstdc++" fi autoreconf -vi fi From c816af5a89029e13450869c086a5fa4379006b70 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Mon, 19 Oct 2020 17:05:40 +0200 Subject: [PATCH 5/9] Enabled LDFLAGS everywhere. --- G/GDAL/build_tarballs.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index a4102515ede..cfdf1e8ae9e 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -31,10 +31,11 @@ elif [[ "${target}" == *-linux-* ]]; then export EXTRA_GEOS_LIBS="${EXTRA_GEOS_LIBS} -lm" export EXTRA_SQLITE3_LIBS="-lm" # libpthread and libldl are needed for libgdal, so let's always use them - export LDFLAGS="-lpthread -ldl -lstdc++" + export LDFLAGS="-lpthread -ldl" fi autoreconf -vi fi +export LDFLAGS="$LDFLAGS -lstdc++" # Clear out `.la` files since they're often wrong and screw us up rm -f ${prefix}/lib/*.la From fb7f3cda7e2637d56dbd110bf490cd994047c448 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Mon, 19 Oct 2020 17:45:41 +0200 Subject: [PATCH 6/9] Moved LDFLAGS into linux part. --- G/GDAL/build_tarballs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index cfdf1e8ae9e..da1c67b3106 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -26,16 +26,16 @@ elif [[ "${target}" == *-linux-* ]]; then atomic_patch -p1 "$WORKSPACE/srcdir/patches/configure_ac_curl_libs.patch" export EXTRA_GEOS_LIBS="-lstdc++" export EXTRA_CURL_LIBS="-lstdc++" + export LDFLAGS="$LDFLAGS -lstdc++" if [[ "${target}" == powerpc64le-* ]]; then atomic_patch -p1 "$WORKSPACE/srcdir/patches/sqlite3-m4-extra-libs.patch" export EXTRA_GEOS_LIBS="${EXTRA_GEOS_LIBS} -lm" export EXTRA_SQLITE3_LIBS="-lm" # libpthread and libldl are needed for libgdal, so let's always use them - export LDFLAGS="-lpthread -ldl" + export LDFLAGS="$LDFLAGS -lpthread -ldl" fi autoreconf -vi fi -export LDFLAGS="$LDFLAGS -lstdc++" # Clear out `.la` files since they're often wrong and screw us up rm -f ${prefix}/lib/*.la From 38de74a63f993bac3103a5671836d2c475b4a862 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Mon, 19 Oct 2020 20:59:38 +0200 Subject: [PATCH 7/9] Also include Postgres driver. --- G/GDAL/build_tarballs.jl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index da1c67b3106..2ef2eac8275 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -40,6 +40,7 @@ fi # Clear out `.la` files since they're often wrong and screw us up rm -f ${prefix}/lib/*.la +./configure --help ./configure --prefix=$prefix --host=$target \ --with-geos=${bindir}/geos-config \ --with-proj=$prefix \ @@ -47,6 +48,7 @@ rm -f ${prefix}/lib/*.la --with-expat=$prefix \ --with-zstd=$prefix \ --with-webp=$prefix \ + --with-pg=yes \ --with-sqlite3=$prefix \ --with-curl=${bindir}/curl-config \ --with-openjpeg \ @@ -57,6 +59,9 @@ rm -f ${prefix}/lib/*.la grep "HAVE_GEOS='yes'" config.log grep "HAVE_SQLITE='yes'" config.log grep "CURL_SETTING='yes'" config.log +grep "ZSTD_SETTING='yes'" config.log +grep "HAVE_PG='yes'" config.log +grep "HAVE_EXPAT='yes'" config.log make -j${nproc} make install @@ -99,6 +104,7 @@ dependencies = [ Dependency("Expat_jll"), Dependency("Zstd_jll"), Dependency("libwebp_jll"), + Dependency("LibPQ_jll"), # The following libraries are dependencies of LibCURL_jll which is now a # stdlib, but the stdlib doesn't explicitly list its dependencies Dependency("LibSSH2_jll"), From aa54f2e843b607559891ddd0985fd67722e56936 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Tue, 20 Oct 2020 08:48:36 +0200 Subject: [PATCH 8/9] Removed PostgreSQL. --- G/GDAL/build_tarballs.jl | 2 -- 1 file changed, 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 2ef2eac8275..4cc688d05d2 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -48,7 +48,6 @@ rm -f ${prefix}/lib/*.la --with-expat=$prefix \ --with-zstd=$prefix \ --with-webp=$prefix \ - --with-pg=yes \ --with-sqlite3=$prefix \ --with-curl=${bindir}/curl-config \ --with-openjpeg \ @@ -60,7 +59,6 @@ grep "HAVE_GEOS='yes'" config.log grep "HAVE_SQLITE='yes'" config.log grep "CURL_SETTING='yes'" config.log grep "ZSTD_SETTING='yes'" config.log -grep "HAVE_PG='yes'" config.log grep "HAVE_EXPAT='yes'" config.log make -j${nproc} From 656052db63686fef320153ae7f04a6c1d834a4f4 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Tue, 20 Oct 2020 08:48:57 +0200 Subject: [PATCH 9/9] Removed PostgreSQL dep --- G/GDAL/build_tarballs.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 4cc688d05d2..433573c0bf1 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -102,7 +102,6 @@ dependencies = [ Dependency("Expat_jll"), Dependency("Zstd_jll"), Dependency("libwebp_jll"), - Dependency("LibPQ_jll"), # The following libraries are dependencies of LibCURL_jll which is now a # stdlib, but the stdlib doesn't explicitly list its dependencies Dependency("LibSSH2_jll"),