Skip to content

Commit

Permalink
bump(main/gdal): 3.9.2
Browse files Browse the repository at this point in the history
Disable -Wdocumentation clang flag until NDK r27c is out:
android/ndk#2070

Fixes #21147.
  • Loading branch information
fornwall committed Sep 13, 2024
1 parent bf7a8d3 commit 75a1d5f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/gdal/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A translator library for raster and vector geospatial da
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="LICENSE.TXT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.9.1"
TERMUX_PKG_VERSION="3.9.2"
TERMUX_PKG_SRCURL=https://download.osgeo.org/gdal/${TERMUX_PKG_VERSION}/gdal-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=aff3086fee75f5773e33a5598df98d8a4d10be411f777d3ce23584b21d8171ca
TERMUX_PKG_SHA256=bfbcc9f087f012c36151c20c79f8eac9529e1e5298fbded79cd5a1365f0b113a
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="giflib, json-c, libc++, libcurl, libexpat, libfreexl, libgeos, libiconv, libjpeg-turbo, libjxl, liblzma, libpng, libspatialite, libsqlite, libwebp, libxml2, netcdf-c, openjpeg, openssl, proj, postgresql, zlib, zstd"
TERMUX_PKG_BUILD_DEPENDS="json-c-static"
Expand Down
19 changes: 19 additions & 0 deletions packages/gdal/gdal.cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Avoid -Wdocumentation clang flag which causes a clang crash.

Will be fixed in NDK r27c: https://github.com/android/ndk/issues/2070

diff -u -r ../gdal-3.9.1/gdal.cmake ./gdal.cmake
--- ../gdal-3.9.1/gdal.cmake 2024-06-22 22:04:02.000000000 +0000
+++ ./gdal.cmake 2024-09-13 13:26:47.821834791 +0000
@@ -156,11 +156,6 @@
detect_and_set_cxx_warning_flag(extra-semi)
detect_and_set_c_and_cxx_warning_flag(comma)
detect_and_set_c_and_cxx_warning_flag(float-conversion)
- check_c_compiler_flag("-Wdocumentation -Wno-documentation-deprecated-sync" HAVE_WFLAG_DOCUMENTATION_AND_NO_DEPRECATED)
- if (HAVE_WFLAG_DOCUMENTATION_AND_NO_DEPRECATED)
- set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -Wdocumentation -Wno-documentation-deprecated-sync)
- set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wdocumentation -Wno-documentation-deprecated-sync)
- endif ()
detect_and_set_cxx_warning_flag(unused-private-field)
detect_and_set_cxx_warning_flag(non-virtual-dtor)
detect_and_set_cxx_warning_flag(overloaded-virtual)

0 comments on commit 75a1d5f

Please sign in to comment.