packages: indentation cleanup

This commit doesn't touch infra packages.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jerzy Grzegorek 2015-03-31 09:21:57 +02:00 committed by Thomas Petazzoni
parent 42bb259af5
commit bd8c733fb4
86 changed files with 861 additions and 806 deletions

View File

@ -44,9 +44,12 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
BIND_DEPENDENCIES += openssl BIND_DEPENDENCIES += openssl
BIND_CONF_ENV += ac_cv_func_EVP_sha256=yes \ BIND_CONF_ENV += \
ac_cv_func_EVP_sha384=yes ac_cv_func_EVP_sha512=yes ac_cv_func_EVP_sha256=yes \
BIND_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \ ac_cv_func_EVP_sha384=yes \
ac_cv_func_EVP_sha512=yes
BIND_CONF_OPTS += \
--with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
--with-ecdsa=yes --with-ecdsa=yes
# GOST cipher support requires openssl extra engines # GOST cipher support requires openssl extra engines
ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)

View File

@ -11,10 +11,17 @@ DBUS_CPP_INSTALL_STAGING = YES
# expat is required for the tools irrespective of dbus xml backend # expat is required for the tools irrespective of dbus xml backend
DBUS_CPP_DEPENDENCIES = host-dbus-cpp host-pkgconf dbus expat DBUS_CPP_DEPENDENCIES = host-dbus-cpp host-pkgconf dbus expat
HOST_DBUS_CPP_DEPENDENCIES = host-pkgconf host-dbus host-expat HOST_DBUS_CPP_DEPENDENCIES = host-pkgconf host-dbus host-expat
DBUS_CPP_CONF_OPTS = --disable-examples --disable-tests --disable-doxygen-docs \ DBUS_CPP_CONF_OPTS = \
--disable-examples \
--disable-tests \
--disable-doxygen-docs \
--with-build-libdbus-cxx=$(HOST_DBUS_CPP_BUILDDIR) --with-build-libdbus-cxx=$(HOST_DBUS_CPP_BUILDDIR)
HOST_DBUS_CPP_CONF_OPTS = --disable-examples --disable-tests \ HOST_DBUS_CPP_CONF_OPTS = \
--disable-doxygen-docs --disable-ecore --disable-glib --disable-examples \
--disable-tests \
--disable-doxygen-docs \
--disable-ecore \
--disable-glib
DBUS_CPP_AUTORECONF = YES DBUS_CPP_AUTORECONF = YES
DBUS_CPP_LICENSE = LGPLv2.1+ DBUS_CPP_LICENSE = LGPLv2.1+
DBUS_CPP_LICENSE_FILES = COPYING DBUS_CPP_LICENSE_FILES = COPYING

View File

