docker/alpine-normal/Dockerfile: update to HDF4 4.3.0 and replace portablexdr which has been deprecated in alpine 3.21 with libtirpc [ci skip]

This commit is contained in:
Even Rouault 2024-12-11 17:01:16 +01:00
parent 0ed4def329
commit 0fceb45b26
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 9 additions and 9 deletions

View File

@ -104,14 +104,14 @@ RUN if test "$(uname -m)" = "x86_64"; then ( \
); fi ); fi
# Build hdf4 # Build hdf4
ARG HDF4_VERSION=4.2.16 ARG HDF4_VERSION=4.3.0
RUN if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \ RUN if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
apk add --no-cache byacc flex portablexdr-dev \ apk add --no-cache byacc flex libtirpc-dev \
&& mkdir hdf4 \ && mkdir hdf4 \
&& curl -L -fsS https://support.hdfgroup.org/ftp/HDF/releases/HDF${HDF4_VERSION}/src/hdf-${HDF4_VERSION}.tar.gz \ && curl -L -fsS https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf${HDF4_VERSION}.tar.gz \
| tar xz -C hdf4 --strip-components=2 \ | tar xz -C hdf4 --strip-components=1 \
&& cd hdf4 \ && cd hdf4 \
&& LDFLAGS=-lportablexdr ./configure --prefix=/usr --enable-shared --disable-static \ && LDFLAGS=-ltirpc ./configure --prefix=/usr --enable-shared --disable-static \
--with-szlib=/usr --disable-fortran --disable-netcdf \ --with-szlib=/usr --disable-fortran --disable-netcdf \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
@ -120,7 +120,7 @@ RUN if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
&& for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \ && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
&& cd .. \ && cd .. \
&& rm -rf hdf4 \ && rm -rf hdf4 \
&& apk del byacc flex portablexdr-dev \ && apk del byacc flex libtirpc-dev \
); fi ); fi
# Build libOpenDRIVE # Build libOpenDRIVE
@ -245,8 +245,8 @@ RUN --mount=type=cache,id=alpine-normal-gdal,target=$HOME/.cache \
export GDAL_SHA1SUM=${GDAL_VERSION}; \ export GDAL_SHA1SUM=${GDAL_VERSION}; \
fi \ fi \
&& if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then \ && if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then \
apk add --no-cache portablexdr-dev \ apk add --no-cache libtirpc-dev \
&& export LDFLAGS="-lportablexdr ${LDFLAGS}"; \ && export LDFLAGS="-ltirpc ${LDFLAGS}"; \
fi \ fi \
&& mkdir gdal \ && mkdir gdal \
&& curl -L -fsS https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz \ && curl -L -fsS https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz \
@ -372,7 +372,7 @@ RUN apk add --no-cache \
openjpeg \ openjpeg \
pcre2 \ pcre2 \
poppler \ poppler \
portablexdr \ libtirpc \
proj \ proj \
python3 \ python3 \
py3-numpy \ py3-numpy \