summaryrefslogtreecommitdiff
path: root/package/libglib2
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/libglib2
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
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/libglib2')
-rw-r--r--package/libglib2/libglib2.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 23c44e9bd..dfcf61032 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -61,7 +61,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_X
LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no
endif
-HOST_LIBGLIB2_CONF_OPT = \
+HOST_LIBGLIB2_CONF_OPTS = \
--disable-gtk-doc \
--enable-debug=no \
--disable-dtrace \
@@ -69,9 +69,9 @@ HOST_LIBGLIB2_CONF_OPT = \
--disable-gcov \
--disable-modular-tests
-LIBGLIB2_CONF_OPT += --disable-modular-tests
+LIBGLIB2_CONF_OPTS += --disable-modular-tests
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
- LIBGLIB2_CONF_OPT += --with-threads=none --disable-threads
+ LIBGLIB2_CONF_OPTS += --with-threads=none --disable-threads
endif
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext
@@ -83,15 +83,15 @@ LIBGLIB2_DEPENDENCIES += libiconv
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
-LIBGLIB2_CONF_OPT += --with-libiconv=gnu
+LIBGLIB2_CONF_OPTS += --with-libiconv=gnu
LIBGLIB2_DEPENDENCIES += libiconv
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
-LIBGLIB2_CONF_OPT += --with-pcre=system
+LIBGLIB2_CONF_OPTS += --with-pcre=system
LIBGLIB2_DEPENDENCIES += pcre
else
-LIBGLIB2_CONF_OPT += --with-pcre=internal
+LIBGLIB2_CONF_OPTS += --with-pcre=internal
endif
define LIBGLIB2_REMOVE_DEV_FILES