From fb2975ff9c356cdf279a59857d52dc339e2e2a47 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Mar 2020 10:40:39 +0100 Subject: Fix build with RPM 4.11 (EL-7) --- config.m4 | 3 +++ rpminfo.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config.m4 b/config.m4 index ef96f22..650eb05 100644 --- a/config.m4 +++ b/config.m4 @@ -15,6 +15,9 @@ if test "$PHP_RPMINFO" != "no"; then LIBRPM_LIBDIR=`$PKG_CONFIG rpm --libs` LIBRPM_VERSON=`$PKG_CONFIG rpm --modversion` AC_MSG_RESULT(from pkgconfig: version $LIBRPM_VERSON) + if $PKG_CONFIG rpm --atleast-version 4.12; then + AC_DEFINE(HAVE_WEAKDEP, 1, [ Weak dependencies in RPM 4.12 ]) + fi else AC_MSG_ERROR(system librpm is too old: version 4.11.3 required) fi diff --git a/rpminfo.c b/rpminfo.c index 53e4c6a..2eb3e0c 100644 --- a/rpminfo.c +++ b/rpminfo.c @@ -326,13 +326,15 @@ static int haveIndex(zend_long tag) { tag == RPMDBI_INSTALLTID || tag == RPMDBI_SIGMD5 || tag == RPMDBI_SHA1HEADER || - tag == RPMDBI_INSTFILENAMES || +#ifdef HAVE_WEAKDEP tag == RPMDBI_FILETRIGGERNAME || tag == RPMDBI_TRANSFILETRIGGERNAME || tag == RPMDBI_RECOMMENDNAME || tag == RPMDBI_SUGGESTNAME || tag == RPMDBI_SUPPLEMENTNAME || - tag == RPMDBI_ENHANCENAME) { + tag == RPMDBI_ENHANCENAME || +#endif + tag == RPMDBI_INSTFILENAMES) { return 1; } return 0; -- cgit