diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:44 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:54:16 +0200 |
| commit | aaffd209fae91a733fe0becb72268f87bf4ea369 (patch) | |
| tree | 40569895ef8a09c605060e2164d86567a12f9889 /package/util-linux | |
| parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff) | |
| download | buildroot-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/util-linux')
| -rw-r--r-- | package/util-linux/util-linux.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4f822d7fbf..ebbab615e8 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -18,7 +18,7 @@ UTIL_LINUX_AUTORECONF = YES UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no -UTIL_LINUX_CONF_OPT += \ +UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown \ --disable-bash-completion \ @@ -28,7 +28,7 @@ UTIL_LINUX_CONF_OPT += \ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency -HOST_UTIL_LINUX_CONF_OPT = --without-python +HOST_UTIL_LINUX_CONF_OPTS = --without-python # If both util-linux and busybox are selected, make certain util-linux # wins the fight over who gets to have their utils actually installed @@ -39,7 +39,7 @@ endif ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses else -UTIL_LINUX_CONF_OPT += --without-ncurses +UTIL_LINUX_CONF_OPTS += --without-ncurses endif ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) @@ -58,7 +58,7 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) # Disable/Enable utilities -UTIL_LINUX_CONF_OPT += \ +UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ $(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch,--disable-arch) \ $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ @@ -92,7 +92,7 @@ UTIL_LINUX_CONF_OPT += \ # In the host version of util-linux, we so far only require libuuid, # and none of the util-linux utilities, so we disable all of them. -HOST_UTIL_LINUX_CONF_OPT += \ +HOST_UTIL_LINUX_CONF_OPTS += \ --enable-libuuid \ --disable-libblkid --disable-libmount \ --disable-all-programs --without-ncurses |
