summaryrefslogtreecommitdiffstats
path: root/package/rpm
diff options
context:
space:
mode:
authorThomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:44 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:54:16 +0200
commitaaffd209fae91a733fe0becb72268f87bf4ea369 (patch)
tree40569895ef8a09c605060e2164d86567a12f9889 /package/rpm
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
downloadbuildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.gz
buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.zip
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/rpm')
-rw-r--r--package/rpm/rpm.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index a76978cccf..af1642fb87 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -14,7 +14,7 @@ RPM_LICENSE_FILES = COPYING.LIB
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
-RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
+RPM_CONF_OPTS = --disable-build-versionscript --disable-rpath \
--without-selinux \
--without-python --without-perl \
--with-openssl=external \
@@ -24,24 +24,24 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
ifeq ($(BR2_PACKAGE_PCRE),y)
RPM_DEPENDENCIES += pcre
-RPM_CONF_OPT += --with-pcre=external
+RPM_CONF_OPTS += --with-pcre=external
else
-RPM_CONF_OPT += --with-pcre=no
+RPM_CONF_OPTS += --with-pcre=no
endif
ifeq ($(BR2_PACKAGE_FILE),y)
RPM_DEPENDENCIES += file
-RPM_CONF_OPT += --with-file=external
+RPM_CONF_OPTS += --with-file=external
else
-RPM_CONF_OPT += --with-file=no
+RPM_CONF_OPTS += --with-file=no
endif
ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
-RPM_CONF_OPT += --with-xz
+RPM_CONF_OPTS += --with-xz
endif
ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
-RPM_CONF_OPT += --with-bzip2
+RPM_CONF_OPTS += --with-bzip2
RPM_DEPENDENCIES += bzip2
endif
OpenPOWER on IntegriCloud