@ -57,7 +57,8 @@ endif
# assume yes for these tests, configure will bail out otherwise # assume yes for these tests, configure will bail out otherwise
# saying error: cannot run test program while cross compiling # saying error: cannot run test program while cross compiling
GIT_CONF_ENV = ac_cv_fread_reads_directories=yes \ GIT_CONF_ENV = \
ac_cv_fread_reads_directories=yes \
ac_cv_snprintf_returns_bogus=yes LIBS='$(GIT_CONF_ENV_LIBS)' ac_cv_snprintf_returns_bogus=yes LIBS='$(GIT_CONF_ENV_LIBS)'
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -36,7 +36,8 @@ GNUTLS_CONF_OPTS += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/u
# gnutls needs libregex, but pcre can be used too # gnutls needs libregex, but pcre can be used too
# The check isn't cross-compile friendly # The check isn't cross-compile friendly
GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
GNUTLS_CONF_OPTS += --with-regex-header=pcreposix.h \ GNUTLS_CONF_OPTS += \
--with-regex-header=pcreposix.h \
--with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \ --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
--with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`" --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"

View File

@ -15,37 +15,67 @@ LIBGLIB2_INSTALL_STAGING = YES
LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
LIBGLIB2_CONF_ENV = \ LIBGLIB2_CONF_ENV = \
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_func_posix_getpwuid_r=yes \
glib_cv_uscore=no ac_cv_func_strtod=yes \ glib_cv_stack_grows=no \
ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \ glib_cv_uscore=no \
ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \ ac_cv_func_strtod=yes \
ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \ ac_fsusage_space=yes \
ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \ fu_cv_sys_stat_statfs2_bsize=yes \
ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \ ac_cv_func_closedir_void=no \
ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \ ac_cv_func_getloadavg=no \
ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \ ac_cv_lib_util_getloadavg=no \
ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \ ac_cv_lib_getloadavg_getloadavg=no \
vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \ ac_cv_func_getgroups=yes \
jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \ ac_cv_func_getgroups_works=yes \
ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \ ac_cv_func_chown_works=yes \
ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \ ac_cv_have_decl_euidaccess=no \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \ ac_cv_func_euidaccess=no \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \ ac_cv_have_decl_strnlen=yes \
ac_cv_func_strnlen_working=yes \
ac_cv_func_lstat_dereferences_slashed_symlink=yes \
ac_cv_func_lstat_empty_string_bug=no \
ac_cv_func_stat_empty_string_bug=no \
vb_cv_func_rename_trailing_slash_bug=no \
ac_cv_have_decl_nanosleep=yes \
jm_cv_func_nanosleep_works=yes \
gl_cv_func_working_utimes=yes \
ac_cv_func_utime_null=yes \
ac_cv_have_decl_strerror_r=yes \
ac_cv_func_strerror_r_char_p=no \
jm_cv_func_svid_putenv=yes \
ac_cv_func_getcwd_null=yes \
ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \ utils_cv_func_mkdir_trailing_slash_bug=no \
jm_cv_func_gettimeofday_clobber=no \ jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \ gl_cv_func_working_readdir=yes \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \ jm_ac_cv_func_link_follows_symlink=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \ utils_cv_localtime_cache=no \
gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \ ac_cv_struct_st_mtim_nsec=no \
am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \ gl_cv_func_tzset_clobber=no \
gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \ gl_cv_func_getcwd_null=yes \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \ gl_cv_func_getcwd_path_max=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_func_fnmatch_gnu=yes \
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \ am_getline_needs_run_time_check=no \
ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \ am_cv_func_working_getline=yes \
ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \ gl_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_newlocale=no ac_cv_func_uselocale=no \ gl_cv_func_mkstemp_limitations=no \
ac_cv_func_strtod_l=no ac_cv_func_strtoll_l=no ac_cv_func_strtoull_l=no \ ac_cv_func_working_mktime=yes \
jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no \
gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal \
ac_cv_prog_F77=no \
ac_cv_func_posix_getgrgid_r=no \
glib_cv_long_long_format=ll \
ac_cv_func_printf_unix98=yes \
ac_cv_func_vsnprintf_c99=yes \
ac_cv_func_newlocale=no \
ac_cv_func_uselocale=no \
ac_cv_func_strtod_l=no \
ac_cv_func_strtoll_l=no \
ac_cv_func_strtoull_l=no \
gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
# old uClibc versions don't provide qsort_r # old uClibc versions don't provide qsort_r

View File

@ -174,7 +174,8 @@ define HOST_NCURSES_BUILD_CMDS
endef endef
HOST_NCURSES_CONF_OPTS = \ HOST_NCURSES_CONF_OPTS = \
--with-shared --without-gpm \ --with-shared \
--without-gpm \
--without-manpages \ --without-manpages \
--without-cxx \ --without-cxx \
--without-cxx-binding \ --without-cxx-binding \

View File

@ -18,7 +18,8 @@ NETATALK_LICENSE_FILES = COPYING COPYRIGHT
# Don't run ldconfig! # Don't run ldconfig!
NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \
ac_cv_path_NETA_LDCONFIG="" ac_cv_path_NETA_LDCONFIG=""
NETATALK_CONF_OPTS += --with-cnid-cdb-backend \ NETATALK_CONF_OPTS += \
--with-cnid-cdb-backend \
--with-bdb=$(STAGING_DIR)/usr \ --with-bdb=$(STAGING_DIR)/usr \
--with-ssl-dir=$(STAGING_DIR)/usr \ --with-ssl-dir=$(STAGING_DIR)/usr \
--with-libgcrypt-dir=$(STAGING_DIR)/usr \ --with-libgcrypt-dir=$(STAGING_DIR)/usr \

View File

@ -10,14 +10,18 @@ OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_DEPENDENCIES = host-pkgconf
OPENVPN_LICENSE = GPLv2 OPENVPN_LICENSE = GPLv2
OPENVPN_LICENSE_FILES = COPYRIGHT.GPL OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
OPENVPN_CONF_OPTS = --disable-plugin-auth-pam --enable-iproute2 \ OPENVPN_CONF_OPTS = \
--disable-plugin-auth-pam \
--enable-iproute2 \
$(if $(BR2_STATIC_LIBS),--disable-plugins) $(if $(BR2_STATIC_LIBS),--disable-plugins)
OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
NETSTAT=/bin/netstat \ NETSTAT=/bin/netstat \
ROUTE=/sbin/route ROUTE=/sbin/route
ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y) ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y)
OPENVPN_CONF_OPTS += --enable-small --disable-plugins \ OPENVPN_CONF_OPTS += \
--enable-small \
--disable-plugins \
--disable-eurephia --disable-eurephia
endif endif

View File

@ -78,7 +78,8 @@ PANGO_DEPENDENCIES = \
freetype freetype
ifeq ($(BR2_PACKAGE_XORG7),y) ifeq ($(BR2_PACKAGE_XORG7),y)
PANGO_CONF_OPTS += --x-includes=$(STAGING_DIR)/usr/include/X11 \ PANGO_CONF_OPTS += \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --x-libraries=$(STAGING_DIR)/usr/lib
PANGO_DEPENDENCIES += xlib_libX11 PANGO_DEPENDENCIES += xlib_libX11
endif endif

View File

@ -102,7 +102,8 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y)
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y) ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
PHP_CONF_OPTS += --with-xmlrpc \ PHP_CONF_OPTS += \
--with-xmlrpc \
$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr) $(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)
PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
endif endif
@ -225,7 +226,9 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y)
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y) ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y)
PHP_CONF_OPTS += --with-gd --with-jpeg-dir=$(STAGING_DIR)/usr \ PHP_CONF_OPTS += \
--with-gd \
--with-jpeg-dir=$(STAGING_DIR)/usr \
--with-png-dir=$(STAGING_DIR)/usr \ --with-png-dir=$(STAGING_DIR)/usr \
--with-zlib-dir=$(STAGING_DIR)/usr \ --with-zlib-dir=$(STAGING_DIR)/usr \
--with-freetype-dir=$(STAGING_DIR)/usr --with-freetype-dir=$(STAGING_DIR)/usr

View File

@ -14,7 +14,8 @@ HOST_RUBY_DEPENDENCIES = host-pkgconf
RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
RUBY_MAKE = $(MAKE1) RUBY_MAKE = $(MAKE1)
RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems
HOST_RUBY_CONF_OPTS = --disable-install-doc \ HOST_RUBY_CONF_OPTS = \
--disable-install-doc \
--with-out-ext=curses,openssl,readline \ --with-out-ext=curses,openssl,readline \
--without-gmp --without-gmp
RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others

View File

@ -58,7 +58,8 @@ endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql SCONESERVER_DEPENDENCIES += mysql
SCONESERVER_CONF_OPTS += --with-mysql \ SCONESERVER_CONF_OPTS += \
--with-mysql \
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \ --with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql" LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
else else

View File

@ -17,7 +17,8 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
endif endif
ifeq ($(BR2_PACKAGE_GNUTLS),y) ifeq ($(BR2_PACKAGE_GNUTLS),y)
WGET_CONF_OPTS += --with-ssl=gnutls \ WGET_CONF_OPTS += \
--with-ssl=gnutls \
--with-libgnutls-prefix=$(STAGING_DIR) --with-libgnutls-prefix=$(STAGING_DIR)
WGET_DEPENDENCIES += gnutls WGET_DEPENDENCIES += gnutls
endif endif