Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GDAL] Add zstd and webp drivers #1941

Merged
merged 10 commits into from
Oct 20, 2020
Merged

[GDAL] Add zstd and webp drivers #1941

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
709a2e4
Added expat build support.
evetion Oct 18, 2020
c4d1069
[GDAL] Explicit list `LibCURL_jll` dependencies
giordano Oct 18, 2020
1b86e4e
Merge remote-tracking branch 'upstream/master'
evetion Oct 19, 2020
abc1c1e
Enable zstd and webp drivers as well.
evetion Oct 19, 2020
bd82363
Enabled -lstdc++.
evetion Oct 19, 2020
c816af5
Enabled LDFLAGS everywhere.
evetion Oct 19, 2020
fb7f3cd
Moved LDFLAGS into linux part.
evetion Oct 19, 2020
38de74a
Also include Postgres driver.
evetion Oct 19, 2020
aa54f2e
Removed PostgreSQL.
evetion Oct 20, 2020
656052d
Removed PostgreSQL dep
evetion Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion G/GDAL/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,28 @@ 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

# 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 \
--with-libz=$prefix \
--with-expat=$prefix \
--with-zstd=$prefix \
--with-webp=$prefix \
--with-sqlite3=$prefix \
--with-curl=${bindir}/curl-config \
--with-openjpeg \
Expand All @@ -54,6 +58,8 @@ 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_EXPAT='yes'" config.log

make -j${nproc}
make install
Expand Down Expand Up @@ -94,6 +100,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"),
Expand Down