rpm: fix build with BR2_CONFIG_CACHE, fix CFLAGS

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 41df742491b29714f9ea628e12f2886f9cbb91f1..264c39848b012ad38145e15429794dc051dddbf0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,7 +28,7 @@
        libupnp, libuuid, libxml2, lighttpd, ltrace, lua, lzma, magiccube4d,
        matchbox, mdadm, nbd, ncftp, ncurses, netkittelnet, netsnmp,
        ng-spice-rework, ntfs-3g, openntp, openssl, pcmanfm, php, psmisc,
-       python, quagga, radvd, rsync, rubix, samba, sawman, sdl,
+       python, quagga, radvd, rpm, rsync, rubix, samba, sawman, sdl,
        shared-mime-info, sfdisk, spawn-fcgi, speech-tools, sqlite, squashfs,
        synergy, syslinux, target-binutils, tcpdump, torsmo, u-boot, udpcast,
        util-linux, valgrind, vsftpd, wipe, wpa-supplicant, x11vnc,

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index e769a050f4615a14e74e1ce7e35626b1d6af8e99..d3da779deda601ba97d7c590707f3451e2bffa30 100644 (file)
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -10,8 +10,10 @@ RPM_LIBTOOL_PATCH = NO
 
 RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt
 
-RPM_CONF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon" \
+RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon" \
                ac_cv_va_copy=yes
+# the above doesn't work with shared config.cache
+RPM_USE_CONFIG_CACHE = NO
 
 RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
        --without-selinux \
@@ -22,7 +24,7 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
        --with-mutex=UNIX/fcntl \
        --with-bzip2
 
-RPM_MAKE_OPT = -j1
+RPM_MAKE = $(MAKE1)
 
 RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install