mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-29 13:31:43 -09:00
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>
This commit is contained in:
committed by
Thomas Petazzoni
parent
1d2574ac6f
commit
aaffd209fa
@@ -13,46 +13,46 @@ LIBVNCSERVER_INSTALL_STAGING = YES
|
||||
LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
|
||||
|
||||
# only used for examples
|
||||
LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false
|
||||
LIBVNCSERVER_CONF_OPTS += --with-sdl-config=/bin/false
|
||||
|
||||
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
LIBVNCSERVER_CONF_OPT += --without-pthread
|
||||
LIBVNCSERVER_CONF_OPTS += --without-pthread
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_INET_IPV6),y)
|
||||
LIBVNCSERVER_CONF_OPT += --without-ipv6
|
||||
LIBVNCSERVER_CONF_OPTS += --without-ipv6
|
||||
endif
|
||||
|
||||
# openssl supports needs pthread
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
LIBVNCSERVER_DEPENDENCIES += openssl
|
||||
else
|
||||
LIBVNCSERVER_CONF_OPT += --without-crypto --without-ssl
|
||||
LIBVNCSERVER_CONF_OPTS += --without-crypto --without-ssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
LIBVNCSERVER_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
|
||||
LIBVNCSERVER_DEPENDENCIES += libgcrypt
|
||||
else
|
||||
LIBVNCSERVER_CONF_OPT += --without-gcrypt
|
||||
LIBVNCSERVER_CONF_OPTS += --without-gcrypt
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
|
||||
LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf
|
||||
else
|
||||
LIBVNCSERVER_CONF_OPT += --without-gnutls
|
||||
LIBVNCSERVER_CONF_OPTS += --without-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
LIBVNCSERVER_DEPENDENCIES += jpeg
|
||||
else
|
||||
LIBVNCSERVER_CONF_OPT += --without-jpeg
|
||||
LIBVNCSERVER_CONF_OPTS += --without-jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LIBVNCSERVER_DEPENDENCIES += zlib
|
||||
else
|
||||
LIBVNCSERVER_CONF_OPT += --without-zlib
|
||||
LIBVNCSERVER_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user