aboutsummaryrefslogtreecommitdiff
path: root/package/rpm/rpm.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/rpm/rpm.mk')
-rw-r--r--package/rpm/rpm.mk28
1 files changed, 19 insertions, 9 deletions
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index d29c3febaa..351ae0994f 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -4,13 +4,12 @@
#
################################################################################
-RPM_VERSION_MAJOR = 4.15
-RPM_VERSION = $(RPM_VERSION_MAJOR).1
+RPM_VERSION_MAJOR = 4.16
+RPM_VERSION = $(RPM_VERSION_MAJOR).0
RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
RPM_DEPENDENCIES = \
host-pkgconf \
- berkeleydb \
$(if $(BR2_PACKAGE_BZIP2),bzip2) \
$(if $(BR2_PACKAGE_ELFUTILS),elfutils) \
file \
@@ -23,6 +22,9 @@ RPM_LICENSE_FILES = COPYING
# We're patching configure.ac
RPM_AUTORECONF = YES
+# Don't set --{dis,en}-openmp as upstream wants to abort the build if
+# --enable-openmp is provided and OpenMP is < 4.5:
+# https://github.com/rpm-software-management/rpm/pull/1433
RPM_CONF_OPTS = \
--disable-python \
--disable-rpath \
@@ -38,6 +40,13 @@ else
RPM_CONF_OPTS += --without-acl
endif
+ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
+RPM_DEPENDENCIES += berkeleydb
+RPM_CONF_OPTS += --enable-bdb
+else
+RPM_CONF_OPTS += --disable-bdb
+endif
+
ifeq ($(BR2_PACKAGE_DBUS),y)
RPM_DEPENDENCIES += dbus
RPM_CONF_OPTS += --enable-plugins
@@ -88,6 +97,13 @@ else
RPM_CONF_OPTS += --without-selinux
endif
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+RPM_DEPENDENCIES += sqlite
+RPM_CONF_OPTS += --enable-sqlite
+else
+RPM_CONF_OPTS += --disable-sqlite
+endif
+
ifeq ($(BR2_PACKAGE_ZSTD),y)
RPM_DEPENDENCIES += zstd
RPM_CONF_OPTS += --enable-zstd
@@ -95,12 +111,6 @@ else
RPM_CONF_OPTS += --disable-zstd
endif
-ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y)
-RPM_CONF_OPTS += --enable-openmp
-else
-RPM_CONF_OPTS += --disable-openmp
-endif
-
# ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`).
RPM_CONF_ENV = \
ac_cv_prog_cc_c99='-std=gnu99' \