CI/Docker: add libarchive dependency

OSGeo-jp · Jan 8, 2023 · b661b32 · b661b32
1 parent 60579c5
commit b661b32
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/alpine/start.sh b/.github/workflows/alpine/start.sh
@@ -14,6 +14,7 @@ apk add \
     openexr-dev libheif-dev xerces-c-dev geos-dev cfitsio-dev \
     netcdf-dev libaec-dev hdf5-dev freexl-dev \
     lz4-dev blosc-dev libdeflate-dev brotli-dev uriparser-dev \
+    libarchive-dev \
     kealib-dev libjxl-dev \
     json-c-dev giflib-dev \
     libspatialite-dev librasterlite2-dev \

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
@@ -59,7 +59,7 @@ jobs:
            libpoppler-dev libpoppler-private-dev gpsbabel libhdf4-alt-dev libhdf5-serial-dev libpodofo-dev poppler-utils \
            libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libcrypto++-dev libkml-dev \
            libmysqlclient-dev libarmadillo-dev wget libfyba-dev libjsoncpp-dev libexpat1-dev \
-           libclc-dev ocl-icd-opencl-dev libsqlite3-dev sqlite3-pcre libpcre3-dev libspatialite-dev libsfcgal-dev fossil libcairo2-dev libjson-c-dev libdeflate-dev liblz4-dev libblosc-dev \
+           libclc-dev ocl-icd-opencl-dev libsqlite3-dev sqlite3-pcre libpcre3-dev libspatialite-dev libsfcgal-dev fossil libcairo2-dev libjson-c-dev libdeflate-dev liblz4-dev libblosc-dev libarchive-dev \
            libqhull-dev libcfitsio-dev libogdi-dev libopenjp2-7-dev libheif-dev \
            python3-dev libpython3-dev libpython3.8-dev python3.8-dev python3-numpy python3-lxml pyflakes python3-setuptools python3-pip python3-venv \
            python3-pytest swig doxygen texlive-latex-base make cppcheck ccache g++ \
@@ -327,7 +327,7 @@ jobs:
           # Disable mingw-w64-x86_64-crypto++ as it crashes at runtime on eedai_3 test. Likely a build issue with crypto++ itself
           install: |
             base-devel git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache
-            mingw-w64-x86_64-pcre mingw-w64-x86_64-xerces-c mingw-w64-x86_64-zstd
+            mingw-w64-x86_64-pcre mingw-w64-x86_64-xerces-c mingw-w64-x86_64-zstd mingw-w64-x86_64-libarchive
             mingw-w64-x86_64-geos mingw-w64-x86_64-libspatialite mingw-w64-x86_64-proj
             mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler mingw-w64-x86_64-postgresql
             mingw-w64-x86_64-libgeotiff mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw-w64-x86_64-openjpeg
@@ -434,7 +434,7 @@ jobs:
             libnetcdf openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \
             cfitsio freexl geotiff jpeg libpq libspatialite libwebp-base pcre pcre2 postgresql \
             sqlite tiledb zstd cryptopp cgal doxygen librttopo libkml openssl xz \
-            openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc \
+            openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc libarchive \
             "arrow-cpp>=7.0.0" "pyarrow>=7.0.0"
         cd $CONDA_PREFIX/Library/share/proj
         curl http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz > proj-datumgrid-1.8.tar.gz
@@ -613,7 +613,7 @@ jobs:
         brew unlink python
         brew install --overwrite python@3.10 python@3.11
         brew install postgresql || brew link postgresql
-        brew install pkg-config freexl libxml2 libspatialite geos proj libgeotiff openjpeg giflib libaec postgis poppler doxygen unixodbc jpeg-turbo aom jpeg-xl libheif
+        brew install pkg-config freexl libxml2 libspatialite geos proj libgeotiff openjpeg giflib libaec postgis poppler doxygen unixodbc jpeg-turbo aom jpeg-xl libheif libarchive
         brew install ccache swig
         # gdal is automatically installed as a dependency for postgis
         brew uninstall --ignore-dependencies gdal

