From 11ee20c1cdcc7a76d9e1047e8063b8349a6c6da6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 15 Oct 2019 15:16:06 +0000 Subject: [PATCH] unpacker: Build with older libarchive without zstd It's not in RHEL8.1, and I'm trying to rebase rpm-ostree. --- configure.ac | 4 ++++ src/libpriv/rpmostree-unpacker-core.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 873dc6b9..a0c5cce4 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,10 @@ dnl bundled libdnf PKGDEP_RPMOSTREE_CFLAGS="-I $(pwd)/libdnf -I $(pwd)/libdnf-build $PKGDEP_RPMOSTREE_CFLAGS" PKGDEP_RPMOSTREE_LIBS="-L$(pwd)/libdnf-build/libdnf -ldnf $PKGDEP_RPMOSTREE_LIBS" +dnl RHEL8.1 has old libarchive +AS_IF([pkg-config --atleast-version=3.3.3 libarchive], + [AC_DEFINE([HAVE_LIBARCHIVE_ZSTD], 1, [Define if we have libarchive with zstd])]) + dnl This is the current version in Fedora 25. AS_IF([pkg-config --atleast-version=4.14.2 rpm], [], [AC_MSG_ERROR([librpm 4.14.2 required])]) diff --git a/src/libpriv/rpmostree-unpacker-core.c b/src/libpriv/rpmostree-unpacker-core.c index 3bd574a4..2d741b1e 100644 --- a/src/libpriv/rpmostree-unpacker-core.c +++ b/src/libpriv/rpmostree-unpacker-core.c @@ -74,7 +74,9 @@ rpmostree_unpack_rpm2cpio (int fd, GError **error) archive_read_support_filter_gzip, archive_read_support_filter_xz, archive_read_support_filter_bzip2, +#ifdef HAVE_LIBARCHIVE_ZSTD archive_read_support_filter_zstd, +#endif archive_read_support_format_cpio }; for (i = 0; i < G_N_ELEMENTS (archive_setup_funcs); i++) -- 2.21.0