From: Lukas Javorsky Date: Wed, 9 Apr 2025 03:23:27 +0000 (+0200) Subject: Remove unnecessary `sharutils` dependency (#2571) X-Git-Tag: v3.8.0~47 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=95c386317f9ae02b6e711e17665f4f91157b12d4;p=thirdparty%2Flibarchive.git Remove unnecessary `sharutils` dependency (#2571) Resolves issue: #2570 --- diff --git a/build/ci/cirrus_ci/Dockerfile.cygwin b/build/ci/cirrus_ci/Dockerfile.cygwin index 453503e03..be9aca13b 100644 --- a/build/ci/cirrus_ci/Dockerfile.cygwin +++ b/build/ci/cirrus_ci/Dockerfile.cygwin @@ -1,4 +1,4 @@ FROM cirrusci/windowsservercore:2019 RUN choco install -y --no-progress cygwin -RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel +RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel diff --git a/build/ci/cirrus_ci/Dockerfile.fc31 b/build/ci/cirrus_ci/Dockerfile.fc31 index 435f1d206..028549723 100644 --- a/build/ci/cirrus_ci/Dockerfile.fc31 +++ b/build/ci/cirrus_ci/Dockerfile.fc31 @@ -1,3 +1,3 @@ FROM fedora:31 -RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel nettle-devel mbedtls-devel +RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel nettle-devel mbedtls-devel diff --git a/build/ci/cirrus_ci/Dockerfile.fc31.distcheck b/build/ci/cirrus_ci/Dockerfile.fc31.distcheck index 78b128990..10064e4ec 100644 --- a/build/ci/cirrus_ci/Dockerfile.fc31.distcheck +++ b/build/ci/cirrus_ci/Dockerfile.fc31.distcheck @@ -1,3 +1,3 @@ FROM fedora:31 -RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip +RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip diff --git a/build/ci/cirrus_ci/Dockerfile.windows b/build/ci/cirrus_ci/Dockerfile.windows index 34d6d32a7..5b6cab99a 100644 --- a/build/ci/cirrus_ci/Dockerfile.windows +++ b/build/ci/cirrus_ci/Dockerfile.windows @@ -9,4 +9,4 @@ RUN tar -x -f zlib-1.2.11.tar.gz RUN cd zlib-1.2.11 && cmake -G "Visual Studio 15 2017" . && cmake --build . --target ALL_BUILD --config Release && cmake --build . --target INSTALL --config Release RUN del /f /q /s zlib-1.2.11 zlib-1.2.11.tar.gz RUN choco install -y --no-progress cygwin -RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel +RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel diff --git a/build/ci/cirrus_ci/ci.cmd b/build/ci/cirrus_ci/ci.cmd index 654d70486..6fc1ea7c8 100755 --- a/build/ci/cirrus_ci/ci.cmd +++ b/build/ci/cirrus_ci/ci.cmd @@ -13,7 +13,7 @@ IF "%1%"=="prepare" ( IF "%BE%"=="cygwin-gcc" ( @ECHO ON choco install -y --no-progress cygwin || EXIT /b 1 - C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel || EXIT /b 1 + C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel || EXIT /b 1 @EXIT /b 0 ) ELSE IF "%BE%"=="mingw-gcc" ( @ECHO ON diff --git a/build/ci/cirrus_ci/ci.sh b/build/ci/cirrus_ci/ci.sh index 27ef05c3c..d49c7277f 100755 --- a/build/ci/cirrus_ci/ci.sh +++ b/build/ci/cirrus_ci/ci.sh @@ -29,10 +29,10 @@ then if [ -f "/etc/debian_version" ] then apt-get -y update - apt-get -y install build-essential locales automake libtool bison sharutils pkgconf libacl1-dev libbz2-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev libssl-dev lrzip cmake + apt-get -y install build-essential locales automake libtool bison pkgconf libacl1-dev libbz2-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev libssl-dev lrzip cmake elif [ -f "/etc/fedora-release" ] then - dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel + dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison pkgconf libacl-devel librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel fi fi elif [ "$1" = "test" ] diff --git a/contrib/libarchive.spec b/contrib/libarchive.spec index 371ae647f..fc31576fb 100644 --- a/contrib/libarchive.spec +++ b/contrib/libarchive.spec @@ -22,7 +22,6 @@ BuildRequires: libzstd-devel BuildRequires: lz4-devel BuildRequires: lzo-devel BuildRequires: openssl-devel -BuildRequires: sharutils BuildRequires: xz-devel BuildRequires: zlib-devel