Commit 3d82609b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

rpm: fix build with BR2_CONFIG_CACHE, fix CFLAGS 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 08703917

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -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,

package/rpm/rpm.mk

+4 −2
Original line number Diff line number Diff line
@@ -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