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/gnutls | |
| parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (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/gnutls')
| -rw-r--r-- | package/gnutls/gnutls.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 0e1076b1c..15f85e572 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -15,7 +15,7 @@ GNUTLS_DEPENDENCIES = host-pkgconf nettle pcre \ $(if $(BR2_PACKAGE_LIBIDN),libidn) \ $(if $(BR2_PACKAGE_LIBTASN1),libtasn1) \ $(if $(BR2_PACKAGE_ZLIB),zlib) -GNUTLS_CONF_OPT = \ +GNUTLS_CONF_OPTS = \ --with-libnettle-prefix=$(STAGING_DIR)/usr \ --disable-rpath \ --disable-doc \ @@ -29,26 +29,26 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \ GNUTLS_INSTALL_STAGING = YES # libpthread and libz autodetection poison the linkpath -GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) -GNUTLS_CONF_OPT += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr) +GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) +GNUTLS_CONF_OPTS += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr) # gnutls needs libregex, but pcre can be used too # The check isn't cross-compile friendly GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes -GNUTLS_CONF_OPT += --with-regex-header=pcreposix.h \ +GNUTLS_CONF_OPTS += --with-regex-header=pcreposix.h \ --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \ --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`" # Consider crywrap as part of tools because it needs WCHAR, and it's so too ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),) - GNUTLS_CONF_OPT += --disable-crywrap + GNUTLS_CONF_OPTS += --disable-crywrap endif # libidn support for nommu must exclude the crywrap wrapper (uses fork) -GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap) +GNUTLS_CONF_OPTS += $(if $(BR2_USE_MMU),,--disable-crywrap) ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) - GNUTLS_CONF_OPT += --enable-cryptodev + GNUTLS_CONF_OPTS += --enable-cryptodev GNUTLS_DEPENDENCIES += cryptodev-linux endif |