diff --git a/.github/workflows/fedora_rawhide/start.sh b/.github/workflows/fedora_rawhide/start.sh
@@ -6,7 +6,7 @@ dnf upgrade -y
 dnf install -y --setopt=install_weak_deps=False proj-devel
 dnf install -y clang make diffutils ccache cmake \
               libxml2-devel libxslt-devel expat-devel xerces-c-devel \
-              zlib-devel xz-devel libzstd-devel blosc-devel \
+              zlib-devel xz-devel libzstd-devel blosc-devel libarchive-devel \
               giflib-devel libjpeg-devel libpng-devel \
               openjpeg2-devel cfitsio-devel libwebp-devel \
               libkml-devel json-c-devel \

diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile
@@ -33,6 +33,7 @@ RUN apk add --no-cache \
     openexr-dev libheif-dev xerces-c-dev geos-dev cfitsio-dev \
     netcdf-dev hdf5-dev freexl-dev \
     lz4-dev blosc-dev libdeflate-dev brotli-dev uriparser-dev \
+    libarchive-dev \
     kealib-dev libjxl-dev \
     json-c-dev giflib-dev \
     mariadb-connector-c-dev \
@@ -302,6 +303,7 @@ RUN apk add --no-cache \
         netcdf hdf5 freexl \
         openexr libheif xerces-c geos cfitsio minizip \
         lz4-libs blosc libdeflate brotli-libs liburiparser \
+        libarchive \
         kealib libjxl \
         json-c giflib \
         mariadb-connector-c \

diff --git a/docker/alpine-small/Dockerfile b/docker/alpine-small/Dockerfile
@@ -18,7 +18,7 @@ RUN apk add --no-cache wget curl unzip make libtool autoconf automake pkgconfig
 RUN apk add --no-cache \
     linux-headers \
     curl-dev tiff-dev \
-    zlib-dev zstd-dev lz4-dev libdeflate-dev \
+    zlib-dev zstd-dev lz4-dev libdeflate-dev libarchive-dev \
     libjpeg-turbo-dev libpng-dev libwebp-dev expat-dev postgresql-dev openjpeg-dev
 
 # Build openjpeg
@@ -171,7 +171,7 @@ RUN apk add --no-cache \
         libstdc++ \
         sqlite-libs \
         libcurl tiff \
-        zlib zstd-libs lz4-libs libdeflate \
+        zlib zstd-libs lz4-libs libdeflate libarchive \
         libjpeg-turbo libpng openjpeg libwebp expat libpq \
     # libturbojpeg.so is not used by GDAL. Only libjpeg.so*
     && rm -f /usr/lib/libturbojpeg.so* \

diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
@@ -65,6 +65,7 @@ RUN . /buildscripts/bh-set-envvars.sh \
        libopenexr-dev${APT_ARCH_SUFFIX} libheif-dev${APT_ARCH_SUFFIX} \
        libdeflate-dev${APT_ARCH_SUFFIX} libblosc-dev${APT_ARCH_SUFFIX} liblz4-dev${APT_ARCH_SUFFIX} libbz2-dev${APT_ARCH_SUFFIX} \
        libbrotli-dev${APT_ARCH_SUFFIX} \
+       libarchive-dev${APT_ARCH_SUFFIX} \
     && rm -rf /var/lib/apt/lists/*
 
 # Build likbkea
@@ -297,6 +298,7 @@ RUN apt-get update \
         libarmadillo10 libpython3.10 libopenexr25 libheif1 \
         libdeflate0 libblosc1 liblz4-1 \
         libbrotli1 \
+        libarchive13 \
         python-is-python3 \
     # Workaround bug in ogdi packaging
     && ln -s /usr/lib/ogdi/libvrf.so /usr/lib \