|
 |
620d5e |
From 0bfd20c900e75d8c4a42d80d7e2c3405141dd90b Mon Sep 17 00:00:00 2001
|
|
|
620d5e |
From: Colin Walters <walters@verbum.org>
|
|
|
620d5e |
Date: Thu, 14 May 2020 00:38:48 +0000
|
|
|
620d5e |
Subject: [PATCH] build-sys: Disable zchunk for libdnf if we don't have it
|
|
|
620d5e |
|
|
|
620d5e |
Going to update rpm-ostree for RHEL 8.3, we did a huge bump
|
|
|
620d5e |
in libdnf which now defaults to enabling zchunk in its build
|
|
|
620d5e |
system. We added the infrastructure before to detect things,
|
|
|
620d5e |
so propagate that to libdnf.
|
|
|
620d5e |
---
|
|
|
620d5e |
configure.ac | 6 +++++-
|
|
|
620d5e |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
620d5e |
|
|
|
620d5e |
diff --git a/configure.ac b/configure.ac
|
|
|
620d5e |
index 684f202b..57d9ae24 100644
|
|
|
620d5e |
--- a/configure.ac
|
|
|
620d5e |
+++ b/configure.ac
|
|
|
620d5e |
@@ -131,8 +131,9 @@ AS_IF([pkg-config --atleast-version=4.14.2 rpm], [], [AC_MSG_ERROR([librpm 4.14.
|
|
|
620d5e |
|
|
|
620d5e |
dnl We don't *actually* use this ourself, but librepo does, and libdnf gets confused
|
|
|
620d5e |
dnl if librepo doesn't support it.
|
|
|
620d5e |
+have_zchunk=no
|
|
|
620d5e |
AS_IF([pkg-config --exists zck],
|
|
|
620d5e |
- [AC_DEFINE([HAVE_ZCHUNK], 1, [Define if we have zchunk])])
|
|
|
620d5e |
+ [have_zchunk=yes; AC_DEFINE([HAVE_ZCHUNK], 1, [Define if we have zchunk])])
|
|
|
620d5e |
|
|
|
620d5e |
AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
|
620d5e |
|
|
|
620d5e |
@@ -259,6 +260,9 @@ cmake_args=-DCMAKE_BUILD_TYPE=RelWithDebugInfo
|
|
|
620d5e |
if test ${debug_release} = debug; then
|
|
|
620d5e |
cmake_args="-DCMAKE_BUILD_TYPE=Debug"
|
|
|
620d5e |
fi
|
|
|
620d5e |
+if test x${have_zchunk} = xno; then
|
|
|
620d5e |
+ cmake_args="${cmake_args} -DWITH_ZCHUNK:BOOL=0"
|
|
|
620d5e |
+fi
|
|
|
620d5e |
export cmake_args
|
|
|
620d5e |
|
|
|
620d5e |
dnl I picked /usr/libexec/rpm-ostree just because we need an
|
|
|
620d5e |
--
|
|
|
620d5e |
2.18.4
|
|
|
620d5e |
|