Skip to content

Commit a1df00c

Browse files
authored
Hotfix: Restore external HDF4 in linux packages (#206)
* Restore HDF4 * Install cript updated * Bump HDF4 version. Configuring HDF4 for GDAL * Update workflow
1 parent 004ecf2 commit a1df00c

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

shared/GdalCore.opt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ VCPKG_REPO=https://github.com/microsoft/vcpkg.git
2828
VCPKG_COMMIT_VER=2025.06.13
2929

3030
# base requirements for all runtimes
31-
VCPKG_REQUIRE=geos "tiff[zstd,zip,jpeg,tools,lzma,cxx,webp]" curl "poppler[cairo,cms,zlib,glib,curl,private-api]"
31+
VCPKG_REQUIRE=geos "tiff[zstd,zip,jpeg,tools,lzma,cxx,webp]" "curl[tool,openssl]" "poppler[cairo,cms,zlib,glib,curl,private-api]"
3232
VCPKG_REQUIRE_DYNAMIC=unixodbc openssl zlib expat xerces-c zlib libxml2 libpq openjpeg cfitsio "openexr[tools]" libwebp giflib hdf5 pcre freexl libkml libpng "libjxl[tools]" netcdf-c "libgeotiff[tools]" "sqlite3[tool,rtree]" cryptopp blosc arrow[parquet]
3333
# windows runtime now depends on GisInternals SDK
3434
# we have nothing to install except custom geos and proj
@@ -81,7 +81,7 @@ SWIG_INCLUDE_=$(BASE_SWIG_)/include
8181
##### HDF build location (only for osx)
8282
HDF_BUILD=$(BUILD_ROOT)/hdf-build
8383
HDF_CMAKE_TMP=$(BUILD_ROOT)/hdf-cmake-temp
84-
HDF_VERSION=4.3.0
84+
HDF_VERSION=4.3.1
8585

8686
##### PROJ build location
8787
PROJ_BUILD=$(BUILD_ROOT)/proj-build

unix/before-install.sh

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set -e
33
sudo apt-get update
44
sudo apt-get install g++ make cmake git curl \
55
zip unzip tar pkg-config linux-headers-generic libltdl-dev \
6-
autoconf automake python3 autoconf-archive swig patchelf -y
6+
autoconf automake python3 autoconf-archive swig patchelf bison -y

unix/gdal-makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,16 @@ configure_hdf:
9898
@echo "$(TO) HDF Configuring..."
9999

100100
@if [[ -d "$(BUILD_ROOT)/hdf-build" ]]; then rm -r "$(BUILD_ROOT)/hdf-build"; fi;
101+
@if [[ -d "$(BUILD_ROOT)/hdf-cmake-temp" ]]; then rm -r "$(BUILD_ROOT)/hdf-cmake-temp"; fi;
101102

102103
-mkdir -p $(HDF_CMAKE_TMP)
103104
@cd $(HDF_CMAKE_TMP) && cmake $(HDF_SOURCE) \
104105
-DCMAKE_INSTALL_PREFIX=$(BUILD_ROOT)/hdf-build \
106+
-DCMAKE_MESSAGE_LOG_LEVEL=ERROR \
105107
-DCMAKE_BUILD_TYPE=Release \
106-
-DCMAKE_C_FLAGS="-Wno-dev" \
107-
-DCMAKE_CXX_FLAGS="-fPIC -Wno-dev" \
108+
-DHDF4_ENABLE_ALL_WARNINGS=OFF \
109+
-DJPEG_DIR=$(VCPKG_INSTALLED_DYNAMIC)/share \
110+
-DZLIB_DIR=$(VCPKG_INSTALLED_DYNAMIC)/share \
108111
-DCMAKE_PREFIX_PATH=$(VCPKG_INSTALLED_DYNAMIC) || exit 1
109112

110113
@echo "$(TO) HDF was configured!"
@@ -139,6 +142,10 @@ configure_gdal:
139142
-DOpenEXR_HALF_LIBRARY=$(VCPKG_INSTALLED_DYNAMIC)/lib/libImath-3_1.so \
140143
-DCMAKE_PREFIX_PATH=$(VCPKG_INSTALLED_DYNAMIC) \
141144
-DCMAKE_INSTALL_PREFIX=$(BUILD_ROOT)/gdal-build \
145+
-DHDF4_INCLUDE_DIR=$(BUILD_ROOT)/hdf-build/include \
146+
-DHDF4_COMPONENTS="df;mfhdf;szip" \
147+
-DHDF4_df_LIBRARY_RELEASE=$(BUILD_ROOT)/hdf-build/lib/libhdf.so \
148+
-DHDF4_mfhdf_LIBRARY_RELEASE=$(BUILD_ROOT)/hdf-build/lib/libmfhdf.so \
142149
|| exit 1
143150

144151
@echo "$(TO) GDAL was configured!"

0 commit comments

Comments
 (0)