summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-11-23 15:22:36 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2009-11-23 15:22:36 (GMT)
commit3d82609bd11b9b3c9949ef4c9d078df1ccdd39d0 (patch)
treeca7e7f047cf864b9a4634e3724bcb58fc5fba76a
parent08703917d79ddcff3763170b95cbf3ad52540583 (diff)
downloadbuildroot-3d82609bd11b9b3c9949ef4c9d078df1ccdd39d0.tar.gz
buildroot-3d82609bd11b9b3c9949ef4c9d078df1ccdd39d0.tar.bz2
rpm: fix build with BR2_CONFIG_CACHE, fix CFLAGS
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/rpm/rpm.mk6
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 41df742..264c398 100644
--- 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 e769a05..d3da779 100644
--- 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