rpm: use external (BR versions) of file and pcre

Saves space in rootfs, and fixes build issues (internal pcre needs
C++ support for unit test, internal file breaks with incompatible
file versions on host).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-11-14 16:17:14 +01:00
parent a276ff9030
commit 03d9092659

View File

@ -10,14 +10,28 @@ RPM_AUTORECONF = NO
RPM_DEPENDENCIES = zlib beecrypt neon popt
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
ac_cv_va_copy=yes
RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
--without-selinux \
--without-python --without-perl \
--with-zlib=$(STAGING_DIR) \
--with-libbeecrypt=$(STAGING_DIR) \
--with-popt=$(STAGING_DIR)
--with-popt=$(STAGING_DIR)
ifeq ($(BR2_PACKAGE_PCRE),y)
RPM_DEPENDENCIES += pcre
RPM_CONF_OPT += --with-pcre=external
else
RPM_CONF_OPT += --with-pcre=no
endif
ifeq ($(BR2_PACKAGE_FILE),y)
RPM_DEPENDENCIES += file
RPM_CONF_OPT += --with-file=external
else
RPM_CONF_OPT += --with-file=no
endif
ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
RPM_CONF_OPT+=--with-xz