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/libcurl | |
| 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/libcurl')
| -rw-r--r-- | package/libcurl/libcurl.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 74584a6d98..4af73b12db 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -19,7 +19,7 @@ LIBCURL_INSTALL_STAGING = YES # on non-MMU platforms. Moreover, this authentication method is # probably almost never used. See # http://curl.haxx.se/docs/manpage.html#--ntlm. -LIBCURL_CONF_OPT = --disable-verbose --disable-manual --disable-ntlm-wb \ +LIBCURL_CONF_OPTS = --disable-verbose --disable-manual --disable-ntlm-wb \ --enable-hidden-symbols --with-random=/dev/urandom LIBCURL_CONFIG_SCRIPTS = curl-config @@ -31,27 +31,27 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs # are found first. LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib -LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \ +LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs else ifeq ($(BR2_PACKAGE_GNUTLS),y) -LIBCURL_CONF_OPT += --with-gnutls=$(STAGING_DIR)/usr +LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr LIBCURL_DEPENDENCIES += gnutls else ifeq ($(BR2_PACKAGE_LIBNSS),y) -LIBCURL_CONF_OPT += --with-nss=$(STAGING_DIR)/usr +LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" LIBCURL_DEPENDENCIES += libnss else # polarssl support needs 1.3.x -LIBCURL_CONF_OPT += --without-ssl --without-gnutls \ +LIBCURL_CONF_OPTS += --without-ssl --without-gnutls \ --without-polarssl --without-nss endif # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 -LIBCURL_CONF_OPT += --with-libssh2 +LIBCURL_CONF_OPTS += --with-libssh2 else -LIBCURL_CONF_OPT += --without-libssh2 +LIBCURL_CONF_OPTS += --without-libssh2 endif define LIBCURL_FIX_DOT_PC |
