summaryrefslogtreecommitdiffstats
path: root/package/rpm/rpm.mk
diff options
context:
space:
mode:
authorNigel Kukard <nkukard@lbsd.net>2009-12-25 10:29:22 +0000
committerNigel Kukard <nkukard@lbsd.net>2009-12-25 10:29:22 +0000
commitf16a9799b65214ffe1b07372676386e31ad51801 (patch)
tree623250fb62f9e58c5f1f7306965c944e6870172e /package/rpm/rpm.mk
parent9400c73582326c543fae82120af3904836145655 (diff)
downloadbuildroot-novena-f16a9799b65214ffe1b07372676386e31ad51801.tar.gz
buildroot-novena-f16a9799b65214ffe1b07372676386e31ad51801.zip
Bumped rpm
Diffstat (limited to 'package/rpm/rpm.mk')
-rw-r--r--package/rpm/rpm.mk25
1 files changed, 16 insertions, 9 deletions
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index d3da779de..0104f1719 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -3,15 +3,15 @@
# rpm
#
#############################################################
-RPM_VERSION = 5.1.6
-RPM_SITE = http://rpm5.org/files/rpm/rpm-5.1/
-RPM_AUTORECONF = YES
+RPM_VERSION = 5.2.0
+RPM_SITE = http://rpm5.org/files/rpm/rpm-5.2/
+RPM_AUTORECONF = NO
RPM_LIBTOOL_PATCH = NO
-RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt
+RPM_DEPENDENCIES = zlib beecrypt neon popt
-RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon" \
- ac_cv_va_copy=yes
+RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
+ ac_cv_va_copy=yes
# the above doesn't work with shared config.cache
RPM_USE_CONFIG_CACHE = NO
@@ -20,9 +20,16 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
--without-python --without-perl \
--with-zlib=$(STAGING_DIR) \
--with-libbeecrypt=$(STAGING_DIR) \
- --with-popt=$(STAGING_DIR) \
- --with-mutex=UNIX/fcntl \
- --with-bzip2
+ --with-popt=$(STAGING_DIR)
+
+ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
+RPM_CONF_OPT+=--with-xz
+endif
+
+ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
+RPM_CONF_OPT+=--with-bzip2
+RPM_DEPENDENCIES+=bzip2
+endif
RPM_MAKE = $(MAKE1)