36385f87f3
Commit e7af4033c3 ("rpm: use the new
gettext logic") introduced a really nasty bug: by adding
$(TARGET_NLS_DEPENDENCIES) to RPM_DEPENDENCIES, it completely
overwrote the existing value of RPM_DEPENDENCIES, entirely masking all
mandatory RPM dependencies.
rpm is fairly towards the end of the alphabet, and most other
mandatory dependencies (berkeleydb, host-pkgconf, file and popt)
appear earlier by alphabetic ordering. Only zlib was afterwards, but
since file depends on zlib, it was always built before. This probably
explains why our autobuilders haven't encountered a single build
failure.
However, a simple "make rpm" clearly exhibits the failure, and
obviously the upcoming per-package folder mechanism makes such bugs
even more obvious.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
82 lines
2.1 KiB
Makefile
82 lines
2.1 KiB
Makefile
################################################################################
|
|
#
|
|
# rpm
|
|
#
|
|
################################################################################
|
|
|
|
RPM_VERSION_MAJOR = 4.13
|
|
RPM_VERSION = $(RPM_VERSION_MAJOR).0.1
|
|
RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
|
|
RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
|
|
RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \
|
|
$(TARGET_NLS_DEPENDENCIES)
|
|
RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
|
|
RPM_LICENSE_FILES = COPYING
|
|
|
|
# 0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
|
|
# 0002-configure-ac-correct-stack-protector-check.patch
|
|
RPM_AUTORECONF = YES
|
|
|
|
RPM_CONF_OPTS = \
|
|
--disable-python \
|
|
--disable-rpath \
|
|
--with-external-db \
|
|
--with-gnu-ld \
|
|
--without-cap \
|
|
--without-hackingdocs \
|
|
--without-lua
|
|
|
|
ifeq ($(BR2_PACKAGE_ACL),y)
|
|
RPM_DEPENDENCIES += acl
|
|
RPM_CONF_OPTS += --with-acl
|
|
else
|
|
RPM_CONF_OPTS += --without-acl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBNSS),y)
|
|
RPM_DEPENDENCIES += libnss
|
|
RPM_CONF_OPTS += --without-beecrypt
|
|
RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr
|
|
else
|
|
RPM_DEPENDENCIES += beecrypt
|
|
RPM_CONF_OPTS += --with-beecrypt
|
|
RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
|
|
RPM_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr
|
|
else
|
|
RPM_CONF_OPTS += --without-libintl-prefix
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
|
|
RPM_DEPENDENCIES += libarchive
|
|
RPM_CONF_OPTS += --with-archive
|
|
else
|
|
RPM_CONF_OPTS += --without-archive
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
|
|
RPM_DEPENDENCIES += libselinux
|
|
RPM_CONF_OPTS += --with-selinux
|
|
else
|
|
RPM_CONF_OPTS += --without-selinux
|
|
endif
|
|
|
|
# For the elfutils and binutils dependencies, there are no
|
|
# configuration options to explicitly enable/disable them.
|
|
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
|
RPM_DEPENDENCIES += elfutils
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_BINUTILS),y)
|
|
RPM_DEPENDENCIES += binutils
|
|
endif
|
|
|
|
# ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`).
|
|
RPM_CONF_ENV = \
|
|
ac_cv_prog_cc_c99='-std=gnu99' \
|
|
CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)"
|
|
|
|
$(eval $(autotools-package))
|