* [Buildroot] [git commit] package: indentation cleanup
@ 2015-06-22 21:05 Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2015-06-22 21:05 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d98eed3222c928914e6d10a4ac62bc107c2dc5e9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/libvips/Config.in | 4 ++--
package/openjpeg/Config.in | 2 +-
package/openvmtools/Config.in | 2 +-
package/qt-webkit-kiosk/Config.in | 6 +++---
package/qt/qt.mk | 2 +-
package/setools/Config.in | 2 +-
package/uclibc/Config.in | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/package/libvips/Config.in b/package/libvips/Config.in
index ad7a103..87ada51 100644
--- a/package/libvips/Config.in
+++ b/package/libvips/Config.in
@@ -17,6 +17,6 @@ config BR2_PACKAGE_LIBVIPS
http://www.vips.ecs.soton.ac.uk/
comment "libvips needs a toolchain w/ wchar, threads, C++"
- depends on BR2_USE_MMU
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_INSTALL_LIBSTDCPP
diff --git a/package/openjpeg/Config.in b/package/openjpeg/Config.in
index 005d298..738999f 100644
--- a/package/openjpeg/Config.in
+++ b/package/openjpeg/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_OPENJPEG
The OpenJPEG library is an open-source JPEG 2000 codec
written in C.
- http://www.openjpeg.org
+ http://www.openjpeg.org
diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in
index ebad876..8e22eff 100644
--- a/package/openvmtools/Config.in
+++ b/package/openvmtools/Config.in
@@ -48,4 +48,4 @@ comment "openvmtools needs a toolchain w/ wchar, threads, RPC, locale"
depends on BR2_i386 || BR2_x86_64
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE
+ !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE
diff --git a/package/qt-webkit-kiosk/Config.in b/package/qt-webkit-kiosk/Config.in
index 075258e..51383f0 100644
--- a/package/qt-webkit-kiosk/Config.in
+++ b/package/qt-webkit-kiosk/Config.in
@@ -16,8 +16,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
if BR2_PACKAGE_QT_WEBKIT_KIOSK
config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS
- bool "Install browser sound files"
- help
- Deploy browser sound files on target
+ bool "Install browser sound files"
+ help
+ Deploy browser sound files on target
endif
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index a7bbe5f..02b6db7 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -227,7 +227,7 @@ endif
ifeq ($(BR2_PACKAGE_QT_X11),y)
QT_DEPENDENCIES += fontconfig xlib_libXi xlib_libX11 xlib_libXrender \
- xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv
+ xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv
# Using pkg-config avoids us some logic to redefine and sed again mkspecs files
# to add X11 include path and link options
QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags x11)
diff --git a/package/setools/Config.in b/package/setools/Config.in
index 57397a5..7c85af6 100644
--- a/package/setools/Config.in
+++ b/package/setools/Config.in
@@ -18,7 +18,7 @@ config BR2_PACKAGE_SETOOLS
checks on an SELinux policy.
* sediff - semantic policy difference tool for SELinux.
* secmds - command-line tools to analyze and search SELinux
- policy.
+ policy.
comment "setools needs a toolchain w/ threads, C++, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index f69cc25..2616f5b 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -8,13 +8,13 @@ config BR2_PACKAGE_UCLIBC
comment "uClibc Options"
config BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS
- bool
+ bool
config BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD
- bool
+ bool
config BR2_UCLIBC_VERSION_SUPPORTS_NPTL
- bool
+ bool
choice
prompt "uClibc C library Version"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2015-06-18 21:41 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2015-06-18 21:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c2c993c31dbeb2774d7c1eabeadf787831d38cf6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/ejabberd/ejabberd.mk | 2 +-
package/libxmlrpc/libxmlrpc.mk | 2 +-
package/odhcp6c/odhcp6c.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
index 07ce78e..650dc0e 100644
--- a/package/ejabberd/ejabberd.mk
+++ b/package/ejabberd/ejabberd.mk
@@ -40,7 +40,7 @@ endef
EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_FIX_EJABBERDCTL
define EJABBERD_USERS
-ejabberd -1 ejabberd -1 * /var/lib/ejabberd /bin/sh - ejabberd daemon
+ ejabberd -1 ejabberd -1 * /var/lib/ejabberd /bin/sh - ejabberd daemon
endef
define EJABBERD_INSTALL_INIT_SYSV
diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
index c3788d6..7d11205 100644
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1)
# Using autoconf, not automake, so we cannot use AUTORECONF = YES.
define LIBXMLRPC_RUN_AUTOCONF
- cd $(@D); $(HOST_DIR)/usr/bin/autoconf
+ cd $(@D); $(HOST_DIR)/usr/bin/autoconf
endef
LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
diff --git a/package/odhcp6c/odhcp6c.mk b/package/odhcp6c/odhcp6c.mk
index 8102c26..47944f1 100644
--- a/package/odhcp6c/odhcp6c.mk
+++ b/package/odhcp6c/odhcp6c.mk
@@ -10,7 +10,7 @@ ODHCP6C_LICENSE = GPLv2
ODHCP6C_LICENSE_FILES = COPYING
define ODHCP6C_INSTALL_SCRIPT
- $(INSTALL) -m 0755 -D $(@D)/odhcp6c-example-script.sh \
+ $(INSTALL) -m 0755 -D $(@D)/odhcp6c-example-script.sh \
$(TARGET_DIR)/usr/sbin/odhcp6c-update
endef
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2015-01-15 8:41 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2015-01-15 8:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0db263726f96047a052831050d00fdb089f2a20f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/alsa-lib/alsa-lib.mk | 14 ++++++++------
package/bcusdk/bcusdk.mk | 13 +++++++++----
package/enlightenment/enlightenment.mk | 7 ++++---
package/fluxbox/fluxbox.mk | 5 +++--
package/giblib/giblib.mk | 5 +++--
package/jimtcl/jimtcl.mk | 7 ++++---
package/libgtk3/libgtk3.mk | 8 +++++---
package/libnspr/libnspr.mk | 5 +++--
package/linknx/linknx.mk | 8 ++++++--
package/schifra/schifra.mk | 5 +++--
package/socat/socat.mk | 9 +++++----
package/speex/speex.mk | 7 ++++---
package/strace/strace.mk | 5 +++--
package/uclibc/uclibc.mk | 5 +++--
package/x11r7/xapp_xconsole/xapp_xconsole.mk | 5 +++--
package/x11r7/xapp_xdm/xapp_xdm.mk | 5 +++--
package/x11r7/xapp_xlogo/xapp_xlogo.mk | 5 +++--
package/xerces/xerces.mk | 5 +++--
18 files changed, 75 insertions(+), 48 deletions(-)
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 2890a38..16d184e 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -12,10 +12,11 @@ ALSA_LIB_LICENSE_FILES = COPYING
ALSA_LIB_INSTALL_STAGING = YES
ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
ALSA_LIB_AUTORECONF = YES
-ALSA_LIB_CONF_OPTS = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
- --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
- --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
- --without-versioned
+ALSA_LIB_CONF_OPTS = \
+ --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
+ --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
+ --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
+ --without-versioned
# Can't build with static & shared at the same time (1.0.25+)
ifeq ($(BR2_STATIC_LIBS),y)
@@ -73,7 +74,8 @@ ifeq ($(BR2_bfin),y)
ALSA_LIB_CFLAGS += -Dversionsort=alphasort
endif
-ALSA_LIB_CONF_ENV = CFLAGS="$(ALSA_LIB_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS) -lm"
+ALSA_LIB_CONF_ENV = \
+ CFLAGS="$(ALSA_LIB_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS) -lm"
$(eval $(autotools-package))
diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
index bbf988d..80c98af 100644
--- a/package/bcusdk/bcusdk.mk
+++ b/package/bcusdk/bcusdk.mk
@@ -10,10 +10,15 @@ BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib
BCUSDK_LICENSE = GPLv2+
BCUSDK_LICENSE_FILES = COPYING
BCUSDK_INSTALL_STAGING = YES
-BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
- --enable-eibnetip --enable-eibnetipserver \
- --enable-eibnetiptunnel --without-pth-test \
- --with-pth=$(STAGING_DIR)/usr
+BCUSDK_CONF_OPTS = \
+ --enable-onlyeibd \
+ --enable-ft12 \
+ --enable-pei16 \
+ --enable-eibnetip \
+ --enable-eibnetipserver \
+ --enable-eibnetiptunnel \
+ --without-pth-test \
+ --with-pth=$(STAGING_DIR)/usr
BCUSDK_DEPENDENCIES = libpthsem
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index a1ca4da..ddebe06 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -24,9 +24,10 @@ ENLIGHTENMENT_DEPENDENCIES = \
host-libeet \
xcb-util-keysyms
-ENLIGHTENMENT_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
- --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
- --disable-rpath
+ENLIGHTENMENT_CONF_OPTS = \
+ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+ --disable-rpath
# uClibc has an old incomplete sys/ptrace.h for powerpc & sparc
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_powerpc)$(BR2_sparc),yy)
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 0340465..30255c4 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -10,8 +10,9 @@ FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBO
FLUXBOX_LICENSE = MIT
FLUXBOX_LICENSE_FILES = COPYING
-FLUXBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib
+FLUXBOX_CONF_OPTS = \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib
FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 8d11426..b0a9620 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -9,8 +9,9 @@ GIBLIB_SITE = http://linuxbrit.co.uk/downloads
GIBLIB_INSTALL_STAGING = YES
GIBLIB_DEPENDENCIES = imlib2
GIBLIB_AUTORECONF = YES
-GIBLIB_CONF_OPTS = --with-imlib2-prefix=$(STAGING_DIR)/usr \
- --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
+GIBLIB_CONF_OPTS = \
+ --with-imlib2-prefix=$(STAGING_DIR)/usr \
+ --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
GIBLIB_CONFIG_SCRIPTS = giblib-config
GIBLIB_LICENSE = MIT
GIBLIB_LICENSE_FILES = COPYING
diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk
index d573276..75c0382 100644
--- a/package/jimtcl/jimtcl.mk
+++ b/package/jimtcl/jimtcl.mk
@@ -32,9 +32,10 @@ JIMTCL_INSTALL_LIB =
else
JIMTCL_SHARED = --shared
JIMTCL_LIB = so.$(JIMTCL_VERSION)
-JIMTCL_INSTALL_LIB = $(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) \
- $(TARGET_DIR)/usr/lib/libjim.$(JIMTCL_LIB); \
- ln -s libjim.$(JIMTCL_LIB) $(TARGET_DIR)/usr/lib/libjim.so
+JIMTCL_INSTALL_LIB = \
+ $(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) \
+ $(TARGET_DIR)/usr/lib/libjim.$(JIMTCL_LIB); \
+ ln -s libjim.$(JIMTCL_LIB) $(TARGET_DIR)/usr/lib/libjim.so
endif
define JIMTCL_CONFIGURE_CMDS
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index b406c09..07c669d 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -18,7 +18,8 @@ LIBGTK3_CONF_ENV = \
ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/usr/bin/pkgconf
-LIBGTK3_CONF_OPTS = --disable-glibtest \
+LIBGTK3_CONF_OPTS = \
+ --disable-glibtest \
--enable-explicit-deps=no \
--enable-gtk2-dependency \
--disable-introspection
@@ -147,8 +148,9 @@ HOST_LIBGTK3_DEPENDENCIES = \
host-gdk-pixbuf \
host-pkgconf
-HOST_LIBGTK3_CFLAGS = $(shell $(HOST_DIR)/usr/bin/pkgconf \
- --cflags --libs gdk-pixbuf-2.0)
+HOST_LIBGTK3_CFLAGS = \
+ $(shell $(HOST_DIR)/usr/bin/pkgconf \
+ --cflags --libs gdk-pixbuf-2.0)
define HOST_LIBGTK3_CONFIGURE_CMDS
echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 702978c..c4f86cc 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -14,8 +14,9 @@ LIBNSPR_LICENSE = MPLv2.0
LIBNSPR_LICENSE_FILES = nspr/LICENSE
# Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly
-LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
- HOST_LDFLAGS="-lc"
+LIBNSPR_CONF_ENV = \
+ HOST_CFLAGS="-g -O2" \
+ HOST_LDFLAGS="-lc"
# NSPR mixes up --build and --host
LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
index f117b9c..a7e6adb 100644
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@@ -8,8 +8,12 @@ LINKNX_VERSION = 0.0.1.32
LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
LINKNX_LICENSE = GPLv2+
LINKNX_INSTALL_STAGING = YES
-LINKNX_CONF_OPTS = --without-lua --without-log4cpp --without-pth-test \
- --with-pth=$(STAGING_DIR)/usr --disable-smtp
+LINKNX_CONF_OPTS = \
+ --without-lua \
+ --without-log4cpp \
+ --without-pth-test \
+ --with-pth=$(STAGING_DIR)/usr \
+ --disable-smtp
LINKNX_DEPENDENCIES = libpthsem
diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
index e55bf02..661ef04 100644
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -11,8 +11,9 @@ SCHIFRA_INSTALL_STAGING = YES
SCHIFRA_LICENSE = schifra license
SCHIFRA_LICENSE_FILES = schifra_license.txt
-SCHIFRA_MAKE_OPTS = COMPILER="$(TARGET_CXX)" \
- OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)"
+SCHIFRA_MAKE_OPTS = \
+ COMPILER="$(TARGET_CXX)" \
+ OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)"
# The examples are the only buildable artefacts.
ifeq ($(BR2_PACKAGE_SCHIFRA_EXAMPLES),y)
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 711e20e..bae4b4c 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -9,10 +9,11 @@ SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
SOCAT_SITE = http://www.dest-unreach.org/socat/download
SOCAT_LICENSE = GPLv2
SOCAT_LICENSE_FILES = COPYING
-SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
- sc_cv_sys_crdly_shift=9 \
- sc_cv_sys_tabdly_shift=11 \
- sc_cv_sys_csize_shift=4
+SOCAT_CONF_ENV = \
+ sc_cv_termios_ispeed=no \
+ sc_cv_sys_crdly_shift=9 \
+ sc_cv_sys_tabdly_shift=11 \
+ sc_cv_sys_csize_shift=4
# We need to run autoconf to regenerate the configure script, in order
# to ensure that the test checking linux/ext2_fs.h works
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index 0bf2de0..595ae16 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -11,9 +11,10 @@ SPEEX_LICENSE_FILES = COPYING
SPEEX_INSTALL_STAGING = YES
SPEEX_DEPENDENCIES = libogg
-SPEEX_CONF_OPTS = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
- --with-ogg-includes=$(STAGING_DIR)/usr/include \
- --enable-fixed-point
+SPEEX_CONF_OPTS = \
+ --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
+ --with-ogg-includes=$(STAGING_DIR)/usr/include \
+ --enable-fixed-point
ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y)
SPEEX_CONF_OPTS += --enable-arm4-asm
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 2ac3b17..e1299aa 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -10,8 +10,9 @@ STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VE
STRACE_LICENSE = BSD-3c
STRACE_LICENSE_FILES = COPYING
-STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
- ac_cv_header_linux_netlink_h=yes
+STRACE_CONF_ENV = \
+ ac_cv_header_linux_if_packet_h=yes \
+ ac_cv_header_linux_netlink_h=yes
define STRACE_REMOVE_STRACE_GRAPH
rm -f $(TARGET_DIR)/usr/bin/strace-graph
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index d3b11f6..8654926 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -54,8 +54,9 @@ ifeq ($(UCLIBC_GENERATE_LOCALES),)
UCLIBC_LOCALES = en_US
else
# Strip out the encoding part of locale names, if any
-UCLIBC_LOCALES = $(foreach locale,$(UCLIBC_GENERATE_LOCALES),\
- $(firstword $(subst .,$(space),$(locale))))
+UCLIBC_LOCALES = \
+ $(foreach locale,$(UCLIBC_GENERATE_LOCALES),\
+ $(firstword $(subst .,$(space),$(locale))))
endif
#
diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/package/x11r7/xapp_xconsole/xapp_xconsole.mk
index b04b737..971b1b3 100644
--- a/package/x11r7/xapp_xconsole/xapp_xconsole.mk
+++ b/package/x11r7/xapp_xconsole/xapp_xconsole.mk
@@ -9,7 +9,8 @@ XAPP_XCONSOLE_SOURCE = xconsole-$(XAPP_XCONSOLE_VERSION).tar.bz2
XAPP_XCONSOLE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCONSOLE_LICENSE = MIT
XAPP_XCONSOLE_LICENSE_FILES = COPYING
-XAPP_XCONSOLE_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXt xproto_xproto \
- xlib_libXmu
+XAPP_XCONSOLE_DEPENDENCIES = \
+ xlib_libX11 xlib_libXaw xlib_libXt xproto_xproto \
+ xlib_libXmu
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 955dc1c..8f846a8 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -11,8 +11,9 @@ XAPP_XDM_LICENSE = MIT
XAPP_XDM_LICENSE_FILES = COPYING
XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
-XAPP_XDM_CONF_OPTS = --with-utmp-file=/var/adm/utmpx \
- --with-wtmp-file=/var/adm/wtmpx
+XAPP_XDM_CONF_OPTS = \
+ --with-utmp-file=/var/adm/utmpx \
+ --with-wtmp-file=/var/adm/wtmpx
define XAPP_XDM_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index af5b222..380acfc 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -9,7 +9,8 @@ XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLOGO_LICENSE = MIT
XAPP_XLOGO_LICENSE_FILES = COPYING
-XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXrender \
- xlib_libXft host-pkgconf
+XAPP_XLOGO_DEPENDENCIES = \
+ xlib_libXaw xlib_libXrender \
+ xlib_libXft host-pkgconf
$(eval $(autotools-package))
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 9b2bb81..59b8d8a 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -11,8 +11,9 @@ XERCES_LICENSE = Apache-2.0
XERCES_LICENSE_FILES = LICENSE
XERCES_MAKE = $(MAKE1)
XERCES_INSTALL_STAGING = YES
-XERCES_CONF_OPTS = --disable-threads \
- --with-gnu-ld
+XERCES_CONF_OPTS = \
+ --disable-threads \
+ --with-gnu-ld
ifeq ($(BR2_PACKAGE_LIBICONV),y)
XERCES_CONF_ENV += LIBS=-liconv
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-12-30 10:17 Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2014-12-30 10:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=27dd32942e1ee2cdb7a15693fc9dfb2e7fd93e10
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/Makefile.in | 133 ++++++++++++++--------------
package/alsamixergui/alsamixergui.mk | 7 +-
package/atk/atk.mk | 81 +++++++++++------
package/autoconf/autoconf.mk | 6 +-
package/avahi/avahi.mk | 117 +++++++++++++------------
package/bind/bind.mk | 11 ++-
package/cairo/cairo.mk | 76 +++++++++++-----
package/collectd/collectd.mk | 24 +++--
package/dbus-glib/dbus-glib.mk | 7 +-
package/dropbear/dropbear.mk | 5 +-
package/efl/libedje/libedje.mk | 5 +-
package/efl/libelementary/libelementary.mk | 10 ++-
package/efl/libevas/libevas.mk | 10 ++-
package/findutils/findutils.mk | 7 +-
package/gutenprint/gutenprint.mk | 56 ++++++------
package/libenca/libenca.mk | 9 +-
package/libgtk2/libgtk2.mk | 110 ++++++++++++-----------
package/libnss/libnss.mk | 29 +++---
package/libpcap/libpcap.mk | 7 +-
package/libraw/libraw.mk | 9 ++-
package/libungif/libungif.mk | 11 ++-
package/linux-firmware/linux-firmware.mk | 36 +++++---
package/open2300/open2300.mk | 5 +-
package/openpgm/openpgm.mk | 6 +-
package/openpowerlink/openpowerlink.mk | 7 +-
package/pango/pango.mk | 81 +++++++++++------
package/pppd/pppd.mk | 10 ++-
package/python-pycrypto/python-pycrypto.mk | 5 +-
package/rpm/rpm.mk | 12 ++-
package/sdl/sdl.mk | 29 ++++---
package/synergy/synergy.mk | 10 ++-
package/tzdata/tzdata.mk | 5 +-
package/urg/urg.mk | 5 +-
package/vim/vim.mk | 22 +++--
package/wireshark/wireshark.mk | 16 +++-
package/x11r7/xapp_xman/xapp_xman.mk | 9 +-
36 files changed, 570 insertions(+), 418 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index a63a2e8..2055f00 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -246,75 +246,78 @@ export PERL=$(shell which perl)
# finds this perl module by exporting the proper value for PERL5LIB.
export PERL5LIB=$(HOST_DIR)/usr/lib/perl
-TARGET_CONFIGURE_OPTS = PATH=$(BR_PATH) \
- AR="$(TARGET_AR)" \
- AS="$(TARGET_AS)" \
- LD="$(TARGET_LD)" \
- NM="$(TARGET_NM)" \
- CC="$(TARGET_CC)" \
- GCC="$(TARGET_CC)" \
- CPP="$(TARGET_CPP)" \
- CXX="$(TARGET_CXX)" \
- FC="$(TARGET_FC)" \
- RANLIB="$(TARGET_RANLIB)" \
- READELF="$(TARGET_READELF)" \
- STRIP="$(TARGET_STRIP)" \
- OBJCOPY="$(TARGET_OBJCOPY)" \
- OBJDUMP="$(TARGET_OBJDUMP)" \
- AR_FOR_BUILD="$(HOSTAR)" \
- AS_FOR_BUILD="$(HOSTAS)" \
- CC_FOR_BUILD="$(HOSTCC)" \
- GCC_FOR_BUILD="$(HOSTCC)" \
- CXX_FOR_BUILD="$(HOSTCXX)" \
- FC_FOR_BUILD="$(HOSTFC)" \
- LD_FOR_BUILD="$(HOSTLD)" \
- CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
- CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
- CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
- LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
- FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
- DEFAULT_ASSEMBLER="$(TARGET_AS)" \
- DEFAULT_LINKER="$(TARGET_LD)" \
- CPPFLAGS="$(TARGET_CPPFLAGS)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- CXXFLAGS="$(TARGET_CXXFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- FCFLAGS="$(TARGET_FCFLAGS)" \
- PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
- STAGING_DIR="$(STAGING_DIR)" \
- INTLTOOL_PERL=$(PERL)
+TARGET_CONFIGURE_OPTS = \
+ PATH=$(BR_PATH) \
+ AR="$(TARGET_AR)" \
+ AS="$(TARGET_AS)" \
+ LD="$(TARGET_LD)" \
+ NM="$(TARGET_NM)" \
+ CC="$(TARGET_CC)" \
+ GCC="$(TARGET_CC)" \
+ CPP="$(TARGET_CPP)" \
+ CXX="$(TARGET_CXX)" \
+ FC="$(TARGET_FC)" \
+ RANLIB="$(TARGET_RANLIB)" \
+ READELF="$(TARGET_READELF)" \
+ STRIP="$(TARGET_STRIP)" \
+ OBJCOPY="$(TARGET_OBJCOPY)" \
+ OBJDUMP="$(TARGET_OBJDUMP)" \
+ AR_FOR_BUILD="$(HOSTAR)" \
+ AS_FOR_BUILD="$(HOSTAS)" \
+ CC_FOR_BUILD="$(HOSTCC)" \
+ GCC_FOR_BUILD="$(HOSTCC)" \
+ CXX_FOR_BUILD="$(HOSTCXX)" \
+ FC_FOR_BUILD="$(HOSTFC)" \
+ LD_FOR_BUILD="$(HOSTLD)" \
+ CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
+ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+ CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
+ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
+ FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
+ DEFAULT_ASSEMBLER="$(TARGET_AS)" \
+ DEFAULT_LINKER="$(TARGET_LD)" \
+ CPPFLAGS="$(TARGET_CPPFLAGS)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ FCFLAGS="$(TARGET_FCFLAGS)" \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ STAGING_DIR="$(STAGING_DIR)" \
+ INTLTOOL_PERL=$(PERL)
TARGET_MAKE_ENV = PATH=$(BR_PATH)
-HOST_CONFIGURE_OPTS = PATH=$(BR_PATH) \
- AR="$(HOSTAR)" \
- AS="$(HOSTAS)" \
- LD="$(HOSTLD)" \
- NM="$(HOSTNM)" \
- CC="$(HOSTCC)" \
- GCC="$(HOSTCC)" \
- CXX="$(HOSTCXX)" \
- CPP="$(HOSTCPP)" \
- OBJCOPY="$(HOSTOBJCOPY)" \
- RANLIB="$(HOSTRANLIB)" \
- CPPFLAGS="$(HOST_CPPFLAGS)" \
- CFLAGS="$(HOST_CFLAGS)" \
- CXXFLAGS="$(HOST_CXXFLAGS)" \
- LDFLAGS="$(HOST_LDFLAGS)" \
- PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
- PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
- PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
- PKG_CONFIG_SYSROOT_DIR="/" \
- PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
- LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))" \
- INTLTOOL_PERL=$(PERL)
-
-HOST_MAKE_ENV = PATH=$(BR_PATH) \
- LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))" \
- PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
- PKG_CONFIG_SYSROOT_DIR="/" \
- PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
+HOST_CONFIGURE_OPTS = \
+ PATH=$(BR_PATH) \
+ AR="$(HOSTAR)" \
+ AS="$(HOSTAS)" \
+ LD="$(HOSTLD)" \
+ NM="$(HOSTNM)" \
+ CC="$(HOSTCC)" \
+ GCC="$(HOSTCC)" \
+ CXX="$(HOSTCXX)" \
+ CPP="$(HOSTCPP)" \
+ OBJCOPY="$(HOSTOBJCOPY)" \
+ RANLIB="$(HOSTRANLIB)" \
+ CPPFLAGS="$(HOST_CPPFLAGS)" \
+ CFLAGS="$(HOST_CFLAGS)" \
+ CXXFLAGS="$(HOST_CXXFLAGS)" \
+ LDFLAGS="$(HOST_LDFLAGS)" \
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ PKG_CONFIG_SYSROOT_DIR="/" \
+ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
+ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))" \
+ INTLTOOL_PERL=$(PERL)
+
+HOST_MAKE_ENV = \
+ PATH=$(BR_PATH) \
+ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))" \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ PKG_CONFIG_SYSROOT_DIR="/" \
+ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
# This is extra environment we can not export ourselves (eg. because some
# packages use that variable internally, eg. uboot), so we have to
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index 4f21127..dba3ddd 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -9,9 +9,10 @@ ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
ALSAMIXERGUI_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui
ALSAMIXERGUI_AUTORECONF = YES
-ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
- ac_cv_lib_fltk_fl_numericsort=yes \
- ac_cv_lib_asound_snd_ctl_open=yes
+ALSAMIXERGUI_CONF_ENV = \
+ ac_cv_lib_fltk_numericsort=yes \
+ ac_cv_lib_fltk_fl_numericsort=yes \
+ ac_cv_lib_asound_snd_ctl_open=yes
ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 95f52c7..2cea550 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -13,33 +13,60 @@ ATK_LICENSE_FILES = COPYING
ATK_INSTALL_STAGING = YES
ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
-ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
- glib_cv_stack_grows=no glib_cv_uscore=no \
- ac_cv_func_strtod=yes ac_fsusage_space=yes \
- fu_cv_sys_stat_statfs2_bsize=yes ac_cv_func_closedir_void=no \
- ac_cv_func_getloadavg=no ac_cv_lib_util_getloadavg=no \
- ac_cv_lib_getloadavg_getloadavg=no ac_cv_func_getgroups=yes \
- ac_cv_func_getgroups_works=yes ac_cv_func_chown_works=yes \
- ac_cv_have_decl_euidaccess=no ac_cv_func_euidaccess=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 \
- ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \
- jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \
- jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \
- ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \
- gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_path_max=yes \
- ac_cv_func_fnmatch_gnu=yes am_getline_needs_run_time_check=no \
- am_cv_func_working_getline=yes gl_cv_func_mkdir_trailing_slash_bug=no \
- gl_cv_func_mkstemp_limitations=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_prog_F77=no
+ATK_CONF_ENV = \
+ ac_cv_func_posix_getpwuid_r=yes \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ ac_cv_func_memcmp_working=yes \
+ ac_cv_have_decl_malloc=yes \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=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_prog_F77=no
ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 027f7ac..fd91961 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -11,8 +11,10 @@ AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
AUTOCONF_LICENSE = GPLv3+ with exceptions
AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
-HOST_AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
- ac_cv_prog_gnu_m4_gnu=no
+HOST_AUTOCONF_CONF_ENV = \
+ EMACS="no" \
+ ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+ ac_cv_prog_gnu_m4_gnu=no
HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index cd25748..10c9915 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -17,55 +17,56 @@ AVAHI_LICENSE = LGPLv2.1+
AVAHI_LICENSE_FILES = LICENSE
AVAHI_INSTALL_STAGING = YES
-AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
- ac_fsusage_space=yes \
- fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no \
- ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no \
- ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes \
- ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes \
- ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=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 \
- jm_cv_func_gettimeofday_clobber=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_working_readdir=yes \
- jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no \
- ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no \
- gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes \
- ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no \
- gl_cv_func_mkstemp_limitations=no \
- ac_cv_func_working_mktime=yes \
- jm_cv_func_working_re_compile_pattern=yes \
- ac_use_included_regex=no \
- avahi_cv_sys_cxx_works=yes \
- DATADIRNAME=share
+AVAHI_CONF_ENV = \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ jm_cv_func_gettimeofday_clobber=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=no \
+ ac_cv_func_working_mktime=yes \
+ jm_cv_func_working_re_compile_pattern=yes \
+ ac_use_included_regex=no \
+ avahi_cv_sys_cxx_works=yes \
+ DATADIRNAME=share
AVAHI_CONF_OPTS = \
--disable-qt3 \
@@ -83,7 +84,8 @@ AVAHI_CONF_OPTS = \
--with-autoipd-user=avahi \
--with-autoipd-group=avahi
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
+AVAHI_DEPENDENCIES = \
+ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
host-pkgconf host-gettext
ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
@@ -129,13 +131,14 @@ AVAHI_CONF_OPTS += --disable-gtk3
endif
ifeq ($(BR2_PACKAGE_PYTHON),y)
-AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \
- am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \
- am_cv_python_version=$(PYTHON_VERSION) \
- am_cv_python_platform=linux2 \
- am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
- am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
- py_cv_mod_socket_=yes
+AVAHI_CONF_ENV += \
+ am_cv_pathless_PYTHON=python \
+ am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \
+ am_cv_python_version=$(PYTHON_VERSION) \
+ am_cv_python_platform=linux2 \
+ am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+ am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+ py_cv_mod_socket_=yes
AVAHI_DEPENDENCIES += python
AVAHI_CONF_OPTS += --enable-python
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index cb9a7a2..983fa20 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -18,12 +18,15 @@ BIND_TARGET_SERVER_SBIN += lwresd named named-checkconf named-checkzone
BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey
BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone
BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
-BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
- BUILD_CFLAGS="$(TARGET_CFLAGS)"
+BIND_CONF_ENV = \
+ BUILD_CC="$(TARGET_CC)" \
+ BUILD_CFLAGS="$(TARGET_CFLAGS)"
BIND_CONF_OPTS = \
--with-randomdev=/dev/urandom \
- --enable-epoll --with-libtool \
- --with-gssapi=no --enable-rrl
+ --enable-epoll \
+ --with-libtool \
+ --with-gssapi=no \
+ --enable-rrl
ifeq ($(BR2_PACKAGE_LIBCAP),y)
BIND_CONF_OPTS += --enable-linux-caps
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index e6fb007..982b7e7 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -12,31 +12,57 @@ CAIRO_SITE = http://cairographics.org/releases
CAIRO_INSTALL_STAGING = YES
CAIRO_AUTORECONF = YES
-CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
- glib_cv_uscore=no ac_cv_func_strtod=yes \
- ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=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 jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=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
+CAIRO_CONF_ENV = \
+ ac_cv_func_posix_getpwuid_r=yes \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=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
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index dce2b23..af58aa8 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -12,18 +12,21 @@ COLLECTD_LICENSE = GPLv2 LGPLv2.1
COLLECTD_LICENSE_FILES = COPYING
# These require unmet dependencies, are fringe, pointless or deprecated
-COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \
- gmond hddtemp ipmi ipvs java libvirt lpar lvm madwifi mbmon \
- modbus multimeter netapp netlink nginx \
- notify_desktop notify_email numa nut onewire oracle perl pf \
- pinba postgresql powerdns python redis routeros rrdcached \
- sigrok tape target_v5upgrade teamspeak2 ted \
- tokyotyrant uuid varnish vserver write_mongodb write_redis \
- xmms zfs_arc
+COLLECTD_PLUGINS_DISABLE = \
+ amqp apple_sensors aquaero ascent dbi email \
+ gmond hddtemp ipmi ipvs java libvirt lpar lvm madwifi mbmon \
+ modbus multimeter netapp netlink nginx \
+ notify_desktop notify_email numa nut onewire oracle perl pf \
+ pinba postgresql powerdns python redis routeros rrdcached \
+ sigrok tape target_v5upgrade teamspeak2 ted \
+ tokyotyrant uuid varnish vserver write_mongodb write_redis \
+ xmms zfs_arc
COLLECTD_CONF_ENV += LIBS="-lm"
-COLLECTD_CONF_OPTS += --with-nan-emulation --with-fp-layout=nothing \
+COLLECTD_CONF_OPTS += \
+ --with-nan-emulation \
+ --with-fp-layout=nothing \
--with-perl-bindings=no \
$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
$(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \
@@ -98,7 +101,8 @@ COLLECTD_CONF_OPTS += --with-nan-emulation --with-fp-layout=nothing \
$(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http)
-COLLECTD_DEPENDENCIES = host-pkgconf \
+COLLECTD_DEPENDENCIES = \
+ host-pkgconf \
$(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \
$(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \
$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index a251b86..ee23a2a 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -10,9 +10,10 @@ DBUS_GLIB_INSTALL_STAGING = YES
DBUS_GLIB_LICENSE = AFLv2.1 GPLv2+
DBUS_GLIB_LICENSE_FILES = COPYING
-DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \
- ac_cv_func_posix_getpwnam_r=yes \
- have_abstract_sockets=yes
+DBUS_GLIB_CONF_ENV = \
+ ac_cv_have_abstract_sockets=yes \
+ ac_cv_func_posix_getpwnam_r=yes \
+ have_abstract_sockets=yes
DBUS_GLIB_CONF_OPTS = \
--disable-tests \
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index c8e9a27..696095d 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -8,8 +8,9 @@ DROPBEAR_VERSION = 2014.66
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
-DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
- PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
+DROPBEAR_MAKE = \
+ $(MAKE) MULTI=1 SCPPROGRESS=1 \
+ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
DROPBEAR_LICENSE_FILES = LICENSE
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index 9054620..c067a04 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -12,8 +12,9 @@ LIBEDJE_LICENSE_FILES = COPYING
LIBEDJE_INSTALL_STAGING = YES
-LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
- libembryo
+LIBEDJE_DEPENDENCIES = \
+ host-pkgconf lua libeina libeet libecore libevas \
+ libembryo
ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
LIBEDJE_CONF_OPTS += --enable-edje-cc
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 9f3d07a..474e67f 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -12,11 +12,13 @@ LIBELEMENTARY_LICENSE_FILES = COPYING
LIBELEMENTARY_INSTALL_STAGING = YES
-LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
- host-libeet
+LIBELEMENTARY_DEPENDENCIES = \
+ libeina libevas libecore libedje host-libedje \
+ host-libeet
-LIBELEMENTARY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
- --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+LIBELEMENTARY_CONF_OPTS = \
+ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ --with-eet-eet=$(HOST_DIR)/usr/bin/eet
# libethumb_client is only built when ethumbd is built.
# ethumbd is only built if edbus is built.
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 68647c5..b5a2d72 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -14,8 +14,9 @@ LIBEVAS_INSTALL_STAGING = YES
LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
-HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \
- host-freetype host-libpng host-libjpeg
+HOST_LIBEVAS_DEPENDENCIES = \
+ host-pkgconf host-zlib host-libeina \
+ host-freetype host-libpng host-libjpeg
HOST_LIBEVAS_CONF_OPTS += \
--enable-image-loader-png \
--enable-image-loader-jpeg \
@@ -68,8 +69,9 @@ endif
ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)
LIBEVAS_CONF_OPTS += --enable-gl-xlib
-LIBEVAS_DEPENDENCIES += xproto_glproto xlib_libX11 xlib_libXrender \
- xlib_libXext libeet
+LIBEVAS_DEPENDENCIES += \
+ xproto_glproto xlib_libX11 xlib_libXrender \
+ xlib_libXext libeet
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_XCB),y)
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 3caedf8..c2c4b39 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -8,8 +8,9 @@ FINDUTILS_VERSION = 4.4.2
FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
FINDUTILS_LICENSE = GPLv3+
FINDUTILS_LICENSE_FILES = COPYING
-FINDUTILS_CONF_ENV = gl_cv_func_stdin=yes \
- ac_cv_func_working_mktime=yes \
- gl_cv_func_wcwidth_works=yes
+FINDUTILS_CONF_ENV = \
+ gl_cv_func_stdin=yes \
+ ac_cv_func_working_mktime=yes \
+ gl_cv_func_wcwidth_works=yes
$(eval $(autotools-package))
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index c169922..3ff05b6 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -14,7 +14,8 @@ GUTENPRINT_LICENSE_FILES = COPYING
# Needed, as we touch Makefile.am
GUTENPRINT_AUTORECONF = YES
-GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
+GUTENPRINT_DEPENDENCIES = \
+ cups host-pkgconf \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
# host-gutenprint is needed to generate XML as part of compilation
@@ -22,21 +23,23 @@ GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
# so we need to build both a host package and a target package
GUTENPRINT_DEPENDENCIES += host-gutenprint
-GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \
+GUTENPRINT_CONF_ENV = \
+ ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \
ac_cv_path_IJS_CONFIG=""
-GUTENPRINT_CONF_OPTS = --disable-libgutenprintui2 \
- --disable-samples \
- --without-doc \
- --without-gimp2 \
- --without-foomatic \
- --without-foomatic3 \
- --disable-escputil \
- --disable-test \
- --disable-testpattern \
- --with-cups="/usr" \
- --with-sysroot="$(STAGING_DIR)" \
- --disable-cups-ppds
+GUTENPRINT_CONF_OPTS = \
+ --disable-libgutenprintui2 \
+ --disable-samples \
+ --without-doc \
+ --without-gimp2 \
+ --without-foomatic \
+ --without-foomatic3 \
+ --disable-escputil \
+ --disable-test \
+ --disable-testpattern \
+ --with-cups="/usr" \
+ --with-sysroot="$(STAGING_DIR)" \
+ --disable-cups-ppds
# USE_PREGEN_XMLI18N_TMP_H is added by our patch
GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h
@@ -53,18 +56,19 @@ HOST_GUTENPRINT_MAKE_ENV =
# empty string to to disable this, not just to /bin/false like elsewhere.
HOST_GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=''
-HOST_GUTENPRINT_CONF_OPTS = --disable-libgutenprintui2 \
- --disable-samples \
- --without-gimp2 \
- --without-doc \
- --disable-nls \
- --disable-nls-macos \
- --without-foomatic \
- --without-foomatic3 \
- --disable-escputil \
- --disable-test \
- --disable-testpattern \
- --without-cups
+HOST_GUTENPRINT_CONF_OPTS = \
+ --disable-libgutenprintui2 \
+ --disable-samples \
+ --without-gimp2 \
+ --without-doc \
+ --disable-nls \
+ --disable-nls-macos \
+ --without-foomatic \
+ --without-foomatic3 \
+ --disable-escputil \
+ --disable-test \
+ --disable-testpattern \
+ --without-cups
# Needed by autoreconf
define GUTENPRINT_CREATE_M4_DIR
diff --git a/package/libenca/libenca.mk b/package/libenca/libenca.mk
index 7ab95f5..184cac9 100644
--- a/package/libenca/libenca.mk
+++ b/package/libenca/libenca.mk
@@ -11,10 +11,11 @@ LIBENCA_LICENSE = GPLv2
LIBENCA_LICENSE_FILES = COPYING
LIBENCA_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBENCA_CONF_ENV += ac_cv_file__dev_random=yes \
- ac_cv_file__dev_urandom=yes \
- ac_cv_file__dev_arandom=no \
- ac_cv_file__dev_srandom=no
+LIBENCA_CONF_ENV += \
+ ac_cv_file__dev_random=yes \
+ ac_cv_file__dev_urandom=yes \
+ ac_cv_file__dev_arandom=no \
+ ac_cv_file__dev_srandom=no
define LIBENCA_MAKE_HOST_TOOL
$(MAKE) -C $(@D)/tools $(HOST_CONFIGURE_OPTS) make_hash
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 89faca3..eeb56f5 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -16,58 +16,61 @@ LIBGTK2_LICENSE_FILES = COPYING
LIBGTK2_AUTORECONF = YES
-LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
- glib_cv_uscore=no \
- ac_cv_func_strtod=yes \
- ac_fsusage_space=yes \
- fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no \
- ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no \
- ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes \
- ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes \
- ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=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 \
- jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes \
- jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no \
- ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no \
- gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes \
- ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no \
- gl_cv_func_mkstemp_limitations=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_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
- ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
- ac_cv_prog_F77=no \
- ac_cv_path_CUPS_CONFIG=no
+LIBGTK2_CONF_ENV = \
+ ac_cv_func_posix_getpwuid_r=yes \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=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_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
+ ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
+ ac_cv_prog_F77=no \
+ ac_cv_path_CUPS_CONFIG=no
LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
@@ -79,7 +82,8 @@ LIBGTK2_CONF_OPTS += \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
-LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
+LIBGTK2_DEPENDENCIES += \
+ xlib_libXcomposite fontconfig xlib_libX11 \
xlib_libXext xlib_libXrender
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 1737cd4..ea28e5c 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -13,20 +13,21 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib
LIBNSS_LICENSE = MPLv2.0
LIBNSS_LICENSE_FILES = nss/COPYING
-LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
- NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
- NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
- BUILD_OPT=1 \
- NS_USE_GCC=1 \
- NSS_USE_SYSTEM_SQLITE=1 \
- NSS_ENABLE_ECC=1 \
- NATIVE_CC="$(HOSTCC)" \
- TARGETCC="$(TARGET_CC)" \
- TARGETCCC="$(TARGET_CXX)" \
- TARGETRANLIB="$(TARGET_RANLIB)" \
- OS_ARCH="Linux" \
- OS_RELEASE="2.6" \
- OS_TEST="$(ARCH)"
+LIBNSS_BUILD_VARS = \
+ MOZILLA_CLIENT=1 \
+ NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
+ NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
+ BUILD_OPT=1 \
+ NS_USE_GCC=1 \
+ NSS_USE_SYSTEM_SQLITE=1 \
+ NSS_ENABLE_ECC=1 \
+ NATIVE_CC="$(HOSTCC)" \
+ TARGETCC="$(TARGET_CC)" \
+ TARGETCCC="$(TARGET_CXX)" \
+ TARGETRANLIB="$(TARGET_RANLIB)" \
+ OS_ARCH="Linux" \
+ OS_RELEASE="2.6" \
+ OS_TEST="$(ARCH)"
ifeq ($(BR2_ARCH_IS_64),y)
# MIPS64 n32 is treated as a 32-bit architecture by libnss.
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index bcc83ed..bfcf19a 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -13,9 +13,10 @@ LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
# We're patching configure.in
LIBPCAP_AUTORECONF = YES
-LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
- ac_cv_header_linux_wireless_h=yes \
- CFLAGS="$(LIBPCAP_CFLAGS)"
+LIBPCAP_CONF_ENV = \
+ ac_cv_linux_vers=2 \
+ ac_cv_header_linux_wireless_h=yes \
+ CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux
LIBPCAP_CONFIG_SCRIPTS = pcap-config
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index 6a2619d..9c3522b 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -8,9 +8,12 @@ LIBRAW_VERSION = 0.13.4
LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
LIBRAW_SITE = http://www.libraw.org/data
LIBRAW_INSTALL_STAGING = YES
-LIBRAW_CONF_OPTS += --disable-examples --disable-lcms \
- --disable-openmp --disable-demosaic-pack-gpl2 \
- --disable-demosaic-pack-gpl3
+LIBRAW_CONF_OPTS += \
+ --disable-examples \
+ --disable-lcms \
+ --disable-openmp \
+ --disable-demosaic-pack-gpl2 \
+ --disable-demosaic-pack-gpl3
LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010
LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 9de7ffa..be9f646 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -12,11 +12,12 @@ LIBUNGIF_CONF_OPTS = --without-x
LIBUNGIF_LICENSE = MIT
LIBUNGIF_LICENSE_FILES = COPYING
-LIBUNGIF_BINS = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
- gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
- gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
- gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
- text2gif
+LIBUNGIF_BINS = \
+ gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
+ gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
+ gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
+ gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
+ text2gif
define LIBUNGIF_BINS_CLEANUP
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(LIBUNGIF_BINS))
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 5b8d214..71c8611 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -47,15 +47,17 @@ endif
# rtl87xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX),y)
-LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
+LINUX_FIRMWARE_FILES += \
+ rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
endif
# rtl88xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX),y)
-LINUX_FIRMWARE_FILES += rtlwifi/rtl8821aefw.bin \
- rtlwifi/rtl8821aefw_wowlan.bin
+LINUX_FIRMWARE_FILES += \
+ rtlwifi/rtl8821aefw.bin \
+ rtlwifi/rtl8821aefw_wowlan.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
endif
@@ -241,12 +243,14 @@ LINUX_FIRMWARE_FILES += \
endif
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_XCx000),y)
-LINUX_FIRMWARE_FILES += dvb-fe-xc4000-1.4.1.fw \
- dvb-fe-xc5000-1.6.114.fw \
- dvb-fe-xc5000c-4.1.30.7.fw
-LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.xc4000 \
- LICENCE.xc5000 \
- LICENCE.xc5000c
+LINUX_FIRMWARE_FILES += \
+ dvb-fe-xc4000-1.4.1.fw \
+ dvb-fe-xc5000-1.6.114.fw \
+ dvb-fe-xc5000c-4.1.30.7.fw
+LINUX_FIRMWARE_ALL_LICENSE_FILES += \
+ LICENCE.xc4000 \
+ LICENCE.xc5000 \
+ LICENCE.xc5000c
endif
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AS102),y)
@@ -272,17 +276,19 @@ endif
# brcm43xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX),y)
-LINUX_FIRMWARE_FILES += brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw \
- brcm/bcm4329-fullmac-4.bin brcm/brcmfmac4329-sdio.bin \
- brcm/brcmfmac4330-sdio.bin brcm/brcmfmac4334-sdio.bin \
- brcm/brcmfmac4335-sdio.bin
+LINUX_FIRMWARE_FILES += \
+ brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw \
+ brcm/bcm4329-fullmac-4.bin brcm/brcmfmac4329-sdio.bin \
+ brcm/brcmfmac4330-sdio.bin brcm/brcmfmac4334-sdio.bin \
+ brcm/brcmfmac4335-sdio.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
endif
# brcm43xxx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX),y)
-LINUX_FIRMWARE_FILES += brcm/brcmfmac43236b.bin brcm/brcmfmac43241b0-sdio.bin \
- brcm/brcmfmac43241b4-sdio.bin brcm/brcmfmac43362-sdio.bin
+LINUX_FIRMWARE_FILES += \
+ brcm/brcmfmac43236b.bin brcm/brcmfmac43241b0-sdio.bin \
+ brcm/brcmfmac43241b4-sdio.bin brcm/brcmfmac43362-sdio.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
endif
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index db848b9..db91e50 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -10,8 +10,9 @@ OPEN2300_VERSION = 12
OPEN2300_LICENSE = GPLv2
OPEN2300_LICENSE_FILES = COPYING
-OPEN2300_BINS = open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \
- histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300
+OPEN2300_BINS = \
+ open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \
+ histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300
OPEN2300_CFLAGS = $(TARGET_CFLAGS)
OPEN2300_LDFLAGS = $(TARGET_LDFLAGS)
diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
index f8a8506..d54e8eb 100644
--- a/package/openpgm/openpgm.mk
+++ b/package/openpgm/openpgm.mk
@@ -13,7 +13,9 @@ OPENPGM_INSTALL_STAGING = YES
OPENPGM_AUTORECONF = YES
OPENPGM_SUBDIR = openpgm/pgm/
OPENPGM_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
-OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \
- ac_cv_file__dev_hpet=no
+OPENPGM_CONF_ENV = \
+ ac_cv_file__proc_cpuinfo=yes \
+ ac_cv_file__dev_rtc=no \
+ ac_cv_file__dev_hpet=no
$(eval $(autotools-package))
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
index 31c533e..d9cdcdd 100644
--- a/package/openpowerlink/openpowerlink.mk
+++ b/package/openpowerlink/openpowerlink.mk
@@ -19,9 +19,10 @@ OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_STACK=OFF
OPENPOWERLINK_DEPENDENCIES = libpcap
else
# use the kernel stack
-OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_STACK=ON \
- -DCFG_KERNEL_DIR=$(LINUX_DIR) \
- -DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
+OPENPOWERLINK_CONF_OPTS += \
+ -DCFG_KERNEL_STACK=ON \
+ -DCFG_KERNEL_DIR=$(LINUX_DIR) \
+ -DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
OPENPOWERLINK_DEPENDENCIES = linux
endif
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 63cfae3..f3e16ef 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -13,36 +13,63 @@ PANGO_INSTALL_STAGING = YES
PANGO_LICENSE = LGPLv2+
PANGO_LICENSE_FILES = COPYING
-PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
- glib_cv_uscore=no ac_cv_func_strtod=yes \
- ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=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 jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=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_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+PANGO_CONF_ENV = \
+ ac_cv_func_posix_getpwuid_r=yes \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=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_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
PANGO_CONF_OPTS = --enable-explicit-deps=no --disable-gtk-doc-html
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+PANGO_DEPENDENCIES = \
+ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
host-pkgconf \
libglib2 \
cairo \
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 0a88251..453445b 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -8,14 +8,16 @@ PPPD_VERSION = 2.4.7
PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = ftp://ftp.samba.org/pub/ppp
PPPD_LICENSE = LGPLv2+ LGPL BSD-4c BSD-3c GPLv2+
-PPPD_LICENSE_FILES = pppd/tdb.c pppd/plugins/pppoatm/COPYING \
+PPPD_LICENSE_FILES = \
+ pppd/tdb.c pppd/plugins/pppoatm/COPYING \
pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
PPPD_INSTALL_STAGING = YES
PPPD_TARGET_BINS = chat pppd pppdump pppstats
-PPPD_RADIUS_CONF = dictionary dictionary.ascend dictionary.compat \
- dictionary.merit dictionary.microsoft \
- issue port-id-map realms server radiusclient.conf
+PPPD_RADIUS_CONF = \
+ dictionary dictionary.ascend dictionary.compat \
+ dictionary.merit dictionary.microsoft \
+ issue port-id-map realms server radiusclient.conf
ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
PPPD_DEPENDENCIES += libpcap
diff --git a/package/python-pycrypto/python-pycrypto.mk b/package/python-pycrypto/python-pycrypto.mk
index f872ccc..bb69f41 100644
--- a/package/python-pycrypto/python-pycrypto.mk
+++ b/package/python-pycrypto/python-pycrypto.mk
@@ -10,8 +10,9 @@ PYTHON_PYCRYPTO_SITE = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto
PYTHON_PYCRYPTO_SETUP_TYPE = distutils
PYTHON_PYCRYPTO_LICENSE = Public Domain, Python 2.2 License (HMAC.py, setup.py)
-PYTHON_PYCRYPTO_LICENSE_FILES = COPYRIGHT LEGAL/copy/LICENSE.libtom \
- LEGAL/copy/LICENSE.python-2.2
+PYTHON_PYCRYPTO_LICENSE_FILES = \
+ COPYRIGHT LEGAL/copy/LICENSE.libtom \
+ LEGAL/copy/LICENSE.python-2.2
# The pycrypto package contains a LICENSE.orig file, but our patching
# infrastrucure removes all .orig file, so we must rename that license
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 50e6d75..c4215b5 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -11,12 +11,16 @@ RPM_DEPENDENCIES = zlib beecrypt neon popt openssl
RPM_LICENSE = LGPLv2.1
RPM_LICENSE_FILES = COPYING.LIB
-RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
- ac_cv_va_copy=yes
+RPM_CONF_ENV = \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
+ ac_cv_va_copy=yes
-RPM_CONF_OPTS = --disable-build-versionscript --disable-rpath \
+RPM_CONF_OPTS = \
+ --disable-build-versionscript \
+ --disable-rpath \
--without-selinux \
- --without-python --without-perl \
+ --without-python \
+ --without-perl \
--with-openssl=external \
--with-zlib=$(STAGING_DIR) \
--with-libbeecrypt=$(STAGING_DIR) \
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index d3fc232..05d9a54 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -46,7 +46,8 @@ endif
ifeq ($(BR2_PACKAGE_SDL_X11),y)
SDL_CONF_OPTS += --enable-video-x11=yes
-SDL_DEPENDENCIES += xlib_libX11 xlib_libXext \
+SDL_DEPENDENCIES += \
+ xlib_libX11 xlib_libXext \
$(if $(BR2_PACKAGE_XLIB_LIBXRENDER), xlib_libXrender) \
$(if $(BR2_PACKAGE_XLIB_LIBXRANDR), xlib_libXrandr)
else
@@ -69,18 +70,20 @@ ifeq ($(BR2_PACKAGE_MESA3D),y)
SDL_DEPENDENCIES += mesa3d
endif
-SDL_CONF_OPTS += --enable-pulseaudio=no \
- --disable-arts \
- --disable-esd \
- --disable-nasm \
- --disable-video-ps3
-
-HOST_SDL_CONF_OPTS += --enable-pulseaudio=no \
- --enable-video-x11=no \
- --disable-arts \
- --disable-esd \
- --disable-nasm \
- --disable-video-ps3
+SDL_CONF_OPTS += \
+ --enable-pulseaudio=no \
+ --disable-arts \
+ --disable-esd \
+ --disable-nasm \
+ --disable-video-ps3
+
+HOST_SDL_CONF_OPTS += \
+ --enable-pulseaudio=no \
+ --enable-video-x11=no \
+ --disable-arts \
+ --disable-esd \
+ --disable-nasm \
+ --disable-video-ps3
SDL_CONFIG_SCRIPTS = sdl-config
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index d2e5a38..7b52085 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -7,10 +7,12 @@
SYNERGY_VERSION = 1.3.1
SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION)
SYNERGY_AUTORECONF = YES
-SYNERGY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib
-SYNERGY_DEPENDENCIES = xlib_libXtst \
- $(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
+SYNERGY_CONF_OPTS = \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib
+SYNERGY_DEPENDENCIES = \
+ xlib_libXtst \
+ $(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
SYNERGY_LICENSE = GPLv2
SYNERGY_LICENSE_FILES = COPYING
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
index d0aa857..d869eda 100644
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -11,8 +11,9 @@ TZDATA_DEPENDENCIES = host-tzdata
HOST_TZDATA_DEPENDENCIES = host-zic
TZDATA_LICENSE = Public domain
-TZDATA_DEFAULT_ZONELIST = africa antarctica asia australasia backward etcetera \
- europe factory northamerica pacificnew southamerica
+TZDATA_DEFAULT_ZONELIST = \
+ africa antarctica asia australasia backward etcetera \
+ europe factory northamerica pacificnew southamerica
ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default)
TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST)
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index f831f74..41ac4f4 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -14,8 +14,9 @@ URG_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_SDL)$(BR2_PACKAGE_SDL_NET),yy)
URG_DEPENDENCIES += sdl sdl_net
-URG_CONF_OPTS += --with-sdl-prefix=$(STAGING_DIR)/usr \
- --with-sdl-exec-prefix=$(STAGING_DIR)/usr
+URG_CONF_OPTS += \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
else
URG_CONF_OPTS = --without-sdl
URG_CONF_ENV += ac_cv_path_SDL_CONFIG=""
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 7a07ef8..01ba27e 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -9,18 +9,20 @@ VIM_SITE_METHOD = hg
# 7.4 release patchlevel 333
VIM_VERSION = 8ae50e3ef8bf
# Win over busybox vi since vim is more feature-rich
-VIM_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+VIM_DEPENDENCIES = \
+ ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
VIM_SUBDIR = src
-VIM_CONF_ENV = vim_cv_toupper_broken=no \
- vim_cv_terminfo=yes \
- vim_cv_tty_group=world \
- vim_cv_tty_mode=0620 \
- vim_cv_getcwd_broken=no \
- vim_cv_stat_ignores_slash=yes \
- vim_cv_memmove_handles_overlap=yes \
- ac_cv_sizeof_int=4 \
- ac_cv_small_wchar_t=no
+VIM_CONF_ENV = \
+ vim_cv_toupper_broken=no \
+ vim_cv_terminfo=yes \
+ vim_cv_tty_group=world \
+ vim_cv_tty_mode=0620 \
+ vim_cv_getcwd_broken=no \
+ vim_cv_stat_ignores_slash=yes \
+ vim_cv_memmove_handles_overlap=yes \
+ ac_cv_sizeof_int=4 \
+ ac_cv_small_wchar_t=no
# GUI/X11 headers leak from the host so forcibly disable them
VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x
VIM_LICENSE = Charityware
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 095050a..ae69006 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -12,13 +12,19 @@ WIRESHARK_LICENSE_FILES = COPYING
WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
# For wrong cflags patch
WIRESHARK_AUTORECONF = YES
-WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
- ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
+WIRESHARK_CONF_ENV = \
+ LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
+ ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
# wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
# Work around it by pointing includedir at staging
-WIRESHARK_CONF_OPTS = --disable-wireshark --without-krb5 --disable-usr-local \
- --enable-static=no --with-gnutls=no --with-libsmi=no \
- --includedir=$(STAGING_DIR)/usr/include
+WIRESHARK_CONF_OPTS = \
+ --disable-wireshark \
+ --without-krb5 \
+ --disable-usr-local \
+ --enable-static=no \
+ --with-gnutls=no \
+ --with-libsmi=no \
+ --includedir=$(STAGING_DIR)/usr/include
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 7b3fbd5..44f01b1 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -11,9 +11,10 @@ XAPP_XMAN_LICENSE = MIT
XAPP_XMAN_LICENSE_FILES = COPYING
XAPP_XMAN_DEPENDENCIES = xlib_libXaw
-XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
- ac_cv_file__etc_man_config=no \
- ac_cv_file__etc_manpath_config=no \
- ac_cv_file__usr_share_misc_man_conf=no
+XAPP_XMAN_CONF_ENV = \
+ ac_cv_file__etc_man_conf=no \
+ ac_cv_file__etc_man_config=no \
+ ac_cv_file__etc_manpath_config=no \
+ ac_cv_file__usr_share_misc_man_conf=no
$(eval $(autotools-package))
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-12-24 10:41 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2014-12-24 10:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=38f09d6873436cfe4606ae32adbe4ac99bb8ad61
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/binutils/binutils.mk | 34 ++++++----
package/blackbox/blackbox.mk | 5 +-
package/cups/cups.mk | 22 ++++---
package/dbus/dbus.mk | 23 ++++---
package/ed/ed.mk | 5 +-
package/fontconfig/fontconfig.mk | 7 +-
package/gnuplot/gnuplot.mk | 25 ++++----
package/icu/icu.mk | 6 +-
package/imagemagick/imagemagick.mk | 27 ++++----
package/libao/libao.mk | 9 ++-
package/libargtable2/libargtable2.mk | 9 ++-
package/libxslt/libxslt.mk | 7 ++-
package/metacity/metacity.mk | 11 ++-
package/netsnmp/netsnmp.mk | 34 ++++++----
package/ntp/ntp.mk | 11 ++--
package/openssh/openssh.mk | 10 ++-
package/php/php.mk | 68 ++++++++++----------
package/proftpd/proftpd.mk | 22 ++++---
package/rrdtool/rrdtool.mk | 16 +++--
package/sdl_image/sdl_image.mk | 50 ++++++++-------
package/sdl_ttf/sdl_ttf.mk | 7 +-
package/sed/sed.mk | 17 +++--
package/squid/squid.mk | 41 +++++++-----
package/tcpdump/tcpdump.mk | 12 ++-
package/vde2/vde2.mk | 15 ++--
.../xserver_xorg-server/xserver_xorg-server.mk | 23 ++++--
26 files changed, 296 insertions(+), 220 deletions(-)
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 9a9bb94..1ff7fba 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -42,15 +42,18 @@ endif
# they also contain the gdb sources, but gdb shouldn't be built, so we
# disable it.
BINUTILS_DISABLE_GDB_CONF_OPTS = \
- --disable-sim --disable-gdb
+ --disable-sim \
+ --disable-gdb
# We need to specify host & target to avoid breaking ARM EABI
-BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
- --host=$(GNU_TARGET_NAME) \
- --target=$(GNU_TARGET_NAME) \
- --enable-install-libiberty \
- $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
- $(BINUTILS_EXTRA_CONFIG_OPTIONS)
+BINUTILS_CONF_OPTS = \
+ --disable-multilib \
+ --disable-werror \
+ --host=$(GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
+ --enable-install-libiberty \
+ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
+ $(BINUTILS_EXTRA_CONFIG_OPTIONS)
# Don't build documentation. It takes up extra space / build time,
# and sometimes needs specific makeinfo versions to work
@@ -64,13 +67,16 @@ endif
# "host" binutils should actually be "cross"
# We just keep the convention of "host utility" for now
-HOST_BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
- --target=$(GNU_TARGET_NAME) \
- --disable-shared --enable-static \
- --with-sysroot=$(STAGING_DIR) \
- --enable-poison-system-directories \
- $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
- $(BINUTILS_EXTRA_CONFIG_OPTIONS)
+HOST_BINUTILS_CONF_OPTS = \
+ --disable-multilib \
+ --disable-werror \
+ --target=$(GNU_TARGET_NAME) \
+ --disable-shared \
+ --enable-static \
+ --with-sysroot=$(STAGING_DIR) \
+ --enable-poison-system-directories \
+ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
+ $(BINUTILS_EXTRA_CONFIG_OPTIONS)
# We just want libbfd and libiberty, not the full-blown binutils in staging
define BINUTILS_INSTALL_STAGING_CMDS
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index 254d46f..a73bc5b 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -7,8 +7,9 @@
BLACKBOX_VERSION = 0.70.1
BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
BLACKBOX_SITE = http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
-BLACKBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib
+BLACKBOX_CONF_OPTS = \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib
BLACKBOX_DEPENDENCIES = xlib_libX11
BLACKBOX_LICENSE = MIT
BLACKBOX_LICENSE_FILES = LICENSE
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 318571d..cc87574 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -12,18 +12,20 @@ CUPS_LICENSE_FILES = LICENSE.txt
CUPS_INSTALL_STAGING = YES
CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
-CUPS_CONF_OPTS = --without-perl \
- --without-java \
- --without-php \
- --disable-gnutls \
- --disable-gssapi \
- --libdir=/usr/lib
+CUPS_CONF_OPTS = \
+ --without-perl \
+ --without-java \
+ --without-php \
+ --disable-gnutls \
+ --disable-gssapi \
+ --libdir=/usr/lib
CUPS_CONFIG_SCRIPTS = cups-config
-CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
- $(if $(BR2_PACKAGE_LIBPNG),libpng) \
- $(if $(BR2_PACKAGE_JPEG),jpeg) \
- $(if $(BR2_PACKAGE_TIFF),tiff)
+CUPS_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_ZLIB),zlib) \
+ $(if $(BR2_PACKAGE_LIBPNG),libpng) \
+ $(if $(BR2_PACKAGE_JPEG),jpeg) \
+ $(if $(BR2_PACKAGE_TIFF),tiff)
ifeq ($(BR2_PACKAGE_DBUS),y)
CUPS_CONF_OPTS += --enable-dbus
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 77ea502..5e4fd19 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -22,17 +22,18 @@ endef
DBUS_DEPENDENCIES = host-pkgconf expat
DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPTS = --with-dbus-user=dbus \
- --disable-tests \
- --disable-asserts \
- --enable-abstract-sockets \
- --disable-selinux \
- --disable-xml-docs \
- --disable-doxygen-docs \
- --disable-dnotify \
- --with-xml=expat \
- --with-system-socket=/var/run/dbus/system_bus_socket \
- --with-system-pid-file=/var/run/messagebus.pid
+DBUS_CONF_OPTS = \
+ --with-dbus-user=dbus \
+ --disable-tests \
+ --disable-asserts \
+ --enable-abstract-sockets \
+ --disable-selinux \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --disable-dnotify \
+ --with-xml=expat \
+ --with-system-socket=/var/run/dbus/system_bus_socket \
+ --with-system-pid-file=/var/run/messagebus.pid
ifeq ($(BR2_STATIC_LIBS),y)
DBUS_CONF_OPTS += LIBS='-pthread'
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 1fca2fd..f3bcb74 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -6,8 +6,9 @@
ED_VERSION = 1.9
ED_SITE = $(BR2_GNU_MIRROR)/ed
-ED_CONF_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)"
+ED_CONF_OPTS = \
+ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)"
ED_LICENSE = GPLv3+
ED_LICENSE_FILES = COPYING
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 863fa26..caf997b 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -11,9 +11,10 @@ FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
FONTCONFIG_LICENSE = fontconfig license
FONTCONFIG_LICENSE_FILES = COPYING
-FONTCONFIG_CONF_OPTS = --with-arch=$(GNU_TARGET_NAME) \
- --with-cache-dir=/var/cache/fontconfig \
- --disable-docs
+FONTCONFIG_CONF_OPTS = \
+ --with-arch=$(GNU_TARGET_NAME) \
+ --with-cache-dir=/var/cache/fontconfig \
+ --disable-docs
HOST_FONTCONFIG_CONF_OPTS = \
--disable-static
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index 238da68..4408ece 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -11,18 +11,19 @@ GNUPLOT_LICENSE_FILES = Copyright
GNUPLOT_AUTORECONF = YES
-GNUPLOT_CONF_OPTS = --without-x \
- --disable-raise-console \
- --disable-mouse \
- --without-tutorial \
- --disable-demo \
- --without-row-help \
- --disable-history-file \
- --without-lisp-files \
- --disable-wxwidgets \
- --without-lua \
- --without-latex \
- --without-cairo
+GNUPLOT_CONF_OPTS = \
+ --without-x \
+ --disable-raise-console \
+ --disable-mouse \
+ --without-tutorial \
+ --disable-demo \
+ --without-row-help \
+ --disable-history-file \
+ --without-lisp-files \
+ --disable-wxwidgets \
+ --without-lua \
+ --without-latex \
+ --without-cairo
ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
GNUPLOT_CONF_OPTS += --with-gd
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 0c554ca..c5460b2 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -13,8 +13,10 @@ ICU_LICENSE_FILES = license.html
ICU_DEPENDENCIES = host-icu
ICU_INSTALL_STAGING = YES
ICU_CONFIG_SCRIPTS = icu-config
-ICU_CONF_OPTS = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
- --disable-tests
+ICU_CONF_OPTS = \
+ --with-cross-build=$(HOST_ICU_DIR)/source \
+ --disable-samples \
+ --disable-tests
HOST_ICU_CONF_OPTS = \
--disable-samples \
--disable-tests \
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index b8e5155..db3b563 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -27,19 +27,20 @@ else
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32
endif
-IMAGEMAGICK_CONF_OPTS = --program-transform-name='s,,,' \
- --disable-openmp \
- --without-perl \
- --without-wmf \
- --without-openexr \
- --without-jp2 \
- --without-jbig \
- --without-gvc \
- --without-djvu \
- --without-dps \
- --without-gslib \
- --without-fpx \
- --without-x
+IMAGEMAGICK_CONF_OPTS = \
+ --program-transform-name='s,,,' \
+ --disable-openmp \
+ --without-perl \
+ --without-wmf \
+ --without-openexr \
+ --without-jp2 \
+ --without-jbig \
+ --without-gvc \
+ --without-djvu \
+ --without-dps \
+ --without-gslib \
+ --without-fpx \
+ --without-x
IMAGEMAGICK_DEPENDENCIES = host-pkgconf
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index 9dfdb96..a314c08 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -10,8 +10,13 @@ LIBAO_DEPENDENCIES = host-pkgconf
LIBAO_INSTALL_STAGING = YES
LIBAO_LICENSE = GPLv2+
LIBAO_LICENSE_FILES = COPYING
-LIBAO_CONF_OPTS = --disable-esd --disable-wmm --disable-arts \
- --disable-nas --disable-pulse --disable-broken-oss
+LIBAO_CONF_OPTS = \
+ --disable-esd \
+ --disable-wmm \
+ --disable-arts \
+ --disable-nas \
+ --disable-pulse \
+ --disable-broken-oss
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
LIBAO_DEPENDENCIES += alsa-lib
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index 583b0b4..6b42cc0 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -8,10 +8,11 @@ LIBARGTABLE2_VERSION = 13
LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13
LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPTS = --disable-example \
- --disable-kernel-module \
- --enable-lib \
- --enable-util
+LIBARGTABLE2_CONF_OPTS = \
+ --disable-example \
+ --disable-kernel-module \
+ --enable-lib \
+ --enable-util
LIBARGTABLE2_LICENSE = LGPLv2+
LIBARGTABLE2_LICENSE_FILES = COPYING
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 20aba08..2e5cc14 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -10,8 +10,11 @@ LIBXSLT_INSTALL_STAGING = YES
LIBXSLT_LICENSE = MIT
LIBXSLT_LICENSE_FILES = COPYING
-LIBXSLT_CONF_OPTS = --with-gnu-ld --without-debug \
- --without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
+LIBXSLT_CONF_OPTS = \
+ --with-gnu-ld \
+ --without-debug \
+ --without-python \
+ --with-libxml-prefix=$(STAGING_DIR)/usr/
LIBXSLT_CONFIG_SCRIPTS = xslt-config
LIBXSLT_DEPENDENCIES = libxml2
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 1d3e143..d889779 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -12,10 +12,13 @@ METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSI
METACITY_LICENSE = GPLv2+
METACITY_LICENSE_FILES = COPYING
-METACITY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib \
- --disable-glibtest --disable-gconf \
- --disable-sm --disable-startup-notification
+METACITY_CONF_OPTS = \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib \
+ --disable-glibtest \
+ --disable-gconf \
+ --disable-sm \
+ --disable-startup-notification
METACITY_DEPENDENCIES = libgtk2 \
xlib_libX11 \
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 91afffe..bfc2a74 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -11,19 +11,27 @@ NETSNMP_LICENSE = Various BSD-like
NETSNMP_LICENSE_FILES = COPYING
NETSNMP_INSTALL_STAGING = YES
NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
-NETSNMP_CONF_OPTS = --with-persistent-directory=/var/lib/snmp \
- --with-defaults --enable-mini-agent --without-rpm \
- --with-logfile=none --without-kmem-usage $(DISABLE_IPV6) \
- --enable-as-needed --without-perl-modules \
- --disable-embedded-perl --disable-perl-cc-checks \
- --disable-scripts --with-default-snmp-version="1" \
- --enable-silent-libtool --enable-mfd-rewrites \
- --with-sys-contact="root at localhost" \
- --with-sys-location="Unknown" \
- --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
- --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
- --with-out-transports="Unix" \
- --disable-manuals
+NETSNMP_CONF_OPTS = \
+ --with-persistent-directory=/var/lib/snmp \
+ --with-defaults \
+ --enable-mini-agent \
+ --without-rpm \
+ --with-logfile=none \
+ --without-kmem-usage $(DISABLE_IPV6) \
+ --enable-as-needed \
+ --without-perl-modules \
+ --disable-embedded-perl \
+ --disable-perl-cc-checks \
+ --disable-scripts \
+ --with-default-snmp-version="1" \
+ --enable-silent-libtool \
+ --enable-mfd-rewrites \
+ --with-sys-contact="root at localhost" \
+ --with-sys-location="Unknown" \
+ --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
+ --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
+ --with-out-transports="Unix" \
+ --disable-manuals
NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
NETSNMP_MAKE = $(MAKE1)
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 1708978..a30adc2 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -13,11 +13,12 @@ NTP_AUTORECONF = YES
NTP_LICENSE = ntp license
NTP_LICENSE_FILES = COPYRIGHT
NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
-NTP_CONF_OPTS = --with-shared \
- --program-transform-name=s,,, \
- --disable-tickadj \
- --with-yielding-select=yes \
- --disable-local-libevent
+NTP_CONF_OPTS = \
+ --with-shared \
+ --program-transform-name=s,,, \
+ --disable-tickadj \
+ --with-yielding-select=yes \
+ --disable-local-libevent
ifneq ($(BR2_INET_IPV6),y)
NTP_CONF_ENV += isc_cv_have_in6addr_any=no
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index d08b468..be471b6 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -9,8 +9,14 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
OPENSSH_LICENSE_FILES = LICENCE
OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPTS = --sysconfdir=/etc/ssh --disable-lastlog --disable-utmp \
- --disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
+OPENSSH_CONF_OPTS = \
+ --sysconfdir=/etc/ssh \
+ --disable-lastlog \
+ --disable-utmp \
+ --disable-utmpx \
+ --disable-wtmp \
+ --disable-wtmpx \
+ --disable-strip
define OPENSSH_USERS
sshd -1 sshd -1 * - - - SSH drop priv user
diff --git a/package/php/php.mk b/package/php/php.mk
index 8c322ec..a5f4574 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -13,12 +13,13 @@ PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
PHP_DEPENDENCIES = host-pkgconf
PHP_LICENSE = PHP
PHP_LICENSE_FILES = LICENSE
-PHP_CONF_OPTS = --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --disable-all \
- --without-pear \
- --with-config-file-path=/etc \
- --disable-rpath
+PHP_CONF_OPTS = \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-all \
+ --without-pear \
+ --with-config-file-path=/etc \
+ --disable-rpath
PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
ifeq ($(BR2_ENDIAN),"BIG")
@@ -50,33 +51,34 @@ PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
### Extensions
-PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
- $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
- $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
- $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
- $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
- $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
- $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
- $(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
- $(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
- $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
- $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
- $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
- $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
- $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
- $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
- $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
- $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
- $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
- $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
- $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
- $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
- $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
- $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
- $(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \
- $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) \
- $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \
- $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar)
+PHP_CONF_OPTS += \
+ $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+ $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
+ $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
+ $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
+ $(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
+ $(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
+ $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
+ $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
+ $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
+ $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
+ $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
+ $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
+ $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
+ $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
+ $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
+ $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
+ $(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \
+ $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) \
+ $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \
+ $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar)
ifeq ($(BR2_PACKAGE_PHP_EXT_MCRYPT),y)
PHP_CONF_OPTS += --with-mcrypt=$(STAGING_DIR)/usr
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index b79abe4..59ce844 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -10,17 +10,19 @@ PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
PROFTPD_LICENSE = GPLv2+
PROFTPD_LICENSE_FILES = COPYING
-PROFTPD_CONF_ENV = ac_cv_func_setpgrp_void=yes \
- ac_cv_func_setgrent_void=yes
-
-PROFTPD_CONF_OPTS = --localstatedir=/var/run \
- --disable-static \
- --disable-curses \
- --disable-ncurses \
- --disable-facl \
- --disable-dso \
- --enable-shadow \
- --with-gnu-ld
+PROFTPD_CONF_ENV = \
+ ac_cv_func_setpgrp_void=yes \
+ ac_cv_func_setgrent_void=yes
+
+PROFTPD_CONF_OPTS = \
+ --localstatedir=/var/run \
+ --disable-static \
+ --disable-curses \
+ --disable-ncurses \
+ --disable-facl \
+ --disable-dso \
+ --enable-shadow \
+ --with-gnu-ld
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 6d5c887..e422694 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -12,11 +12,17 @@ RRDTOOL_LICENSE_FILES = COPYING COPYRIGHT
RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
RRDTOOL_AUTORECONF = YES
RRDTOOL_INSTALL_STAGING = YES
-RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
- ac_cv_func_mmap_fixed_mapped=yes
-RRDTOOL_CONF_OPTS = --disable-perl --disable-python --disable-ruby \
- --disable-tcl --program-transform-name='' \
- $(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
+RRDTOOL_CONF_ENV = \
+ rd_cv_ieee_works=yes \
+ rd_cv_null_realloc=nope \
+ ac_cv_func_mmap_fixed_mapped=yes
+RRDTOOL_CONF_OPTS = \
+ --disable-perl \
+ --disable-python \
+ --disable-ruby \
+ --disable-tcl \
+ --program-transform-name='' \
+ $(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
RRDTOOL_MAKE = $(MAKE1)
define RRDTOOL_REMOVE_EXAMPLES
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 951ea45..b46fc64 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -11,23 +11,24 @@ SDL_IMAGE_INSTALL_STAGING = YES
SDL_IMAGE_LICENSE = zlib
SDL_IMAGE_LICENSE_FILES = COPYING
-SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
- --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
- --disable-sdltest \
- --disable-static \
- --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \
- --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \
- --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \
- --enable-lbm=$(if $(BR2_PACKAGE_SDL_IMAGE_LBM),yes,no) \
- --enable-pcx=$(if $(BR2_PACKAGE_SDL_IMAGE_PCX),yes,no) \
- --enable-png=$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),yes,no) \
- --enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \
- --enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \
- --enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \
- --enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \
- --enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \
- --enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
- --enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
+SDL_IMAGE_CONF_OPTS = \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+ --disable-sdltest \
+ --disable-static \
+ --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \
+ --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \
+ --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \
+ --enable-lbm=$(if $(BR2_PACKAGE_SDL_IMAGE_LBM),yes,no) \
+ --enable-pcx=$(if $(BR2_PACKAGE_SDL_IMAGE_PCX),yes,no) \
+ --enable-png=$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),yes,no) \
+ --enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \
+ --enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \
+ --enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \
+ --enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \
+ --enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \
+ --enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
+ --enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
SDL_IMAGE_DEPENDENCIES = sdl \
$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \
@@ -35,13 +36,14 @@ SDL_IMAGE_DEPENDENCIES = sdl \
$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \
$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
-HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \
- --with-sdl-exec-prefix=$(HOST_DIR)/usr \
- --disable-sdltest \
- --disable-static \
- --disable-jpg-shared \
- --disable-png-shared \
- --disable-tif-shared \
+HOST_SDL_IMAGE_CONF_OPTS = \
+ --with-sdl-prefix=$(HOST_DIR)/usr \
+ --with-sdl-exec-prefix=$(HOST_DIR)/usr \
+ --disable-sdltest \
+ --disable-static \
+ --disable-jpg-shared \
+ --disable-png-shared \
+ --disable-tif-shared \
HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index f316a46..3e494b4 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -12,9 +12,10 @@ SDL_TTF_LICENSE_FILES = COPYING
SDL_TTF_INSTALL_STAGING = YES
SDL_TTF_DEPENDENCIES = sdl freetype
-SDL_TTF_CONF_OPTS = --without-x \
- --with-freetype-prefix=$(STAGING_DIR)/usr \
- --with-sdl-prefix=$(STAGING_DIR)/usr
+SDL_TTF_CONF_OPTS = \
+ --without-x \
+ --with-freetype-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-prefix=$(STAGING_DIR)/usr
SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib"
$(eval $(autotools-package))
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index f72b8b1..b819300 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -9,14 +9,15 @@ SED_SITE = $(BR2_GNU_MIRROR)/sed
SED_LICENSE = GPLv3
SED_LICENSE_FILES = COPYING
-SED_CONF_OPTS = --bindir=/usr/bin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --include=$(STAGING_DIR)/usr/include
+SED_CONF_OPTS = \
+ --bindir=/usr/bin \
+ --libdir=/lib \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --datadir=/usr/share \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --include=$(STAGING_DIR)/usr/include
define SED_MOVE_BINARY
mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 1224369..e9e821d 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -14,23 +14,30 @@ SQUID_LICENSE_FILES = COPYING
SQUID_AUTORECONF = YES
SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
-SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
- ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
- ac_cv_func_strnstr=no ac_cv_have_squid=yes
-SQUID_CONF_OPTS = --enable-async-io=8 --enable-linux-netfilter \
- --enable-removal-policies="lru,heap" \
- --with-filedescriptors=1024 --disable-ident-lookups \
- --with-krb5-config=no \
- --enable-auth-basic="fake getpwnam" \
- --enable-auth-digest="file" \
- --enable-auth-negotiate="wrapper" \
- --enable-auth-ntlm="fake" \
- --disable-strict-error-checking \
- --enable-external-acl-helpers="file_userip" \
- --with-logdir=/var/log/squid/ \
- --with-pidfile=/var/run/squid.pid \
- --with-swapdir=/var/cache/squid/ \
- --enable-icap-client
+SQUID_CONF_ENV = \
+ ac_cv_epoll_works=yes \
+ ac_cv_func_setresuid=yes \
+ ac_cv_func_va_copy=yes \
+ ac_cv_func___va_copy=yes \
+ ac_cv_func_strnstr=no \
+ ac_cv_have_squid=yes
+SQUID_CONF_OPTS = \
+ --enable-async-io=8 \
+ --enable-linux-netfilter \
+ --enable-removal-policies="lru,heap" \
+ --with-filedescriptors=1024 \
+ --disable-ident-lookups \
+ --with-krb5-config=no \
+ --enable-auth-basic="fake getpwnam" \
+ --enable-auth-digest="file" \
+ --enable-auth-negotiate="wrapper" \
+ --enable-auth-ntlm="fake" \
+ --disable-strict-error-checking \
+ --enable-external-acl-helpers="file_userip" \
+ --with-logdir=/var/log/squid/ \
+ --with-pidfile=/var/run/squid.pid \
+ --with-swapdir=/var/cache/squid/ \
+ --enable-icap-client
# On uClibc librt needs libpthread
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index dedeb70..69eb717 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -8,10 +8,14 @@ TCPDUMP_VERSION = 4.6.2
TCPDUMP_SITE = http://www.tcpdump.org/release
TCPDUMP_LICENSE = BSD-3c
TCPDUMP_LICENSE_FILES = LICENSE
-TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no \
- PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
-TCPDUMP_CONF_OPTS = --without-crypto --with-system-libpcap \
- $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
+TCPDUMP_CONF_ENV = \
+ ac_cv_linux_vers=2 \
+ td_cv_buggygetaddrinfo=no \
+ PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
+TCPDUMP_CONF_OPTS = \
+ --without-crypto \
+ --with-system-libpcap \
+ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
TCPDUMP_DEPENDENCIES = zlib libpcap
# Patching aclocal.m4
TCPDUMP_AUTORECONF = YES
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
index c8bcfae..f4a8c84 100644
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -25,13 +25,14 @@ VDE2_AUTORECONF = YES
#
# Note: disabled features can be added with corresponding dependencies
# in future commits.
-VDE2_CONF_OPTS = --disable-experimental \
- --disable-cryptcab \
- --disable-pcap \
- --disable-python \
- --disable-profile \
- --disable-kernel-switch \
- --enable-tuntap \
+VDE2_CONF_OPTS = \
+ --disable-experimental \
+ --disable-cryptcab \
+ --disable-pcap \
+ --disable-python \
+ --disable-profile \
+ --disable-kernel-switch \
+ --enable-tuntap \
#??Package does not build in parallel due to improper make rules
VDE2_MAKE = $(MAKE1)
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 3b69141..5baa515 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -54,12 +54,15 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
mcookie \
host-pkgconf
-XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
- --disable-xnest --disable-xephyr --disable-dmx \
- --with-builder-addr=buildroot at buildroot.org \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
- --with-fontrootdir=/usr/share/fonts/X11/ \
- --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
+XSERVER_XORG_SERVER_CONF_OPTS = \
+ --disable-config-hal \
+ --disable-xnest \
+ --disable-xephyr \
+ --disable-dmx \
+ --with-builder-addr=buildroot at buildroot.org \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
+ --with-fontrootdir=/usr/share/fonts/X11/ \
+ --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
@@ -69,8 +72,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive --enable-xfbdev \
- --disable-glx --disable-dri --disable-xsdl
+XSERVER_XORG_SERVER_CONF_OPTS += \
+ --enable-kdrive \
+ --enable-xfbdev \
+ --disable-glx \
+ --disable-dri \
+ --disable-xsdl
define XSERVER_CREATE_X_SYMLINK
ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
endef
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-12-22 8:27 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2014-12-22 8:27 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=dd7346f415f84c645b5fbaee8789b78472849dc6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/avahi/avahi.mk | 28 ++--
package/beecrypt/beecrypt.mk | 8 +-
package/bind/bind.mk | 6 +-
package/dbus-glib/dbus-glib.mk | 24 ++--
package/dbus/dbus.mk | 20 ++--
package/directfb/directfb.mk | 8 +-
package/fontconfig/fontconfig.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 6 +-
.../gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 2 +-
.../gstreamer/gst-plugins-base/gst-plugins-base.mk | 8 +-
.../gstreamer/gst-plugins-good/gst-plugins-good.mk | 20 ++--
.../gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
package/gstreamer/gstreamer/gstreamer.mk | 12 +-
package/gtk2-engines/gtk2-engines.mk | 138 ++++++++++----------
package/libfuse/libfuse.mk | 6 +-
package/libglib2/libglib2.mk | 72 +++++-----
package/libgtk2/libgtk2.mk | 12 +-
package/libmad/libmad.mk | 12 +-
package/libtheora/libtheora.mk | 10 +-
package/network-manager/network-manager.mk | 18 ++--
package/nfs-utils/nfs-utils.mk | 14 +-
package/prboom/prboom.mk | 12 +-
package/sdl_net/sdl_net.mk | 4 +-
package/sudo/sudo.mk | 14 +-
package/tcl/tcl.mk | 14 +-
package/uclibc/uclibc.mk | 8 +-
package/vtun/vtun.mk | 6 +-
27 files changed, 243 insertions(+), 243 deletions(-)
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index e8944d6..cd25748 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -68,20 +68,20 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
DATADIRNAME=share
AVAHI_CONF_OPTS = \
- --disable-qt3 \
- --disable-qt4 \
- --disable-gdbm \
- --disable-pygtk \
- --disable-mono \
- --disable-monodoc \
- --disable-stack-protector \
- --with-distro=none \
- --disable-manpages \
- $(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \
- --with-avahi-user=avahi \
- --with-avahi-group=avahi \
- --with-autoipd-user=avahi \
- --with-autoipd-group=avahi
+ --disable-qt3 \
+ --disable-qt4 \
+ --disable-gdbm \
+ --disable-pygtk \
+ --disable-mono \
+ --disable-monodoc \
+ --disable-stack-protector \
+ --with-distro=none \
+ --disable-manpages \
+ $(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \
+ --with-avahi-user=avahi \
+ --with-avahi-group=avahi \
+ --with-autoipd-user=avahi \
+ --with-autoipd-group=avahi
AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
host-pkgconf host-gettext
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index 7d2ee08..cd0b4ac 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -12,10 +12,10 @@ BEECRYPT_LICENSE = LGPLv2.1+
BEECRYPT_LICENSE_FILES = COPYING.LIB
BEECRYPT_CONF_OPTS = \
- --disable-expert-mode \
- --without-java \
- --without-python \
- --disable-openmp
+ --disable-expert-mode \
+ --without-java \
+ --without-python \
+ --disable-openmp
ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
BEECRYPT_DEPENDENCIES += icu
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 6c17b13..cb9a7a2 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -21,9 +21,9 @@ BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
BUILD_CFLAGS="$(TARGET_CFLAGS)"
BIND_CONF_OPTS = \
- --with-randomdev=/dev/urandom \
- --enable-epoll --with-libtool \
- --with-gssapi=no --enable-rrl
+ --with-randomdev=/dev/urandom \
+ --enable-epoll --with-libtool \
+ --with-gssapi=no --enable-rrl
ifeq ($(BR2_PACKAGE_LIBCAP),y)
BIND_CONF_OPTS += --enable-linux-caps
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 369bac9..a251b86 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -15,24 +15,24 @@ DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \
have_abstract_sockets=yes
DBUS_GLIB_CONF_OPTS = \
- --disable-tests \
- --disable-xml-docs \
- --with-introspect-xml=$(DBUS_HOST_INTROSPECT) \
- --with-dbus-binding-tool=$(DBUS_GLIB_HOST_BINARY) \
- --disable-bash-completion \
- --disable-doxygen-docs \
- --enable-asserts=yes
+ --disable-tests \
+ --disable-xml-docs \
+ --with-introspect-xml=$(DBUS_HOST_INTROSPECT) \
+ --with-dbus-binding-tool=$(DBUS_GLIB_HOST_BINARY) \
+ --disable-bash-completion \
+ --disable-doxygen-docs \
+ --enable-asserts=yes
DBUS_GLIB_DEPENDENCIES = host-pkgconf dbus host-dbus host-dbus-glib libglib2 expat
HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2
HOST_DBUS_GLIB_CONF_OPTS = \
- --disable-tests \
- --disable-xml-docs \
- --disable-bash-completion \
- --disable-doxygen-docs \
- --enable-asserts=yes
+ --disable-tests \
+ --disable-xml-docs \
+ --disable-bash-completion \
+ --disable-doxygen-docs \
+ --enable-asserts=yes
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 8d02b42..77ea502 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -87,16 +87,16 @@ endef
HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
HOST_DBUS_CONF_OPTS = \
- --with-dbus-user=dbus \
- --disable-tests \
- --disable-asserts \
- --enable-abstract-sockets \
- --disable-selinux \
- --disable-xml-docs \
- --disable-doxygen-docs \
- --enable-dnotify \
- --without-x \
- --with-xml=expat
+ --with-dbus-user=dbus \
+ --disable-tests \
+ --disable-asserts \
+ --enable-abstract-sockets \
+ --disable-selinux \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --enable-dnotify \
+ --without-x \
+ --with-xml=expat
# dbus for the host
DBUS_HOST_INTROSPECT = $(HOST_DBUS_DIR)/introspect.xml
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 4e4a3c0..e3dc506 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -144,10 +144,10 @@ endif
HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng
HOST_DIRECTFB_CONF_OPTS = \
- --disable-multi \
- --enable-png \
- --with-gfxdrivers=none \
- --with-inputdrivers=none
+ --disable-multi \
+ --enable-png \
+ --with-gfxdrivers=none \
+ --with-inputdrivers=none
HOST_DIRECTFB_BUILD_CMDS = \
$(MAKE) -C $(@D)/tools directfb-csource
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index f13ad49..863fa26 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -16,7 +16,7 @@ FONTCONFIG_CONF_OPTS = --with-arch=$(GNU_TARGET_NAME) \
--disable-docs
HOST_FONTCONFIG_CONF_OPTS = \
- --disable-static
+ --disable-static
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 0fc7877..b1d8f8b 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -21,9 +21,9 @@ GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-l
endif
GST_FFMPEG_CONF_EXTRA_OPTS = \
- --cross-prefix=$(TARGET_CROSS) \
- --target-os=linux \
- --pkg-config='$(PKG_CONFIG_HOST_BINARY)'
+ --cross-prefix=$(TARGET_CROSS) \
+ --target-os=linux \
+ --pkg-config='$(PKG_CONFIG_HOST_BINARY)'
ifeq ($(BR2_PACKAGE_ZLIB),y)
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index 2413995..ea0bd60 100644
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -9,7 +9,7 @@ GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
GST_PLUGINS_BAD_CONF_OPTS = \
- --disable-examples
+ --disable-examples
GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index 7e461df..08733d1 100644
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -17,10 +17,10 @@ GST_PLUGINS_BASE_CONF_ENV =
ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_OPTS = \
- --disable-examples \
- --disable-oggtest \
- --disable-vorbistest \
- --disable-freetypetest
+ --disable-examples \
+ --disable-oggtest \
+ --disable-vorbistest \
+ --disable-freetypetest
GST_PLUGINS_BASE_DEPENDENCIES = gstreamer
diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index 2c2706a..fee83a1 100644
--- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -9,16 +9,16 @@ GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
GST_PLUGINS_GOOD_CONF_OPTS = \
- --disable-examples \
- --disable-directsound \
- --disable-sunaudio \
- --disable-osx_audio \
- --disable-osx_video \
- --disable-aalib \
- --disable-aalibtest \
- --disable-esd \
- --disable-esdtest \
- --disable-shout2
+ --disable-examples \
+ --disable-directsound \
+ --disable-sunaudio \
+ --disable-osx_audio \
+ --disable-osx_video \
+ --disable-aalib \
+ --disable-aalibtest \
+ --disable-esd \
+ --disable-esdtest \
+ --disable-shout2
GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index f8ec980..e8f2362 100644
--- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -9,7 +9,7 @@ GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST_PLUGINS_UGLY_CONF_OPTS = \
- --disable-examples
+ --disable-examples
GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base
diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
index 8d05c3b..62c4935 100644
--- a/package/gstreamer/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
@@ -20,12 +20,12 @@ GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes
endif
GSTREAMER_CONF_OPTS = \
- --disable-examples \
- --disable-tests \
- --disable-failing-tests \
- --disable-loadsave \
- $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \
- $(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry)
+ --disable-examples \
+ --disable-tests \
+ --disable-failing-tests \
+ --disable-loadsave \
+ $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \
+ $(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry)
GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index e89b978..9b285f6 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -13,76 +13,76 @@ GTK2_ENGINES_LICENSE = LGPLv2.1+
GTK2_ENGINES_LICENSE_FILES = COPYING
GTK2_ENGINES_CONF_ENV = \
- ac_cv_func_posix_getpwuid_r=yes \
- glib_cv_stack_grows=no \
- glib_cv_uscore=no \
- ac_cv_func_strtod=yes \
- ac_fsusage_space=yes \
- fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no \
- ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no \
- ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes \
- ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes \
- ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=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 \
- jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes \
- jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no \
- ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no \
- gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes \
- ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no \
- gl_cv_func_mkstemp_limitations=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_CUPS_CONFIG=no
+ ac_cv_func_posix_getpwuid_r=yes \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=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_CUPS_CONFIG=no
GTK2_ENGINES_CONF_OPTS = \
- --with-x \
- --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib \
- --disable-glibtest \
- --enable-explicit-deps=no \
- --enable-clearlooks \
- --disable-crux \
- --disable-hc \
- --disable-industrial \
- --disable-mist \
- --disable-redmond \
- --disable-smooth \
- --disable-glide \
- --disable-thinice \
- --enable-animation \
- --disable-development \
- --disable-paranoia \
- --disable-deprecated
+ --with-x \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib \
+ --disable-glibtest \
+ --enable-explicit-deps=no \
+ --enable-clearlooks \
+ --disable-crux \
+ --disable-hc \
+ --disable-industrial \
+ --disable-mist \
+ --disable-redmond \
+ --disable-smooth \
+ --disable-glide \
+ --disable-thinice \
+ --enable-animation \
+ --disable-development \
+ --disable-paranoia \
+ --disable-deprecated
$(eval $(autotools-package))
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index aa06d34..000d2b4 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -12,9 +12,9 @@ LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
LIBFUSE_INSTALL_STAGING = YES
LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
LIBFUSE_CONF_OPTS = \
- --disable-example \
- --enable-lib \
- --enable-util
+ --disable-example \
+ --enable-lib \
+ --enable-util
define LIBFUSE_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 581c51c..fa909cd 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -15,38 +15,38 @@ LIBGLIB2_INSTALL_STAGING = YES
LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
LIBGLIB2_CONF_ENV = \
- ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
- glib_cv_uscore=no ac_cv_func_strtod=yes \
- ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=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 \
- jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=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)
+ ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
+ glib_cv_uscore=no ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=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 \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=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)
# old uClibc versions don't provide qsort_r
ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
@@ -61,10 +61,10 @@ LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no
endif
HOST_LIBGLIB2_CONF_OPTS = \
- --disable-dtrace \
- --disable-systemtap \
- --disable-gcov \
- --disable-modular-tests
+ --disable-dtrace \
+ --disable-systemtap \
+ --disable-gcov \
+ --disable-modular-tests
LIBGLIB2_CONF_OPTS += --disable-modular-tests
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 6a78a98..89faca3 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -157,12 +157,12 @@ endif
HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf
HOST_LIBGTK2_CONF_OPTS = \
- --disable-static \
- --disable-glibtest \
- --without-libtiff \
- --without-libjpeg \
- --with-gdktarget=none \
- --disable-cups
+ --disable-static \
+ --disable-glibtest \
+ --without-libtiff \
+ --without-libjpeg \
+ --with-gdktarget=none \
+ --disable-cups
define HOST_LIBGTK2_BUILD_CMDS
$(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 05e2d86..9c152f9 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -31,11 +31,11 @@ LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
LIBMAD_CONF_OPTS = \
- --disable-debugging \
- $(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED),--enable-speed) \
- $(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY),--enable-accuracy) \
- --$(if $(BR2_PACKAGE_LIBMAD_SSO),enable,disable)-sso \
- --$(if $(BR2_PACKAGE_LIBMAD_ASO),enable,disable)-aso \
- --$(if $(BR2_PACKAGE_LIBMAD_STRICT_ISO),enable,disable)-strict-iso
+ --disable-debugging \
+ $(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED),--enable-speed) \
+ $(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY),--enable-accuracy) \
+ --$(if $(BR2_PACKAGE_LIBMAD_SSO),enable,disable)-sso \
+ --$(if $(BR2_PACKAGE_LIBMAD_ASO),enable,disable)-aso \
+ --$(if $(BR2_PACKAGE_LIBMAD_STRICT_ISO),enable,disable)-strict-iso
$(eval $(autotools-package))
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 7eb8206..480af75 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -12,11 +12,11 @@ LIBTHEORA_LICENSE = BSD-3c
LIBTHEORA_LICENSE_FILES = COPYING LICENSE
LIBTHEORA_CONF_OPTS = \
- --disable-oggtest \
- --disable-vorbistest \
- --disable-sdltest \
- --disable-examples \
- --disable-spec
+ --disable-oggtest \
+ --disable-vorbistest \
+ --disable-sdltest \
+ --disable-examples \
+ --disable-spec
LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkgconf
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 3f6512c..5540bc4 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -24,15 +24,15 @@ NETWORK_MANAGER_CONF_ENV = \
NETWORK_MANAGER_CONF_OPTS = \
- --mandir=$(STAGING_DIR)/usr/man/ \
- --disable-tests \
- --disable-qt \
- --disable-more-warnings \
- --without-docs \
- --with-crypto=gnutls \
- --with-iptables=/usr/sbin/iptables \
- --disable-ifupdown \
- --disable-ifnet
+ --mandir=$(STAGING_DIR)/usr/man/ \
+ --disable-tests \
+ --disable-qt \
+ --disable-more-warnings \
+ --without-docs \
+ --with-crypto=gnutls \
+ --with-iptables=/usr/sbin/iptables \
+ --disable-ifupdown \
+ --disable-ifnet
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
NETWORK_MANAGER_DEPENDENCIES += newt
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 91a1baf..cec21e8 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -15,13 +15,13 @@ NFS_UTILS_DEPENDENCIES = host-pkgconf
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
NFS_UTILS_CONF_OPTS = \
- --disable-nfsv4 \
- --disable-nfsv41 \
- --disable-gss \
- --disable-uuid \
- --disable-ipv6 \
- --without-tcp-wrappers \
- --with-rpcgen=internal
+ --disable-nfsv4 \
+ --disable-nfsv41 \
+ --disable-gss \
+ --disable-uuid \
+ --disable-ipv6 \
+ --without-tcp-wrappers \
+ --with-rpcgen=internal
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
index 7f9d6a0..5612cc6 100644
--- a/package/prboom/prboom.mk
+++ b/package/prboom/prboom.mk
@@ -22,12 +22,12 @@ PRBOOM_CONF_ENV += LIBS="$(shell $(STAGING_DIR)/usr/bin/sdl-config --static-libs
endif
PRBOOM_CONF_OPTS = \
- --oldincludedir=$(STAGING_DIR)/usr/include \
- --with-sdl-prefix=$(STAGING_DIR)/usr \
- --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
- --disable-cpu-opt \
- --disable-sdltest \
- --disable-gl
+ --oldincludedir=$(STAGING_DIR)/usr/include \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+ --disable-cpu-opt \
+ --disable-sdltest \
+ --disable-gl
# endianness detection isn't used when cross compiling
define PRBOOM_BIG_ENDIAN_FIXUP
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index 0800a9e..4534dee 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -11,8 +11,8 @@ SDL_NET_LICENSE = zlib
SDL_NET_LICENSE_FILES = COPYING
SDL_NET_CONF_OPTS = \
- --with-sdl-prefix=$(STAGING_DIR)/usr \
- --with-sdl-exec-prefix=$(STAGING_DIR)/usr
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
SDL_NET_INSTALL_STAGING = YES
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index df3910e..dafd717 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -12,13 +12,13 @@ SUDO_LICENSE_FILES = doc/LICENSE
# Run autoreconf to regenerate ltmain.sh.
SUDO_AUTORECONF = YES
SUDO_CONF_OPTS = \
- --without-lecture \
- --without-sendmail \
- --without-umask \
- --with-logging=syslog \
- --without-interfaces \
- --without-pam \
- --with-env-editor
+ --without-lecture \
+ --without-sendmail \
+ --without-umask \
+ --with-logging=syslog \
+ --without-interfaces \
+ --without-pam \
+ --with-env-editor
# mksigname/mksiglist needs to run on build host to generate source files
define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index ef0983b..1ebba1e 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -19,15 +19,15 @@ TCL_AUTORECONF = YES
# configured). Don't need to worry about conditionally including
# it in the configure options
TCL_CONF_OPTS = \
- --disable-symbols \
- --disable-langinfo \
- --disable-framework \
- --with-system-sqlite
+ --disable-symbols \
+ --disable-langinfo \
+ --disable-framework \
+ --with-system-sqlite
HOST_TCL_CONF_OPTS = \
- --disable-symbols \
- --disable-langinfo \
- --disable-framework
+ --disable-symbols \
+ --disable-langinfo \
+ --disable-framework
# I haven't found a good way to force pkgs to not build
# or configure without just removing the entire pkg directory.
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 2bb699f..d3b11f6 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -40,10 +40,10 @@ endif
UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
UCLIBC_KCONFIG_OPTS = \
- $(UCLIBC_MAKE_FLAGS) \
- PREFIX=$(STAGING_DIR) \
- DEVEL_PREFIX=/usr/ \
- RUNTIME_PREFIX=$(STAGING_DIR)/ \
+ $(UCLIBC_MAKE_FLAGS) \
+ PREFIX=$(STAGING_DIR) \
+ DEVEL_PREFIX=/usr/ \
+ RUNTIME_PREFIX=$(STAGING_DIR)/ \
UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 8f6b06b..2b64ab9 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -10,8 +10,8 @@ VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
VTUN_AUTORECONF = YES
VTUN_CONF_OPTS = \
- --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
- --with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \
- --with-lzo-lib=$(STAGING_DIR)/usr/lib
+ --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
+ --with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \
+ --with-lzo-lib=$(STAGING_DIR)/usr/lib
$(eval $(autotools-package))
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-12-20 20:48 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2014-12-20 20:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=2f2c799697e29a3cf212f96c1e239292cea7ec47
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/lxc/Config.in | 2 +-
package/python-ipaddr/Config.in | 4 ++--
package/qemu/Config.in | 10 +++++-----
package/qt5/qt5base/Config.in | 4 ++--
package/squid/Config.in | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index a90e58e..cf715ab 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -23,4 +23,4 @@ comment "lxc needs a toolchain w/ IPv6, threads, largefile, headers >= 3.0"
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS \
- || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+ || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
diff --git a/package/python-ipaddr/Config.in b/package/python-ipaddr/Config.in
index cce67c1..746d720 100644
--- a/package/python-ipaddr/Config.in
+++ b/package/python-ipaddr/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PYTHON_IPADDR
- depends on BR2_PACKAGE_PYTHON # included since python3.3
- bool "python-ipaddr"
+ depends on BR2_PACKAGE_PYTHON # included since python3.3
+ bool "python-ipaddr"
help
An IPv4/IPv6 manipulation library in Python. This library is
used to create/poke/manipulate IPv4 and IPv6 addresses and
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index ff11208..5882571 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -85,11 +85,11 @@ config BR2_PACKAGE_QEMU_SDL
comment "Misc. features"
config BR2_PACKAGE_QEMU_FDT
- bool "Enable FDT"
- select BR2_PACKAGE_DTC
- help
- Say 'y' here to have QEMU capable of constructing Device Trees,
- and passing them to the VMs.
+ bool "Enable FDT"
+ select BR2_PACKAGE_DTC
+ help
+ Say 'y' here to have QEMU capable of constructing Device Trees,
+ and passing them to the VMs.
endif # BR2_PACKAGE_QEMU_HAS_EMULS
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 7b334b4..30f9a49 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -37,7 +37,7 @@ config BR2_PACKAGE_QT5BASE_EXAMPLES
If unsure, say N.
config BR2_PACKAGE_QT5BASE_NETWORK
- def_bool y
+ def_bool y
config BR2_PACKAGE_QT5BASE_CONCURRENT
bool "concurrent module"
@@ -45,7 +45,7 @@ config BR2_PACKAGE_QT5BASE_CONCURRENT
This options enables the Qt5Concurrent library.
config BR2_PACKAGE_QT5BASE_SQL
- def_bool y
+ def_bool y
if BR2_PACKAGE_QT5BASE_SQL
config BR2_PACKAGE_QT5BASE_MYSQL
diff --git a/package/squid/Config.in b/package/squid/Config.in
index ce38371..9953b0d 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -2,7 +2,7 @@ comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.0"
depends on BR2_USE_MMU
depends on !BR2_avr32 # toolchain too old
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 \
- || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
config BR2_PACKAGE_SQUID
bool "squid"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-12-10 20:53 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2014-12-10 20:53 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=5d4734084d2809b5ffae241d62a485e7499ab53b
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
fs/common.mk | 2 +-
package/omniorb/omniorb.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/common.mk b/fs/common.mk
index d40f5ae..13bf4ad 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -106,7 +106,7 @@ endif
endef
define ROOTFS_TARGET
-$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
+ $(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
endef
include $(sort $(wildcard fs/*/*.mk))
diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index 25d3b73..82d6807 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -37,7 +37,7 @@ HOST_OMNIORB_CONF_OPTS += --disable-longdouble
# required. The tools however are host related and should never
# be required on target.
define OMNIORB_ENABLE_EXTRA_APPS
-$(SED) 's:SUBDIRS += lib:SUBDIRS += lib appl services:g' $(@D)/src/dir.mk
+ $(SED) 's:SUBDIRS += lib:SUBDIRS += lib appl services:g' $(@D)/src/dir.mk
endef
ifeq ($(BR2_PACKAGE_OMNIORB_WITH_APPS),y)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
2014-11-03 7:33 ` Thomas Petazzoni
@ 2014-11-03 8:00 ` Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2014-11-03 8:00 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Dear Peter Korsgaard,
> On Sun, 2 Nov 2014 23:27:01 +0100, Peter Korsgaard wrote:
>> diff --git a/package/gdb/Config.in b/package/gdb/Config.in
>> index a96df1e..b211878 100644
>> --- a/package/gdb/Config.in
>> +++ b/package/gdb/Config.in
>> @@ -8,7 +8,7 @@ config BR2_PACKAGE_GDB
>> # target, we don't allow building a separate gdbserver. The
>> # one from the external toolchain should be used.
>> select BR2_PACKAGE_GDB_SERVER if \
>> - (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
>> + (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
> Is this really the rule that we want for Config.in file? I do prefer to
> align with the previous line rather than enforcing the use of a fixed
> number of tabs. But I guess it's a matter of taste.
I must say I was hessitating with this commit. Some of the changes I
liked, others less so.
In general, as long as the text is readable and files are not too
inconsistent then I don't care much about these details.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
2014-11-02 22:27 Peter Korsgaard
@ 2014-11-03 7:33 ` Thomas Petazzoni
2014-11-03 8:00 ` Peter Korsgaard
0 siblings, 1 reply; 16+ messages in thread
From: Thomas Petazzoni @ 2014-11-03 7:33 UTC (permalink / raw)
To: buildroot
Dear Peter Korsgaard,
On Sun, 2 Nov 2014 23:27:01 +0100, Peter Korsgaard wrote:
> diff --git a/package/gdb/Config.in b/package/gdb/Config.in
> index a96df1e..b211878 100644
> --- a/package/gdb/Config.in
> +++ b/package/gdb/Config.in
> @@ -8,7 +8,7 @@ config BR2_PACKAGE_GDB
> # target, we don't allow building a separate gdbserver. The
> # one from the external toolchain should be used.
> select BR2_PACKAGE_GDB_SERVER if \
> - (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
> + (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
Is this really the rule that we want for Config.in file? I do prefer to
align with the previous line rather than enforcing the use of a fixed
number of tabs. But I guess it's a matter of taste.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-11-02 22:27 Peter Korsgaard
2014-11-03 7:33 ` Thomas Petazzoni
0 siblings, 1 reply; 16+ messages in thread
From: Peter Korsgaard @ 2014-11-02 22:27 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e80053176125d5345d7bdf0ee1f45c837728f62d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/gdb/Config.in | 2 +-
package/gpm/gpm.mk | 4 +-
package/gptfdisk/Config.in | 2 +-
package/gptfdisk/gptfdisk.mk | 2 +-
package/jquery-ui-themes/Config.in | 48 ++++++++++----------
package/libcap/libcap.mk | 2 +-
package/libglade/libglade.mk | 2 +-
package/libgtk3/Config.in | 2 +-
package/libnss/libnss.mk | 18 ++++----
package/libplayer/Config.in | 2 +-
package/libuv/libuv.mk | 2 +-
package/luajit/Config.in | 2 +-
package/mplayer/Config.in | 4 +-
package/ndisc6/ndisc6.mk | 6 +-
package/nss-mdns/nss-mdns.mk | 2 +-
package/numactl/Config.in | 4 +-
package/pkg-luarocks.mk | 4 +-
package/pulseaudio/pulseaudio.mk | 4 +-
package/qemu/qemu.mk | 78 +++++++++++++++++-----------------
package/rpi-userland/rpi-userland.mk | 2 +-
package/spice/spice.mk | 2 +-
package/strace/Config.in | 4 +-
package/tcl/tcl.mk | 26 ++++++------
package/tinyalsa/tinyalsa.mk | 6 +-
package/tvheadend/tvheadend.mk | 2 +-
package/tz/tz.mk | 18 ++++----
package/uclibc/uclibc.mk | 2 +-
package/upx/upx.mk | 4 +-
package/wayland/wayland.mk | 6 +-
package/webkit/webkit.mk | 2 +-
package/x11r7/xcb-proto/xcb-proto.mk | 2 +-
package/xenomai/Config.in | 2 +-
32 files changed, 134 insertions(+), 134 deletions(-)
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index a96df1e..b211878 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_GDB
# target, we don't allow building a separate gdbserver. The
# one from the external toolchain should be used.
select BR2_PACKAGE_GDB_SERVER if \
- (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
+ (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
depends on !BR2_nios2
help
diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk
index 7a44b09..dcf075a 100644
--- a/package/gpm/gpm.mk
+++ b/package/gpm/gpm.mk
@@ -53,8 +53,8 @@ GPM_POST_PATCH_HOOKS += GPM_DISABLE_DOC_INSTALL
ifeq ($(BR2_PACKAGE_GPM_INSTALL_TEST_TOOLS),)
define GPM_REMOVE_TEST_TOOLS_FROM_TARGET
for tools in mev hltest mouse-test display-buttons \
- get-versions display-coords; do \
- rm -f $(TARGET_DIR)/usr/bin/$$tools ; \
+ get-versions display-coords; do \
+ rm -f $(TARGET_DIR)/usr/bin/$$tools ; \
done
endef
GPM_POST_INSTALL_TARGET_HOOKS += GPM_REMOVE_TEST_TOOLS_FROM_TARGET
diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index ae90fa9..d16781f 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_GPTFDISK
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_GPTFDISK_GDISK if \
- !(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK)
+ !(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK)
help
GPT fdisk (consisting of the gdisk and sgdisk programs) is a
text-mode partitioning tool that works on Globally Unique Identifier
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index f6e9ecd..9828d4c 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -33,7 +33,7 @@ endef
define GPTFDISK_INSTALL_TARGET_CMDS
for i in $(GPTFDISK_TARGETS_y); do \
- $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i; \
+ $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i; \
done
endef
diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
index 5168f37..bea1a43 100644
--- a/package/jquery-ui-themes/Config.in
+++ b/package/jquery-ui-themes/Config.in
@@ -14,76 +14,76 @@ choice
Specify the jQuery UI theme to install.
config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
- bool "black-tie"
+ bool "black-tie"
config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
- bool "blitzer"
+ bool "blitzer"
config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
- bool "cupertino"
+ bool "cupertino"
config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
- bool "dark-hive"
+ bool "dark-hive"
config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
- bool "dot-luv"
+ bool "dot-luv"
config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
- bool "eggplant"
+ bool "eggplant"
config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
- bool "excite-bike"
+ bool "excite-bike"
config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
- bool "flick"
+ bool "flick"
config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
- bool "hot-sneaks"
+ bool "hot-sneaks"
config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
- bool "humanity"
+ bool "humanity"
config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
- bool "le-frog"
+ bool "le-frog"
config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
- bool "mint-choc"
+ bool "mint-choc"
config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
- bool "overcast"
+ bool "overcast"
config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
- bool "pepper-grinder"
+ bool "pepper-grinder"
config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
- bool "redmond"
+ bool "redmond"
config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
- bool "smoothness"
+ bool "smoothness"
config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
- bool "south-street"
+ bool "south-street"
config BR2_PACKAGE_JQUERY_UI_THEME_START
- bool "start"
+ bool "start"
config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
- bool "sunny"
+ bool "sunny"
config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
- bool "swanky-purse"
+ bool "swanky-purse"
config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
- bool "trontastic"
+ bool "trontastic"
config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
- bool "ui-darkness"
+ bool "ui-darkness"
config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
- bool "ui-lightness"
+ bool "ui-lightness"
config BR2_PACKAGE_JQUERY_UI_THEME_VADER
- bool "vader"
+ bool "vader"
endchoice
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 43c3e7e..42bd19a 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -39,7 +39,7 @@ LIBCAP_MAKE_FLAGS = \
ifeq ($(BR2_PACKAGE_LIBCAP_TOOLS),y)
define LIBCAP_BUILD_TOOLS_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \
- $(LIBCAP_MAKE_FLAGS)
+ $(LIBCAP_MAKE_FLAGS)
endef
define LIBCAP_INSTALL_TOOLS_CMDS
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 7bec938..a6eea09 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -15,7 +15,7 @@ LIBGLADE_LICENSE_FILES = COPYING
define LIBGLADE_INSTALL_FIX
rm -rf $(TARGET_DIR)/usr/share/xml/libglade \
- $(TARGET_DIR)/usr/bin/libglade-convert
+ $(TARGET_DIR)/usr/bin/libglade-convert
endef
LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX
diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
index 07e44f7..cdc3b2d 100644
--- a/package/libgtk3/Config.in
+++ b/package/libgtk3/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBGTK3
select BR2_PACKAGE_GDK_PIXBUF
# atleast 1 backend must be enabled
select BR2_PACKAGE_LIBGTK3_BROADWAY if \
- !(BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND)
+ !(BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND)
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
depends on BR2_USE_MMU # glib2
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index e7b92e4..4e174f6 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -39,16 +39,16 @@ endif
define LIBNSS_BUILD_CMDS
$(MAKE1) -C $(@D)/nss coreconf \
- SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
- DIST=$(@D)/$(LIBNSS_DISTDIR) \
- CHECKLOC= \
- $(LIBNSS_BUILD_VARS)
+ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
+ DIST=$(@D)/$(LIBNSS_DISTDIR) \
+ CHECKLOC= \
+ $(LIBNSS_BUILD_VARS)
$(MAKE1) -C $(@D)/nss lib/dbm all \
- SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
- DIST=$(@D)/$(LIBNSS_DISTDIR) \
- CHECKLOC= \
- $(LIBNSS_BUILD_VARS) TARGET_OPTIMIZER="$(TARGET_CFLAGS)" \
- NATIVE_FLAGS="$(HOST_CFLAGS)"
+ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
+ DIST=$(@D)/$(LIBNSS_DISTDIR) \
+ CHECKLOC= \
+ $(LIBNSS_BUILD_VARS) TARGET_OPTIMIZER="$(TARGET_CFLAGS)" \
+ NATIVE_FLAGS="$(HOST_CFLAGS)"
endef
define LIBNSS_INSTALL_STAGING_CMDS
diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index 703b96d..603bae8 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER
bool "mplayer backend"
# mplayer
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb || \
- BR2_microblaze || BR2_aarch64 || BR2_nios2)
+ BR2_microblaze || BR2_aarch64 || BR2_nios2)
# mplayer
depends on BR2_LARGEFILE
# mplayer
diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk
index 76a4601..08bf8c5 100644
--- a/package/libuv/libuv.mk
+++ b/package/libuv/libuv.mk
@@ -20,7 +20,7 @@ LIBUV_LICENSE_FILES = LICENSE
# 1.14, so we need it.
define LIBUV_FIXUP_AUTOGEN
echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
- >$(@D)/m4/libuv-extra-automake-flags.m4
+ >$(@D)/m4/libuv-extra-automake-flags.m4
endef
LIBUV_POST_PATCH_HOOKS += LIBUV_FIXUP_AUTOGEN
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 57c9e2d..c505f6a 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LUAJIT
# Luajit is only available for some target architectures, and
# has some complexity wrt 32/64. See luajit.mk for details.
depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb \
- || ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT)
+ || ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT)
# luajit.mk uses the "-m32" compiler option to build 32bit
# binaries, so check if that option is supported. See
# luajit.mk for details.
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 8b5d05e..978eefe 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_MPLAYER
bool "mplayer"
# Those architectures are not supported by MPlayer
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
- || BR2_microblaze || BR2_aarch64 || BR2_nios2)
+ || BR2_microblaze || BR2_aarch64 || BR2_nios2)
# Broken support for <ARMv5
depends on !(BR2_arm920t || BR2_arm920t || BR2_arm922t || BR2_fa526 \
|| BR2_strongarm)
@@ -30,5 +30,5 @@ endif
comment "mplayer needs a toolchain w/ largefile"
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
- || BR2_microblaze || BR2_aarch64 || BR2_nios2)
+ || BR2_microblaze || BR2_aarch64 || BR2_nios2)
depends on !BR2_LARGEFILE
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index ef48cd2..b0e4caf 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -32,9 +32,9 @@ NDISC6_MAN8_ = $(addsuffix .8,$(NDISC6_SBIN_))
define NDISC6_REMOVE_UNNEEDED
rm -rf $(addprefix $(TARGET_DIR)/usr/bin/,$(NDISC6_BIN_)) \
- $(addprefix $(TARGET_DIR)/usr/sbin/,$(NDISC6_SBIN_)) \
- $(addprefix $(TARGET_DIR)/usr/share/man/man1/,$(NDISC6_MAN1_)) \
- $(addprefix $(TARGET_DIR)/usr/share/man/man8/,$(NDISC6_MAN8_))
+ $(addprefix $(TARGET_DIR)/usr/sbin/,$(NDISC6_SBIN_)) \
+ $(addprefix $(TARGET_DIR)/usr/share/man/man1/,$(NDISC6_MAN1_)) \
+ $(addprefix $(TARGET_DIR)/usr/share/man/man8/,$(NDISC6_MAN8_))
$(if $(BR2_PACKAGE_NDISC6_RDNSSD),,\
rm -rf $(TARGET_DIR)/etc/rdnssd $(TARGET_DIR)/var/run/rdnssd)
endef
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 22c2bc2..9ec9c1a 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -14,7 +14,7 @@ define NSS_MDNS_INSTALL_CONFIG
$(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf ; \
fi
sed -r -i -e 's/^(hosts:[[:space:]]+).*/\1files mdns4_minimal [NOTFOUND=return] dns mdns4/' \
- $(TARGET_DIR)/etc/nsswitch.conf
+ $(TARGET_DIR)/etc/nsswitch.conf
endef
NSS_MDNS_POST_INSTALL_TARGET_HOOKS += NSS_MDNS_INSTALL_CONFIG
diff --git a/package/numactl/Config.in b/package/numactl/Config.in
index 0976de2..b383f69 100644
--- a/package/numactl/Config.in
+++ b/package/numactl/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_NUMACTL
# architectures.
depends on BR2_LARGEFILE
depends on BR2_i386 || BR2_mips || BR2_mipsel || \
- BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
+ BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
help
numactl allows you to run your application on specific cpus
and memory nodes. It does this by supplying a NUMA memory
@@ -14,5 +14,5 @@ config BR2_PACKAGE_NUMACTL
comment "numactl needs a toolchain w/ largefile"
depends on BR2_i386 || BR2_mips || BR2_mipsel || \
- BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
+ BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
depends on !BR2_LARGEFILE
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
index f0fb73d..83f338e 100644
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -49,7 +49,7 @@ $(2)_DEPENDENCIES += host-luarocks luainterpreter
ifndef $(2)_EXTRACT_CMDS
define $(2)_EXTRACT_CMDS
cd $$($(2)_DIR)/.. && \
- $$(LUAROCKS_RUN) unpack --force $$(DL_DIR)/$$($(2)_SOURCE)
+ $$(LUAROCKS_RUN) unpack --force $$(DL_DIR)/$$($(2)_SOURCE)
endef
endif
@@ -59,7 +59,7 @@ endif
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
cd $$($(2)_SRCDIR) && \
- $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
+ $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
endef
endif
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index d24dcc8..e68ca68 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -96,9 +96,9 @@ PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst
ifneq ($(BR2_ENABLE_LOCALE),y)
define PULSEAUDIO_FIXUP_DESKTOP_FILES
cp $(@D)/src/daemon/pulseaudio.desktop.in \
- $(@D)/src/daemon/pulseaudio.desktop
+ $(@D)/src/daemon/pulseaudio.desktop
cp $(@D)/src/daemon/pulseaudio-kde.desktop.in \
- $(@D)/src/daemon/pulseaudio-kde.desktop
+ $(@D)/src/daemon/pulseaudio-kde.desktop
endef
PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FIXUP_DESKTOP_FILES
endif
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 2495674..4b8f0f4 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -124,45 +124,45 @@ QEMU_OPTS += --disable-sdl
endif
define QEMU_CONFIGURE_CMDS
- ( cd $(@D); \
- LIBS='$(QEMU_LIBS)' \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- $(QEMU_VARS) \
- ./configure \
- --prefix=/usr \
- --cross-prefix=$(TARGET_CROSS) \
- --with-system-pixman \
- --audio-drv-list= \
- --enable-kvm \
- --enable-attr \
- --enable-vhost-net \
- --disable-bsd-user \
- --disable-xen \
- --disable-slirp \
- --disable-vnc \
- --disable-virtfs \
- --disable-brlapi \
- --disable-curses \
- --disable-curl \
- --disable-fdt \
- --disable-bluez \
- --disable-guest-base \
- --disable-uuid \
- --disable-vde \
- --disable-linux-aio \
- --disable-cap-ng \
- --disable-docs \
- --disable-spice \
- --disable-rbd \
- --disable-libiscsi \
- --disable-usb-redir \
- --disable-smartcard-nss \
- --disable-strip \
- --disable-seccomp \
- --disable-sparse \
- --disable-tools \
- $(QEMU_OPTS) \
+ ( cd $(@D); \
+ LIBS='$(QEMU_LIBS)' \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(QEMU_VARS) \
+ ./configure \
+ --prefix=/usr \
+ --cross-prefix=$(TARGET_CROSS) \
+ --with-system-pixman \
+ --audio-drv-list= \
+ --enable-kvm \
+ --enable-attr \
+ --enable-vhost-net \
+ --disable-bsd-user \
+ --disable-xen \
+ --disable-slirp \
+ --disable-vnc \
+ --disable-virtfs \
+ --disable-brlapi \
+ --disable-curses \
+ --disable-curl \
+ --disable-fdt \
+ --disable-bluez \
+ --disable-guest-base \
+ --disable-uuid \
+ --disable-vde \
+ --disable-linux-aio \
+ --disable-cap-ng \
+ --disable-docs \
+ --disable-spice \
+ --disable-rbd \
+ --disable-libiscsi \
+ --disable-usb-redir \
+ --disable-smartcard-nss \
+ --disable-strip \
+ --disable-seccomp \
+ --disable-sparse \
+ --disable-tools \
+ $(QEMU_OPTS) \
)
endef
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index feac277..3f92950 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -17,7 +17,7 @@ RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
ifeq ($(BR2_PACKAGE_RPI_USERLAND_START_VCFILED),y)
define RPI_USERLAND_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \
- $(TARGET_DIR)/etc/init.d/S94vcfiled
+ $(TARGET_DIR)/etc/init.d/S94vcfiled
endef
endif
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index be46493..a31d78d 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -58,7 +58,7 @@ SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/
# libjpeg isn't, hence the two-line tweak
define SPICE_POST_INSTALL_STAGING_FIX_PC
$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
- "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
+ "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
endef
SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
diff --git a/package/strace/Config.in b/package/strace/Config.in
index bc521e0..07667ed 100644
--- a/package/strace/Config.in
+++ b/package/strace/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_STRACE
bool "strace"
depends on !BR2_nios2
depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) \
- && BR2_TOOLCHAIN_USES_UCLIBC)
+ && BR2_TOOLCHAIN_USES_UCLIBC)
depends on BR2_LARGEFILE
help
A useful diagnostic, instructional, and debugging tool.
@@ -16,4 +16,4 @@ comment "strace needs a toolchain w/ largefile"
comment "strace is not supported on MIPS using a uClibc toolchain"
depends on (BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && \
- BR2_TOOLCHAIN_USES_UCLIBC
+ BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 7ca51c5..a242760 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -33,20 +33,20 @@ HOST_TCL_CONF_OPTS = \
# or configure without just removing the entire pkg directory.
define HOST_TCL_REMOVE_PACKAGES
rm -fr $(@D)/pkgs/sqlite3.8.0 \
- $(@D)/pkgs/tdbc1.0.0 \
- $(@D)/pkgs/tdbcmysql1.0.0 \
- $(@D)/pkgs/tdbcodbc1.0.0 \
- $(@D)/pkgs/tdbcpostgres1.0.0 \
- $(@D)/pkgs/tdbcsqlite3-1.0.0
+ $(@D)/pkgs/tdbc1.0.0 \
+ $(@D)/pkgs/tdbcmysql1.0.0 \
+ $(@D)/pkgs/tdbcodbc1.0.0 \
+ $(@D)/pkgs/tdbcpostgres1.0.0 \
+ $(@D)/pkgs/tdbcsqlite3-1.0.0
endef
HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
define TCL_REMOVE_PACKAGES
rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3.8.0) \
- $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.0) \
- $(@D)/pkgs/tdbcmysql1.0.0 \
- $(@D)/pkgs/tdbcodbc1.0.0 \
- $(@D)/pkgs/tdbcpostgres1.0.0 \
- $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.0)
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.0) \
+ $(@D)/pkgs/tdbcmysql1.0.0 \
+ $(@D)/pkgs/tdbcodbc1.0.0 \
+ $(@D)/pkgs/tdbcpostgres1.0.0 \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.0)
endef
TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
@@ -75,9 +75,9 @@ endif
# configured whitelist.
define TCL_REMOVE_EXTRA
rm -fr $(TARGET_DIR)/usr/lib/tclConfig.sh \
- $(TARGET_DIR)/usr/lib/tclooConfig.sh \
- $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/tclAppInit.c \
- $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/msgs
+ $(TARGET_DIR)/usr/lib/tclooConfig.sh \
+ $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/tclAppInit.c \
+ $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/msgs
endef
TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA
diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk
index 48288f1..a3dcc9a 100644
--- a/package/tinyalsa/tinyalsa.mk
+++ b/package/tinyalsa/tinyalsa.mk
@@ -15,14 +15,14 @@ endef
define TINYALSA_INSTALL_STAGING_CMDS
$(INSTALL) -D -m 0755 $(@D)/libtinyalsa.so \
- $(STAGING_DIR)/usr/lib/libtinyalsa.so
+ $(STAGING_DIR)/usr/lib/libtinyalsa.so
$(INSTALL) -D -m 0644 $(@D)/include/tinyalsa/asoundlib.h \
- $(STAGING_DIR)/usr/include/tinyalsa/asoundlib.h
+ $(STAGING_DIR)/usr/include/tinyalsa/asoundlib.h
endef
define TINYALSA_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/libtinyalsa.so \
- $(TARGET_DIR)/usr/lib/libtinyalsa.so
+ $(TARGET_DIR)/usr/lib/libtinyalsa.so
$(INSTALL) -D -m 0755 $(@D)/tinyplay $(TARGET_DIR)/usr/bin/tinyplay
$(INSTALL) -D -m 0755 $(@D)/tinycap $(TARGET_DIR)/usr/bin/tinycap
$(INSTALL) -D -m 0755 $(@D)/tinymix $(TARGET_DIR)/usr/bin/tinymix
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 857f6e6..bf4b064 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -74,7 +74,7 @@ TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_CLEAN_SHARE
# - a non-root user to run as
define TVHEADEND_INSTALL_DB
$(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \
- $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
+ $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
endef
TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_INSTALL_DB
diff --git a/package/tz/tz.mk b/package/tz/tz.mk
index 770cc46..349d73f 100644
--- a/package/tz/tz.mk
+++ b/package/tz/tz.mk
@@ -21,19 +21,19 @@ endef
define TZ_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/zone.tab \
- $(TARGET_DIR)/usr/share/zoneinfo/zone.tab
+ $(TARGET_DIR)/usr/share/zoneinfo/zone.tab
$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/iso3166.tab \
- $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
+ $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
if [ -n "$(TZ_LOCALTIME)" ]; then \
- if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
- printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
- "$(TZDATA_LOCALTIME)"; \
- exit 1; \
- fi; \
- cd $(TARGET_DIR)/etc; \
- ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
+ if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
+ printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
+ "$(TZDATA_LOCALTIME)"; \
+ exit 1; \
+ fi; \
+ cd $(TARGET_DIR)/etc; \
+ ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
fi
endef
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 8f990c7..ce416dd 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -132,7 +132,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sparc)
UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
define UCLIBC_SPARC_TYPE_CONFIG
$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
- $(@D)/.config
+ $(@D)/.config
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE),$(@D)/.config)
endef
endif # sparc
diff --git a/package/upx/upx.mk b/package/upx/upx.mk
index 878d145..30bb03b 100644
--- a/package/upx/upx.mk
+++ b/package/upx/upx.mk
@@ -16,8 +16,8 @@ HOST_UPX_DEPENDENCIES = host-ucl
# stating to "please choose a target for 'make'"... :-(
define HOST_UPX_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) CPPFLAGS="$(HOST_CPPFLAGS)" \
- LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR)/usr \
- -C $(@D) all
+ LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR)/usr \
+ -C $(@D) all
endef
# UPX has no install procedure, so install it manually.
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index 5869110..740faed 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -20,10 +20,10 @@ WAYLAND_CONF_OPTS = --disable-scanner
# which we vampirise and adapt from the host-wayland copy
define WAYLAND_SCANNER_PC
$(INSTALL) -m 0644 -D $(HOST_DIR)/usr/lib/pkgconfig/wayland-scanner.pc \
- $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
+ $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
$(SED) 's:^prefix=.*:prefix=/usr:' \
- -e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \
- $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
+ -e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \
+ $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
endef
WAYLAND_POST_INSTALL_STAGING_HOOKS += WAYLAND_SCANNER_PC
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 77b533a..fae2e7e 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -27,7 +27,7 @@ WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
# in newer releases
define DISABLE_INDEXED_DATABASE
$(SED) '/ENABLE_INDEXED_DATABASE/s:1:0:' \
- $(@D)/Source/WebCore/GNUmakefile.features.am
+ $(@D)/Source/WebCore/GNUmakefile.features.am
endef
WEBKIT_PRE_CONFIGURE_HOOKS += DISABLE_INDEXED_DATABASE
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 3cd1b18..931573a 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -18,7 +18,7 @@ XCB_PROTO_DEPENDENCIES = host-python
# xml / python files, so ensure these expand to their full (host) paths
define XCB_PROTO_FIXUP_PC_FILE
$(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_DIR)|' \
- -e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \
+ -e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \
$(STAGING_DIR)/usr/lib/pkgconfig/xcb-proto.pc
endef
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 02b6d0f..46322a0 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_XENOMAI
bool "Xenomai Userspace"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
- BR2_bfin || BR2_powerpc || BR2_sh4
+ BR2_bfin || BR2_powerpc || BR2_sh4
help
Real-Time Framework for Linux
http://www.xenomai.org
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-10-26 4:47 Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2014-10-26 4:47 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1769933d98cc4891df571453f0380a4aef5aefcc
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
boot/grub2/Config.in | 6 +-
fs/common.mk | 2 +-
fs/cpio/cpio.mk | 12 ++--
linux/linux.mk | 8 +-
package/Makefile.in | 2 +-
package/at/at.mk | 8 +-
package/avahi/avahi.mk | 2 +-
package/bind/bind.mk | 4 +-
package/busybox/busybox.mk | 2 +-
package/dhcp/dhcp.mk | 4 +-
package/dstat/dstat.mk | 2 +-
package/dtach/dtach.mk | 2 +-
package/elfutils/elfutils.mk | 4 +-
package/gcc/gcc-final/gcc-final.mk | 22 +++---
package/gcc/gcc.mk | 4 +-
package/gsl/gsl.mk | 4 +-
package/lftp/lftp.mk | 2 +-
package/libsoup/libsoup.mk | 2 +-
package/lsof/lsof.mk | 6 +-
package/midori/midori.mk | 6 +-
package/ncftp/ncftp.mk | 2 +-
package/netcat-openbsd/Config.in | 20 ++--
package/opentyrian/opentyrian.mk | 2 +-
package/pkg-autotools.mk | 6 +-
package/redis/redis.mk | 6 +-
package/sam-ba/sam-ba.mk | 6 +-
package/sdl_image/sdl_image.mk | 12 ++--
package/simicsfs/simicsfs.mk | 4 +-
package/strongswan/strongswan.mk | 96 ++++++++++----------
package/vde2/vde2.mk | 12 ++--
package/vlc/vlc.mk | 6 +-
.../xcursor-transparent-theme.mk | 2 +-
package/ympd/ympd.mk | 2 +-
33 files changed, 140 insertions(+), 140 deletions(-)
diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index 4e0d1d6..626344a 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -106,9 +106,9 @@ config BR2_TARGET_GRUB2
2. Extract, and rename OVMF.fd to bios.bin and
CirrusLogic5446.rom to vgabios-cirrus.bin.
3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
- 4. Make sure to pass pci=nocrs to the kernel command line,
- to workaround a bug in the EFI BIOS regarding the
- EFI framebuffer.
+ 4. Make sure to pass pci=nocrs to the kernel command line,
+ to workaround a bug in the EFI BIOS regarding the
+ EFI framebuffer.
http://www.gnu.org/software/grub/
diff --git a/fs/common.mk b/fs/common.mk
index 70198c0..d40f5ae 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -31,7 +31,7 @@
FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
- $(BR2_ROOTFS_STATIC_DEVICE_TABLE))
+ $(BR2_ROOTFS_STATIC_DEVICE_TABLE))
USERS_TABLE = $(BUILD_DIR)/_users_table.txt
ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index 771306c..e82167e 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -7,18 +7,18 @@
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
define ROOTFS_CPIO_ADD_INIT
- if [ ! -e $(TARGET_DIR)/init ]; then \
- ln -sf sbin/init $(TARGET_DIR)/init; \
- fi
+ if [ ! -e $(TARGET_DIR)/init ]; then \
+ ln -sf sbin/init $(TARGET_DIR)/init; \
+ fi
endef
else
# devtmpfs does not get automounted when initramfs is used.
# Add a pre-init script to mount it before running init
define ROOTFS_CPIO_ADD_INIT
- if [ ! -e $(TARGET_DIR)/init ]; then \
- $(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \
- fi
+ if [ ! -e $(TARGET_DIR)/init ]; then \
+ $(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \
+ fi
endef
PACKAGES_PERMISSIONS_TABLE += /dev/console c 622 0 0 5 1 - - -$(sep)
diff --git a/linux/linux.mk b/linux/linux.mk
index abd3772..6740d01 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -253,10 +253,10 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
# address and entry point for the kernel from the already
# generate uboot image before using mkimage -l.
LINUX_APPEND_DTB += $(sep) MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\
- sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
- $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \
- -T kernel -C none $${MKIMAGE_ARGS} \
- -d $(KERNEL_ARCH_PATH)/boot/zImage $(LINUX_IMAGE_PATH);
+ sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
+ $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \
+ -T kernel -C none $${MKIMAGE_ARGS} \
+ -d $(KERNEL_ARCH_PATH)/boot/zImage $(LINUX_IMAGE_PATH);
endif
endif
diff --git a/package/Makefile.in b/package/Makefile.in
index 7c929ef..ff2ee2d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -32,7 +32,7 @@ $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR is not allowed to be empty)
endif
ifeq ($(TARGET_VENDOR),unknown)
$(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \
- It might be confused with the native toolchain)
+ It might be confused with the native toolchain)
endif
# Compute GNU_TARGET_NAME
diff --git a/package/at/at.mk b/package/at/at.mk
index efce57e..851a05b 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -15,10 +15,10 @@ AT_LICENSE = GPLv2+, GPLv3+, ISC
AT_LICENSE_FILES = Copyright COPYING
AT_CONF_OPTS = \
- --with-jobdir=/var/spool/cron/atjobs \
- --with-atspool=/var/spool/cron/atspool \
- --with-daemon_username=root \
- --with-daemon_groupname=root \
+ --with-jobdir=/var/spool/cron/atjobs \
+ --with-atspool=/var/spool/cron/atspool \
+ --with-daemon_username=root \
+ --with-daemon_groupname=root \
SENDMAIL=/usr/sbin/sendmail
define AT_INSTALL_INITSCRIPT
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 752f2e7..4e5dbc6 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -85,7 +85,7 @@ AVAHI_CONF_OPTS = \
--with-autoipd-group=avahi
AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
- host-pkgconf host-gettext
+ host-pkgconf host-gettext
ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
AVAHI_DEPENDENCIES += libdaemon
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 0dcfb40..690ca3e 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -76,8 +76,8 @@ endef
ifeq ($(BR2_PACKAGE_BIND_SERVER),y)
define BIND_INSTALL_INIT_SYSV
- $(INSTALL) -m 0755 -D package/bind/S81named \
- $(TARGET_DIR)/etc/init.d/S81named
+ $(INSTALL) -m 0755 -D package/bind/S81named \
+ $(TARGET_DIR)/etc/init.d/S81named
endef
else
BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 73a99fb..98d1bd1 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -173,7 +173,7 @@ endef
ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y)
define BUSYBOX_SET_WATCHDOG
- $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG))
+ $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG))
endef
define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 25c9e76..736635a 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -26,11 +26,11 @@ DHCP_CONF_OPTS = \
--with-relay6-pid-file=/var/run/dhcrelay6.pid
ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
- DHCP_CONF_OPTS += --enable-delayed-ack
+DHCP_CONF_OPTS += --enable-delayed-ack
endif
ifneq ($(BR2_INET_IPV6),y)
- DHCP_CONF_OPTS += --disable-dhcpv6
+DHCP_CONF_OPTS += --disable-dhcpv6
endif
ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk
index e71b0cc..f02e908 100644
--- a/package/dstat/dstat.mk
+++ b/package/dstat/dstat.mk
@@ -11,7 +11,7 @@ DSTAT_LICENSE = GPLv2
DSTAT_LICENSE_FILES = COPYING
define DSTAT_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+ $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))
diff --git a/package/dtach/dtach.mk b/package/dtach/dtach.mk
index 56ab175..5f5a903 100644
--- a/package/dtach/dtach.mk
+++ b/package/dtach/dtach.mk
@@ -11,7 +11,7 @@ DTACH_LICENSE_FILES = COPYING
# The Makefile does not have an install target.
define DTACH_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach
+ $(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach
endef
$(eval $(autotools-package))
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 163db96..4f00a27 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -22,8 +22,8 @@ ELFUTILS_INSTALL_STAGING = YES
ifeq ($(BR2_LARGEFILE),y)
# elfutils gets confused when lfs mode is forced, so don't
ELFUTILS_CONF_ENV += \
- CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
- CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
+ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
+ CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
endif
ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS)
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 26c2011..9579b63 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -27,17 +27,17 @@ HOST_GCC_FINAL_SUBDIR = build
HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
define HOST_GCC_FINAL_CONFIGURE_CMDS
- (cd $(HOST_GCC_FINAL_SRCDIR) && rm -rf config.cache; \
- $(HOST_CONFIGURE_OPTS) \
- CFLAGS="$(HOST_CFLAGS)" \
- LDFLAGS="$(HOST_LDFLAGS)" \
- $(HOST_GCC_FINAL_CONF_ENV) \
- ./configure \
- --prefix="$(HOST_DIR)/usr" \
- --sysconfdir="$(HOST_DIR)/etc" \
- --enable-static \
- $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
- )
+ (cd $(HOST_GCC_FINAL_SRCDIR) && rm -rf config.cache; \
+ $(HOST_CONFIGURE_OPTS) \
+ CFLAGS="$(HOST_CFLAGS)" \
+ LDFLAGS="$(HOST_LDFLAGS)" \
+ $(HOST_GCC_FINAL_CONF_ENV) \
+ ./configure \
+ --prefix="$(HOST_DIR)/usr" \
+ --sysconfdir="$(HOST_DIR)/etc" \
+ --enable-static \
+ $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
+ )
endef
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 1352bdf..59f6268 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -26,8 +26,8 @@ GCC_SOURCE ?= gcc-$(GCC_VERSION).tar.bz2
#
define HOST_GCC_XTENSA_OVERLAY_EXTRACT
- tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
- $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
+ tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
+ $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
endef
#
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 1dfc0f9..0ad5377 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -19,8 +19,8 @@ GSL_CONFIG_SCRIPTS = gsl-config
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
ifneq ($(BR2_i386),y)
GSL_CONF_ENV = \
- ac_cv_have_decl_feenableexcept=no \
- ac_cv_have_decl_fesettrapenable=no
+ ac_cv_have_decl_feenableexcept=no \
+ ac_cv_have_decl_fesettrapenable=no
endif
endif
diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk
index 25703f4..a50b018 100644
--- a/package/lftp/lftp.mk
+++ b/package/lftp/lftp.mk
@@ -31,7 +31,7 @@ endif
# Remove /usr/share/lftp
define LFTP_REMOVE_DATA
- $(RM) -fr $(TARGET_DIR)/usr/share/lftp
+ $(RM) -fr $(TARGET_DIR)/usr/share/lftp
endef
LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_DATA
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 6833917..723b6cc 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -21,7 +21,7 @@ endif
LIBSOUP_CONF_OPTS = --disable-glibtest
LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
- libglib2 libxml2 sqlite host-intltool
+ libglib2 libxml2 sqlite host-intltool
ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
LIBSOUP_CONF_OPTS += --with-gnome
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 7131c2c..75ce3d4 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -39,9 +39,9 @@ endif
# The .tar.bz2 contains another .tar, which contains the source code.
define LSOF_EXTRACT_CMDS
- $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \
- $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \
- $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -
+ $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \
+ $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \
+ $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -
endef
define LSOF_CONFIGURE_CMDS
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 39bf1a7..a8b0b37 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -34,15 +34,15 @@ define MIDORI_CONFIGURE_CMDS
$(HOST_DIR)/usr/bin/python2 ./waf configure \
--prefix=/usr \
--disable-libnotify \
- )
+ )
endef
define MIDORI_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS))
+ (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS))
endef
define MIDORI_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install)
+ (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install)
endef
$(eval $(generic-package))
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 6ab3934..76d3bce 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -18,7 +18,7 @@ NCFTP_DEPENDENCIES = host-autoconf
# We need to pass -I because of the non-standard m4 directory name, and
# none of the other autotools are used, so the below is the easiest.
define NCFTP_RUN_AUTOCONF
- (cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/)
+ (cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/)
endef
NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF
diff --git a/package/netcat-openbsd/Config.in b/package/netcat-openbsd/Config.in
index 47dfe5f..346561a 100644
--- a/package/netcat-openbsd/Config.in
+++ b/package/netcat-openbsd/Config.in
@@ -5,18 +5,18 @@ config BR2_PACKAGE_NETCAT_OPENBSD
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_USES_GLIBC
help
- A simple Unix utility which reads and writes data across network
- connections using TCP or UDP protocol. It is designed to be a
- reliable "back-end" tool that can be used directly or easily driven
- by other programs and scripts. At the same time it is a feature-rich
- network debugging and exploration tool, since it can create almost
- any kind of connection you would need and has several interesting
- built-in capabilities.
+ A simple Unix utility which reads and writes data across network
+ connections using TCP or UDP protocol. It is designed to be a
+ reliable "back-end" tool that can be used directly or easily driven
+ by other programs and scripts. At the same time it is a feature-rich
+ network debugging and exploration tool, since it can create almost
+ any kind of connection you would need and has several interesting
+ built-in capabilities.
- This package contains the OpenBSD rewrite of netcat, including
- support for IPv6, proxies, and Unix sockets.
+ This package contains the OpenBSD rewrite of netcat, including
+ support for IPv6, proxies, and Unix sockets.
- https://packages.debian.org/sid/netcat-openbsd
+ https://packages.debian.org/sid/netcat-openbsd
comment "netcat-openbsd needs an (e)glibc toolchain w/ threads"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk
index 64959ca..f00a52b 100644
--- a/package/opentyrian/opentyrian.mk
+++ b/package/opentyrian/opentyrian.mk
@@ -20,7 +20,7 @@ OPENTYRIAN_NETWORK = false
endif
define OPENTYRIAN_BUILD_CMDS
- $(MAKE) PLATFORM=UNIX \
+ $(MAKE) PLATFORM=UNIX \
CC="$(TARGET_CC)" \
STRIP="/bin/true" \
SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 3c6bb0d..09f9412 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -162,7 +162,7 @@ define $(2)_CONFIGURE_CMDS
$$(HOST_CONFIGURE_OPTS) \
CFLAGS="$$(HOST_CFLAGS)" \
LDFLAGS="$$(HOST_LDFLAGS)" \
- $$($$(PKG)_CONF_ENV) \
+ $$($$(PKG)_CONF_ENV) \
CONFIG_SITE=/dev/null \
./configure \
--prefix="$$(HOST_DIR)/usr" \
@@ -187,8 +187,8 @@ endif
# Hook to update config.sub and config.guess if needed
#
define UPDATE_CONFIG_HOOK
- @$$(call MESSAGE,"Updating config.sub and config.guess")
- $$(call CONFIG_UPDATE,$$(@D))
+ @$$(call MESSAGE,"Updating config.sub and config.guess")
+ $$(call CONFIG_UPDATE,$$(@D))
endef
$(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
diff --git a/package/redis/redis.mk b/package/redis/redis.mk
index f3f9acb..00490e7 100644
--- a/package/redis/redis.mk
+++ b/package/redis/redis.mk
@@ -16,12 +16,12 @@ REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \
PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
define REDIS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D)
+ $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D)
endef
define REDIS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) \
- LDCONFIG=true install
+ $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) \
+ LDCONFIG=true install
endef
$(eval $(generic-package))
diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index c03fcc4..905a6cb 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -12,9 +12,9 @@ SAM_BA_LICENSE = BSD-like (partly binary-only)
SAM_BA_LICENSE_FILES = doc/readme.txt
define HOST_SAM_BA_EXTRACT_CMDS
- unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
- mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D)
- rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/
+ unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
+ mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D)
+ rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/
endef
# Since it's a prebuilt application and it does not conform to the
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 65e6e5d..951ea45 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -36,12 +36,12 @@ SDL_IMAGE_DEPENDENCIES = sdl \
$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \
- --with-sdl-exec-prefix=$(HOST_DIR)/usr \
- --disable-sdltest \
- --disable-static \
- --disable-jpg-shared \
- --disable-png-shared \
- --disable-tif-shared \
+ --with-sdl-exec-prefix=$(HOST_DIR)/usr \
+ --disable-sdltest \
+ --disable-static \
+ --disable-jpg-shared \
+ --disable-png-shared \
+ --disable-tif-shared \
HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl
diff --git a/package/simicsfs/simicsfs.mk b/package/simicsfs/simicsfs.mk
index 34061ff..51987c5 100644
--- a/package/simicsfs/simicsfs.mk
+++ b/package/simicsfs/simicsfs.mk
@@ -11,11 +11,11 @@ SIMICSFS_LICENSE_FILES = hostfs.h
SIMICSFS_DEPENDENCIES = linux
define SIMICSFS_BUILD_CMDS
- $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) modules
+ $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) modules
endef
define SIMICSFS_INSTALL_TARGET_CMDS
- $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
+ $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
endef
$(eval $(generic-package))
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index 9aff1e0..bb1d268 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -10,61 +10,61 @@ STRONGSWAN_SITE = http://download.strongswan.org
STRONGSWAN_LICENSE = GPLv2+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf
-STRONGSWAN_CONF_OPTS += \
- --without-lib-prefix \
- --enable-pkcs11=yes \
- --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
- --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
- --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
- --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
- --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
- --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
- --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
- --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
- --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
- --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
- --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
- --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
- --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
- --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
- --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
- --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
- --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
+STRONGSWAN_CONF_OPTS += \
+ --without-lib-prefix \
+ --enable-pkcs11=yes \
+ --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
+ --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
+ --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
+ --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
+ --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
+ --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
+ --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
+ --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
+ --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
+ --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
+ --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
+ --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
+ --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
+ --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
+ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
+ --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
+ --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
-STRONGSWAN_CONF_OPTS += \
- --enable-eap-sim \
- --enable-eap-sim-file \
- --enable-eap-aka \
- --enable-eap-aka-3gpp2 \
- --enable-eap-simaka-sql \
- --enable-eap-simaka-pseudonym \
- --enable-eap-simaka-reauth \
- --enable-eap-identity \
- --enable-eap-md5 \
- --enable-eap-gtc \
- --enable-eap-mschapv2 \
- --enable-eap-tls \
- --enable-eap-ttls \
- --enable-eap-peap \
- --enable-eap-tnc \
- --enable-eap-dynamic \
- --enable-eap-radius
+STRONGSWAN_CONF_OPTS += \
+ --enable-eap-sim \
+ --enable-eap-sim-file \
+ --enable-eap-aka \
+ --enable-eap-aka-3gpp2 \
+ --enable-eap-simaka-sql \
+ --enable-eap-simaka-pseudonym \
+ --enable-eap-simaka-reauth \
+ --enable-eap-identity \
+ --enable-eap-md5 \
+ --enable-eap-gtc \
+ --enable-eap-mschapv2 \
+ --enable-eap-tls \
+ --enable-eap-ttls \
+ --enable-eap-peap \
+ --enable-eap-tnc \
+ --enable-eap-dynamic \
+ --enable-eap-radius
STRONGSWAN_DEPENDENCIES += gmp
endif
-STRONGSWAN_DEPENDENCIES += \
- $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
- $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
- $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
- $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
- $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
- $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
+STRONGSWAN_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
-STRONGSWAN_DEPENDENCIES += \
- $(if $(BR2_PACKAGE_SQLITE),sqlite) \
- $(if $(BR2_PACKAGE_MYSQL),mysql)
+STRONGSWAN_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_SQLITE),sqlite) \
+ $(if $(BR2_PACKAGE_MYSQL),mysql)
endif
$(eval $(autotools-package))
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
index e7ec332..c8bcfae 100644
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -26,12 +26,12 @@ VDE2_AUTORECONF = YES
# Note: disabled features can be added with corresponding dependencies
# in future commits.
VDE2_CONF_OPTS = --disable-experimental \
- --disable-cryptcab \
- --disable-pcap \
- --disable-python \
- --disable-profile \
- --disable-kernel-switch \
- --enable-tuntap \
+ --disable-cryptcab \
+ --disable-pcap \
+ --disable-python \
+ --disable-profile \
+ --disable-kernel-switch \
+ --enable-tuntap \
#??Package does not build in parallel due to improper make rules
VDE2_MAKE = $(MAKE1)
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 5a75087..7e81d59 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -252,9 +252,9 @@ endif
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
VLC_CONF_OPTS += --enable-qt
VLC_CONF_ENV += \
- ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \
- ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \
- ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic
+ ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \
+ ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \
+ ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic
VLC_DEPENDENCIES += qt
else
VLC_CONF_OPTS += --disable-qt
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
index a52f8d0..5c6f2d2 100644
--- a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -11,7 +11,7 @@ XCURSOR_TRANSPARENT_THEME_LICENSE = GPLv2
XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING
define ICONS_DEFAULT_CONFIG_INSTALL
- $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \
+ $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \
$(TARGET_DIR)/usr/share/icons/default/index.theme
endef
diff --git a/package/ympd/ympd.mk b/package/ympd/ympd.mk
index ac51eb9..2898c9d 100644
--- a/package/ympd/ympd.mk
+++ b/package/ympd/ympd.mk
@@ -11,7 +11,7 @@ YMPD_LICENSE_FILE = LICENSE
YMPD_DEPENDENCIES = libmpdclient
define YMPD_MAKE_HOST_TOOL
- $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata
+ $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata
endef
YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-10-25 8:38 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2014-10-25 8:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=df2857de491448311a7e1f78e3492f697a0be0cd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/cegui06/cegui06.mk | 36 ++++++++++++++++++------------------
package/dmraid/dmraid.mk | 6 +++---
package/fxload/fxload.mk | 4 ++--
package/gptfdisk/gptfdisk.mk | 8 ++++----
package/keyutils/keyutils.mk | 14 +++++++-------
package/libcofi/libcofi.mk | 4 ++--
package/luaposix/luaposix.mk | 2 +-
package/netcat-openbsd/Config.in | 4 ++--
package/nodejs/nodejs.mk | 2 +-
package/perl/perl.mk | 10 +++++-----
package/qemu/Config.in | 4 ++--
package/qemu/qemu.mk | 12 ++++++------
package/redis/redis.mk | 2 +-
package/rtmpdump/rtmpdump.mk | 20 ++++++++++----------
package/spice/spice.mk | 16 ++++++++--------
15 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
index ee74363..43d3b09 100644
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -13,24 +13,24 @@ CEGUI06_LICENSE = MIT
CEGUI06_LICENSE_FILES = COPYING
CEGUI06_INSTALL_STAGING = YES
-CEGUI06_DEPENDENCIES = \
- expat \
- freetype \
- pcre \
+CEGUI06_DEPENDENCIES = \
+ expat \
+ freetype \
+ pcre \
-CEGUI06_CONF_OPTS = \
- --enable-expat \
- --disable-external-tinyxml \
- --disable-xerces-c \
- --disable-libxml \
- --disable-tinyxml \
- --disable-opengl-renderer \
- --disable-external-glew \
- --disable-irrlicht-renderer \
- --disable-directfb-renderer \
- --disable-samples \
- --disable-lua-module \
- --disable-toluacegui \
- --disable-external-toluapp \
+CEGUI06_CONF_OPTS = \
+ --enable-expat \
+ --disable-external-tinyxml \
+ --disable-xerces-c \
+ --disable-libxml \
+ --disable-tinyxml \
+ --disable-opengl-renderer \
+ --disable-external-glew \
+ --disable-irrlicht-renderer \
+ --disable-directfb-renderer \
+ --disable-samples \
+ --disable-lua-module \
+ --disable-toluacegui \
+ --disable-external-toluapp \
$(eval $(autotools-package))
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 9699ead..024b9b5 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -18,9 +18,9 @@ DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
DMRAID_DEPENDENCIES = lvm2
define DMRAID_INSTALL_INIT_SYSV
- [ -f $(TARGET_DIR)/etc/init.d/S20dmraid ] || \
- $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \
- $(TARGET_DIR)/etc/init.d/S20dmraid
+ [ -f $(TARGET_DIR)/etc/init.d/S20dmraid ] || \
+ $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \
+ $(TARGET_DIR)/etc/init.d/S20dmraid
endef
$(eval $(autotools-package))
diff --git a/package/fxload/fxload.mk b/package/fxload/fxload.mk
index 26feec3..b34dccd 100644
--- a/package/fxload/fxload.mk
+++ b/package/fxload/fxload.mk
@@ -10,11 +10,11 @@ FXLOAD_LICENSE = GPLv2+
FXLOAD_LICENSE_FILES = COPYING
define FXLOAD_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
endef
define FXLOAD_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) prefix=$(TARGET_DIR) -C $(@D) install
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) prefix=$(TARGET_DIR) -C $(@D) install
endef
$(eval $(generic-package))
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 6835f40..f6e9ecd 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -15,15 +15,15 @@ GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk
GPTFDISK_DEPENDENCIES += util-linux
ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
- GPTFDISK_DEPENDENCIES += popt
+GPTFDISK_DEPENDENCIES += popt
endif
ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y)
- GPTFDISK_DEPENDENCIES += ncurses
+GPTFDISK_DEPENDENCIES += ncurses
endif
ifeq ($(BR2_PACKAGE_ICU),y)
- GPTFDISK_DEPENDENCIES += icu
- GPTFDISK_MAKE_OPTS += USE_UTF16=y
+GPTFDISK_DEPENDENCIES += icu
+GPTFDISK_MAKE_OPTS += USE_UTF16=y
endif
define GPTFDISK_BUILD_CMDS
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
index 241536f..27cd4ae 100644
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -11,13 +11,13 @@ KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
KEYUTILS_INSTALL_STAGING = YES
-KEYUTILS_MAKE_PARAMS = \
- INSTALL=$(INSTALL) \
- LIBDIR=/usr/lib \
- USRLIBDIR=/usr/lib \
- CFLAGS="$(TARGET_CFLAGS)" \
- CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
- LNS="$(HOSTLN) -sf"
+KEYUTILS_MAKE_PARAMS = \
+ INSTALL=$(INSTALL) \
+ LIBDIR=/usr/lib \
+ USRLIBDIR=/usr/lib \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
+ LNS="$(HOSTLN) -sf"
ifeq ($(BR2_PREFER_STATIC_LIB),y)
KEYUTILS_MAKE_PARAMS += NO_SOLIB=1
diff --git a/package/libcofi/libcofi.mk b/package/libcofi/libcofi.mk
index dcfc641..90daff2 100644
--- a/package/libcofi/libcofi.mk
+++ b/package/libcofi/libcofi.mk
@@ -10,11 +10,11 @@ LIBCOFI_LICENSE = LGPLv2.1
LIBCOFI_LICENSE_FILES = README.md
define LIBCOFI_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
endef
define LIBCOFI_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 0755 $(@D)/libcofi_rpi.so $(TARGET_DIR)/usr/lib/libcofi_rpi.so
+ $(INSTALL) -D -m 0755 $(@D)/libcofi_rpi.so $(TARGET_DIR)/usr/lib/libcofi_rpi.so
endef
$(eval $(generic-package))
diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
index 13fc266..a723a50 100644
--- a/package/luaposix/luaposix.mk
+++ b/package/luaposix/luaposix.mk
@@ -12,7 +12,7 @@ LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
ifeq ($(BR2_PACKAGE_NCURSES),y)
- LUAPOSIX_DEPENDENCIES += ncurses
+LUAPOSIX_DEPENDENCIES += ncurses
endif
$(eval $(autotools-package))
diff --git a/package/netcat-openbsd/Config.in b/package/netcat-openbsd/Config.in
index 16be610..47dfe5f 100644
--- a/package/netcat-openbsd/Config.in
+++ b/package/netcat-openbsd/Config.in
@@ -19,6 +19,6 @@ config BR2_PACKAGE_NETCAT_OPENBSD
https://packages.debian.org/sid/netcat-openbsd
comment "netcat-openbsd needs an (e)glibc toolchain w/ threads"
- depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
- depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
+ depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
~
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index e73e080..8832ce3 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -8,7 +8,7 @@ NODEJS_VERSION = 0.10.32
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
NODEJS_DEPENDENCIES = host-python host-nodejs zlib \
- $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
+ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
HOST_NODEJS_DEPENDENCIES = host-python host-zlib
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
NODEJS_LICENSE_FILES = LICENSE
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index a8ed49f..9684668 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -42,10 +42,10 @@ endef
PERL_POST_PATCH_HOOKS += PERL_CROSS_SET_POD
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
- PERL_DEPENDENCIES += berkeleydb
+PERL_DEPENDENCIES += berkeleydb
endif
ifeq ($(BR2_PACKAGE_GDBM),y)
- PERL_DEPENDENCIES += gdbm
+PERL_DEPENDENCIES += gdbm
endif
# We have to override LD, because an external multilib toolchain ld is not
@@ -66,15 +66,15 @@ PERL_CONF_OPTS = \
-Dperladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
- PERL_CONF_OPTS += -Dusedevel
+PERL_CONF_OPTS += -Dusedevel
endif
ifeq ($(BR2_PREFER_STATIC_LIB),y)
- PERL_CONF_OPTS += --all-static --no-dynaloader
+PERL_CONF_OPTS += --all-static --no-dynaloader
endif
ifneq ($(BR2_LARGEFILE),y)
- PERL_CONF_OPTS += -Uuselargefiles
+PERL_CONF_OPTS += -Uuselargefiles
endif
PERL_MODULES = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES))
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index cd7fed7..e8d03da 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -65,8 +65,8 @@ config BR2_PACKAGE_QEMU_LINUX_USER
endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == ""
config BR2_PACKAGE_QEMU_HAS_EMULS
- def_bool y
- depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != ""
+ def_bool y
+ depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != ""
if BR2_PACKAGE_QEMU_HAS_EMULS
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 8735b46..2495674 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -46,16 +46,16 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
HOST_QEMU_ARCH = $(ARCH)
ifeq ($(HOST_QEMU_ARCH),i486)
- HOST_QEMU_ARCH = i386
+HOST_QEMU_ARCH = i386
endif
ifeq ($(HOST_QEMU_ARCH),i586)
- HOST_QEMU_ARCH = i386
+HOST_QEMU_ARCH = i386
endif
ifeq ($(HOST_QEMU_ARCH),i686)
- HOST_QEMU_ARCH = i386
+HOST_QEMU_ARCH = i386
endif
ifeq ($(HOST_QEMU_ARCH),powerpc)
- HOST_QEMU_ARCH = ppc
+HOST_QEMU_ARCH = ppc
endif
HOST_QEMU_TARGETS = $(HOST_QEMU_ARCH)-linux-user
@@ -96,8 +96,8 @@ QEMU_OPTS =
QEMU_VARS = \
LIBTOOL=$(HOST_DIR)/usr/bin/libtool \
- PYTHON=$(HOST_DIR)/usr/bin/python \
- PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+ PYTHON=$(HOST_DIR)/usr/bin/python \
+ PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y)
QEMU_OPTS += --enable-system
diff --git a/package/redis/redis.mk b/package/redis/redis.mk
index c41469e..f3f9acb 100644
--- a/package/redis/redis.mk
+++ b/package/redis/redis.mk
@@ -13,7 +13,7 @@ REDIS_LICENSE_FILES = COPYING
# https://github.com/antirez/redis/pull/609). We set PREFIX
# instead.
REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \
- PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
+ PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
define REDIS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D)
diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk
index 684e0cf..e8fd0b8 100644
--- a/package/rtmpdump/rtmpdump.mk
+++ b/package/rtmpdump/rtmpdump.mk
@@ -14,25 +14,25 @@ RTMPDUMP_LICENSE_FILES = librtmp/COPYING
RTMPDUMP_DEPENDENCIES = zlib
ifeq ($(BR2_PACKAGE_GNUTLS),y)
- RTMPDUMP_DEPENDENCIES += gnutls
- RTMPDUMP_CRYPTO = GNUTLS
+RTMPDUMP_DEPENDENCIES += gnutls
+RTMPDUMP_CRYPTO = GNUTLS
else ifeq ($(BR2_PACKAGE_POLARSSL),y)
- RTMPDUMP_DEPENDENCIES += polarssl
- RTMPDUMP_CRYPTO = POLARSSL
+RTMPDUMP_DEPENDENCIES += polarssl
+RTMPDUMP_CRYPTO = POLARSSL
else ifeq ($(BR2_PACKAGE_OPENSSL),y)
- RTMPDUMP_DEPENDENCIES += openssl
- RTMPDUMP_CRYPTO = OPENSSL
+RTMPDUMP_DEPENDENCIES += openssl
+RTMPDUMP_CRYPTO = OPENSSL
else
- # no crypto
- RTMPDUMP_CRYPTO =
+# no crypto
+RTMPDUMP_CRYPTO =
endif
RTMPDUMP_CFLAGS = $(TARGET_CFLAGS)
ifneq ($(BR2_PREFER_STATIC_LIB),y)
- RTMPDUMP_CFLAGS += -fPIC
+RTMPDUMP_CFLAGS += -fPIC
else
- RTMPDUMP_SHARED = "SHARED="
+RTMPDUMP_SHARED = "SHARED="
endif
define RTMPDUMP_BUILD_CMDS
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 52a265e..be46493 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -10,14 +10,14 @@ SPICE_SITE = http://www.spice-space.org/download/releases
SPICE_LICENSE = LGPLv2.1+
SPICE_LICENSE_FILES = COPYING
SPICE_INSTALL_STAGING = YES
-SPICE_DEPENDENCIES = \
- alsa-lib \
- celt051 \
- jpeg \
- openssl \
- pixman \
- python-pyparsing \
- spice-protocol \
+SPICE_DEPENDENCIES = \
+ alsa-lib \
+ celt051 \
+ jpeg \
+ openssl \
+ pixman \
+ python-pyparsing \
+ spice-protocol \
# We disable everything for now, because the dependency tree can become
# quite deep if we try to enable some features, and I have not tested that.
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-10-24 23:11 Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2014-10-24 23:11 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=774ff0d13f5e954a76e2f2a1646fad37349803f8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
linux/linux.mk | 4 +-
package/celt051/celt051.mk | 16 ++++++------
package/ecryptfs-utils/ecryptfs-utils.mk | 4 +-
package/genromfs/genromfs.mk | 4 +-
package/libaio/libaio.mk | 6 ++--
package/libcec/libcec.mk | 2 +-
.../matchbox/matchbox-desktop/matchbox-desktop.mk | 6 ++--
.../matchbox-keyboard/matchbox-keyboard.mk | 6 ++--
package/matchbox/matchbox-lib/matchbox-lib.mk | 26 ++++++++++----------
package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++--
package/matchbox/matchbox-wm/matchbox-wm.mk | 18 +++++++-------
package/spice/spice.mk | 10 ++++----
support/dependencies/check-host-tar.mk | 4 +-
support/dependencies/check-host-xzcat.mk | 4 +-
14 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 2b862ec..8122741 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -72,8 +72,8 @@ endif
ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
ifneq ($(words $(KERNEL_DTS_NAME)),1)
-$(error Kernel with appended device tree needs exactly one DTS source.\
- Check BR2_LINUX_KERNEL_INTREE_DTS_NAME or BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.)
+$(error Kernel with appended device tree needs exactly one DTS source. \
+ Check BR2_LINUX_KERNEL_INTREE_DTS_NAME or BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.)
endif
endif
diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
index 280634d..9e25781 100644
--- a/package/celt051/celt051.mk
+++ b/package/celt051/celt051.mk
@@ -18,13 +18,13 @@ CELT051_DEPENDENCIES = libogg
# if target is the same kind as host (ie. same arch, same bitness,
# same endianness, so that /usr/lib contains libraries linkable by
# our cross-compiler)
-CELT051_CONF_OPTS = \
- --enable-fixed-point \
- --disable-fixed-point-debug \
- --disable-experimental-postfilter \
- --disable-static-modes \
- --disable-assertions \
- --disable-oggtest \
- --with-ogg=$(STAGING_DIR)/usr \
+CELT051_CONF_OPTS = \
+ --enable-fixed-point \
+ --disable-fixed-point-debug \
+ --disable-experimental-postfilter \
+ --disable-static-modes \
+ --disable-assertions \
+ --disable-oggtest \
+ --with-ogg=$(STAGING_DIR)/usr \
$(eval $(autotools-package))
diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
index e58bd8e..40cda06 100644
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -15,8 +15,8 @@ ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
#Needed for build system to find pk11func.h and libnss3.so
ECRYPTFS_UTILS_CONF_ENV = \
- NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \
- NSS_LIBS="-lnss3"
+ NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \
+ NSS_LIBS="-lnss3"
ifeq ($(BR2_PACKAGE_OPENSSL),y)
ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 4b64f39..8db0899 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -21,11 +21,11 @@ define GENROMFS_INSTALL_TARGET_CMDS
endef
define HOST_GENROMFS_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
endef
define HOST_GENROMFS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
endef
$(eval $(generic-package))
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 545a299..3988d65 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -12,15 +12,15 @@ LIBAIO_LICENSE = LGPLv2.1+
LIBAIO_LICENSE_FILES = COPYING
define LIBAIO_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+ $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
define LIBAIO_INSTALL_STAGING_CMDS
- $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+ $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
endef
define LIBAIO_INSTALL_TARGET_CMDS
- $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+ $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index 1a086b3..5a889b9 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -24,7 +24,7 @@ endif
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
LIBCEC_CONF_OPTS = --enable-rpi \
- --with-rpi-include-path=$(STAGING_DIR)/usr/include
+ --with-rpi-include-path=$(STAGING_DIR)/usr/include
LIBCEC_DEPENDENCIES += rpi-userland
LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
else
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index d0bac32..2ea8866 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -21,10 +21,10 @@ MATCHBOX_DESKTOP_AUTORECONF = YES
################################################################################
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
- MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification
- MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification
+MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification
+MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification
else
- MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification
+MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification
endif
################################################################################
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 44943b3..ebf23e4 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -23,10 +23,10 @@ MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FI
################################################################################
ifeq ($(BR2_PACKAGE_CAIRO),y)
- MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
- MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
+MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
+MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
else
- MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
+MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
endif
################################################################################
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 183b360..3149bbb 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -24,36 +24,36 @@ MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
- MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm
+MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm
endif
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
- MATCHBOX_LIB_CONF_OPTS += --enable-jpeg
- MATCHBOX_LIB_DEPENDENCIES += jpeg
+MATCHBOX_LIB_CONF_OPTS += --enable-jpeg
+MATCHBOX_LIB_DEPENDENCIES += jpeg
else
- MATCHBOX_LIB_CONF_OPTS += --disable-jpeg
+MATCHBOX_LIB_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
- MATCHBOX_LIB_CONF_OPTS += --enable-png
- MATCHBOX_LIB_DEPENDENCIES += libpng
+MATCHBOX_LIB_CONF_OPTS += --enable-png
+MATCHBOX_LIB_DEPENDENCIES += libpng
else
- MATCHBOX_LIB_CONF_OPTS += --disable-png
+MATCHBOX_LIB_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy)
- MATCHBOX_LIB_CONF_OPTS += --enable-pango
- MATCHBOX_LIB_DEPENDENCIES += pango
+MATCHBOX_LIB_CONF_OPTS += --enable-pango
+MATCHBOX_LIB_DEPENDENCIES += pango
else
- MATCHBOX_LIB_CONF_OPTS += --disable-pango
+MATCHBOX_LIB_CONF_OPTS += --disable-pango
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
- MATCHBOX_LIB_CONF_OPTS += --enable-xft
- MATCHBOX_LIB_DEPENDENCIES += xlib_libXft
+MATCHBOX_LIB_CONF_OPTS += --enable-xft
+MATCHBOX_LIB_DEPENDENCIES += xlib_libXft
else
- MATCHBOX_LIB_CONF_OPTS += --disable-xft
+MATCHBOX_LIB_CONF_OPTS += --disable-xft
endif
################################################################################
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index b4b1778..72ee286 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -16,10 +16,10 @@ MATCHBOX_PANEL_CONF_OPTS = --enable-expat
################################################################################
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
- MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
- MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
+MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
+MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
else
- MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
+MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
endif
################################################################################
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index a3a4326..2ccb16e 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -20,24 +20,24 @@ MATCHBOX_WM_CONF_ENV = expat=yes
ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
- MATCHBOX_WM_CONF_OPTS += --enable-composite
- MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
- MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
+MATCHBOX_WM_CONF_OPTS += --enable-composite
+MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
+MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
endif
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
- #MATCHBOX_WM_OPTS += --enable-standalone-xft
- MATCHBOX_WM_DEPENDENCIES += xlib_libXft
+#MATCHBOX_WM_OPTS += --enable-standalone-xft
+MATCHBOX_WM_DEPENDENCIES += xlib_libXft
else
- #MATCHBOX_WM_OPTS += --disable-standalone-xft
+#MATCHBOX_WM_OPTS += --disable-standalone-xft
endif
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
- MATCHBOX_WM_CONF_OPTS += --enable-startup-notification
- MATCHBOX_WM_DEPENDENCIES += startup-notification
+MATCHBOX_WM_CONF_OPTS += --enable-startup-notification
+MATCHBOX_WM_DEPENDENCIES += startup-notification
else
- MATCHBOX_WM_CONF_OPTS += --disable-startup-notification
+MATCHBOX_WM_CONF_OPTS += --disable-startup-notification
endif
################################################################################
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 0c0af6f..52a265e 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -21,11 +21,11 @@ SPICE_DEPENDENCIES = \
# We disable everything for now, because the dependency tree can become
# quite deep if we try to enable some features, and I have not tested that.
-SPICE_CONF_OPTS = \
- --disable-opengl \
- --disable-smartcard \
- --disable-automated-tests \
- --without-sasl \
+SPICE_CONF_OPTS = \
+ --disable-opengl \
+ --disable-smartcard \
+ --disable-automated-tests \
+ --without-sasl \
SPICE_DEPENDENCIES += host-pkgconf
diff --git a/support/dependencies/check-host-tar.mk b/support/dependencies/check-host-tar.mk
index 010bde7..9729507 100644
--- a/support/dependencies/check-host-tar.mk
+++ b/support/dependencies/check-host-tar.mk
@@ -1,8 +1,8 @@
TAR ?= tar
ifeq (,$(call suitable-host-package,tar,$(TAR)))
- DEPENDENCIES_HOST_PREREQ += host-tar
- TAR = $(HOST_DIR)/usr/bin/tar
+DEPENDENCIES_HOST_PREREQ += host-tar
+TAR = $(HOST_DIR)/usr/bin/tar
endif
# Since TAR is at least 1.17, it will certainly support --strip-components
diff --git a/support/dependencies/check-host-xzcat.mk b/support/dependencies/check-host-xzcat.mk
index 24286ef..5e08b6e 100644
--- a/support/dependencies/check-host-xzcat.mk
+++ b/support/dependencies/check-host-xzcat.mk
@@ -2,6 +2,6 @@
# If it is not present, build our own host-xzcat
ifeq (,$(call suitable-host-package,xzcat,$(XZCAT)))
- DEPENDENCIES_HOST_PREREQ += host-xz
- XZCAT = $(HOST_DIR)/usr/bin/xzcat
+DEPENDENCIES_HOST_PREREQ += host-xz
+XZCAT = $(HOST_DIR)/usr/bin/xzcat
endif
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-10-23 20:13 Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2014-10-23 20:13 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=595bf3065468b89503fa634156365897cdc96928
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
fs/cramfs/cramfs.mk | 2 +-
fs/tar/tar.mk | 2 +-
package/automake/automake.mk | 2 +-
package/cramfs/cramfs.mk | 12 ++++----
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/elfutils/elfutils.mk | 24 +++++++-------
package/genromfs/genromfs.mk | 10 +++---
package/i2c-tools/i2c-tools.mk | 2 +-
package/libgtk2/libgtk2.mk | 4 +-
package/liblog4c-localtime/liblog4c-localtime.mk | 2 +-
package/libxml-parser-perl/libxml-parser-perl.mk | 22 +++++++-------
.../matchbox/matchbox-fakekey/matchbox-fakekey.mk | 4 +-
.../matchbox-keyboard/matchbox-keyboard.mk | 2 +-
package/matchbox/matchbox-lib/matchbox-lib.mk | 2 +-
package/mtd/mtd.mk | 6 ++--
package/squashfs/squashfs.mk | 32 ++++++++++----------
.../xserver_xorg-server/xserver_xorg-server.mk | 2 +-
toolchain/helpers.mk | 4 +-
18 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index 9fbb7dd..7472372 100644
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -11,7 +11,7 @@ CRAMFS_OPTS = -l
endif
define ROOTFS_CRAMFS_CMD
- $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
+ $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
endef
ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
index f876d03..780827e 100644
--- a/fs/tar/tar.mk
+++ b/fs/tar/tar.mk
@@ -7,7 +7,7 @@
TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
define ROOTFS_TAR_CMD
- tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
+ tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
endef
$(eval $(call ROOTFS_TARGET,tar))
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 8d7e291..17bc799 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -13,7 +13,7 @@ AUTOMAKE_LICENSE_FILES = COPYING
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
define GTK_DOC_M4_INSTALL
- $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
+ $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
endef
# ensure staging aclocal dir exists
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index bcea6ef..72860b6 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -12,21 +12,21 @@ CRAMFS_LICENSE_FILES = COPYING
CRAMFS_DEPENDENCIES = zlib
define CRAMFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+ $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
endef
define CRAMFS_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs
- $(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck
+ $(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs
+ $(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck
endef
define HOST_CRAMFS_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)
+ $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)
endef
define HOST_CRAMFS_INSTALL_CMDS
- $(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs
- $(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
+ $(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs
+ $(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
endef
$(eval $(generic-package))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 3260501..3961a94 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -35,7 +35,7 @@ E2FSPROGS_MAKE_OPTS = \
LDCONFIG=true
define HOST_E2FSPROGS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
endef
# we don't have a host-util-linux
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 37db27a..163db96 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -38,34 +38,34 @@ ELFUTILS_CONF_ENV += \
LDFLAGS="$(ELFUTILS_LDFLAGS)"
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
- ELFUTILS_DEPENDENCIES += argp-standalone
+ELFUTILS_DEPENDENCIES += argp-standalone
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
- ELFUTILS_DEPENDENCIES += zlib
- ELFUTILS_CONF_OPTS += --with-zlib
+ELFUTILS_DEPENDENCIES += zlib
+ELFUTILS_CONF_OPTS += --with-zlib
else
- ELFUTILS_CONF_OPTS += --without-zlib
+ELFUTILS_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
- ELFUTILS_DEPENDENCIES += bzip2
- ELFUTILS_CONF_OPTS += --with-bzlib
+ELFUTILS_DEPENDENCIES += bzip2
+ELFUTILS_CONF_OPTS += --with-bzlib
else
- ELFUTILS_CONF_OPTS += --without-bzlib
+ELFUTILS_CONF_OPTS += --without-bzlib
endif
ifeq ($(BR2_PACKAGE_XZ),y)
- ELFUTILS_DEPENDENCIES += xz
- ELFUTILS_CONF_OPTS += --with-lzma
+ELFUTILS_DEPENDENCIES += xz
+ELFUTILS_CONF_OPTS += --with-lzma
else
- ELFUTILS_CONF_OPTS += --without-lzma
+ELFUTILS_CONF_OPTS += --without-lzma
endif
ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
- ELFUTILS_CONF_OPTS += --enable-progs
+ELFUTILS_CONF_OPTS += --enable-progs
else
- ELFUTILS_CONF_OPTS += --disable-progs
+ELFUTILS_CONF_OPTS += --disable-progs
endif
$(eval $(autotools-package))
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 2d50a52..4b64f39 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -10,14 +10,14 @@ GENROMFS_LICENSE = GPLv2+
GENROMFS_LICENSE_FILES = COPYING
define GENROMFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)"
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)"
endef
define GENROMFS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
endef
define HOST_GENROMFS_BUILD_CMDS
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 286c868..0115e22 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -11,7 +11,7 @@ I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus)
I2C_TOOLS_LICENSE_FILES = COPYING
define I2C_TOOLS_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
endef
define I2C_TOOLS_INSTALL_TARGET_CMDS
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 7bd7b4e..6a78a98 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -165,11 +165,11 @@ HOST_LIBGTK2_CONF_OPTS = \
--disable-cups
define HOST_LIBGTK2_BUILD_CMDS
- $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
+ $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
endef
define HOST_LIBGTK2_INSTALL_CMDS
- cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
+ cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
endef
$(eval $(autotools-package))
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index fd0f8f8..4af9ee5 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -19,4 +19,4 @@ endef
LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
- $(eval $(autotools-package))
+$(eval $(autotools-package))
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index a07f0a0..5c2ac54 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -12,23 +12,23 @@ LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+
LIBXML_PARSER_PERL_RUN_PERL = `which perl`
define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
- (cd $(@D) ; \
- $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
- PREFIX=$(HOST_DIR)/usr \
- EXPATLIBPATH=$(HOST_DIR)/usr/lib \
- EXPATINCPATH=$(HOST_DIR)/usr/include \
- INSTALLDIRS=site \
- INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
- INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
- )
+ (cd $(@D) ; \
+ $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
+ PREFIX=$(HOST_DIR)/usr \
+ EXPATLIBPATH=$(HOST_DIR)/usr/lib \
+ EXPATINCPATH=$(HOST_DIR)/usr/include \
+ INSTALLDIRS=site \
+ INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
+ INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
+ )
endef
define HOST_LIBXML_PARSER_PERL_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
endef
define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
endef
$(eval $(host-generic-package))
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index a7ad790..f687ca0 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
- $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
+ $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
+ $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
endef
MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 87e49e3..44943b3 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa
MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
- cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
+ cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
endef
MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 8b1eacd..183b360 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -15,7 +15,7 @@ MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
+ $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
endef
MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 1d92f81..3397ebc 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -95,9 +95,9 @@ define MTD_INSTALL_STAGING_CMDS
endef
define MTD_INSTALL_TARGET_CMDS
- for f in $(MTD_TARGETS_y) ; do \
- $(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
- done
+ for f in $(MTD_TARGETS_y) ; do \
+ $(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
+ done
endef
$(eval $(generic-package))
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 58dcb62..8ca9e2e 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -60,31 +60,31 @@ HOST_SQUASHFS_MAKE_ARGS = \
LZMA_XZ_SUPPORT=1
define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
- EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
- $(SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/
+ $(TARGET_MAKE_ENV) $(MAKE) \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/
endef
define SQUASHFS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
+ $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
endef
define HOST_SQUASHFS_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) \
- CC="$(HOSTCC)" \
- EXTRA_CFLAGS="$(HOST_CFLAGS)" \
- EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
- $(HOST_SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/
+ $(HOST_MAKE_ENV) $(MAKE) \
+ CC="$(HOSTCC)" \
+ EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
+ $(HOST_SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/
endef
define HOST_SQUASHFS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
+ $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
endef
$(eval $(generic-package))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 9ea2e1d..f118ef2 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -72,7 +72,7 @@ ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive --enable-xfbdev \
--disable-glx --disable-dri --disable-xsdl
define XSERVER_CREATE_X_SYMLINK
- ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
+ ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
endef
XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 8eb71ef..3121da4 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -48,7 +48,7 @@ copy_toolchain_lib_root = \
ARCH_LIB_DIR="$(strip $3)" ; \
LIB="$(strip $4)"; \
DESTDIR="$(strip $5)" ; \
- \
+\
for dir in \
$${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \
$${ARCH_SYSROOT_DIR}/usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \
@@ -80,7 +80,7 @@ copy_toolchain_lib_root = \
LIBPATH="`readlink -f $${LIBPATH}`"; \
done; \
done; \
- \
+\
echo -n
#
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [git commit] package: indentation cleanup
@ 2014-10-02 20:43 Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2014-10-02 20:43 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e7d8e346fd779bf75ff50b2b04677a6dc18ccea5
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/dillo/Config.in | 4 ++--
package/espeak/Config.in | 2 +-
package/ftop/Config.in | 2 +-
package/inadyn/Config.in | 2 +-
package/libstrophe/Config.in | 2 +-
package/mpd/Config.in | 2 +-
package/opencore-amr/Config.in | 2 +-
package/openvmtools/Config.in | 2 +-
package/phidgetwebservice/Config.in | 2 +-
package/php/Config.in | 2 +-
package/twolame/Config.in | 2 +-
package/wpa_supplicant/Config.in | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/package/dillo/Config.in b/package/dillo/Config.in
index bd317ff..8d3cbb1 100644
--- a/package/dillo/Config.in
+++ b/package/dillo/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_DILLO
http://www.dillo.org
comment "dillo needs a toolchain w/ C++"
- depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/espeak/Config.in b/package/espeak/Config.in
index 4fd7845..29dfec9 100644
--- a/package/espeak/Config.in
+++ b/package/espeak/Config.in
@@ -21,7 +21,7 @@ choice
default BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE
config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE
- bool "No sound backend, only produce wav files"
+ bool "No sound backend, only produce wav files"
config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA
bool "alsa via portaudio"
diff --git a/package/ftop/Config.in b/package/ftop/Config.in
index 878574f..d8f57b0 100644
--- a/package/ftop/Config.in
+++ b/package/ftop/Config.in
@@ -9,4 +9,4 @@ config BR2_PACKAGE_FTOP
https://code.google.com/p/ftop/
comment "ftop needs a toolchain w/ largefile"
- depends on !BR2_LARGEFILE
+ depends on !BR2_LARGEFILE
diff --git a/package/inadyn/Config.in b/package/inadyn/Config.in
index c1f7a77..2809531 100644
--- a/package/inadyn/Config.in
+++ b/package/inadyn/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_INADYN
https://github.com/troglobit/inadyn
comment "inadyn needs a toolchain w/ dynamic library"
- depends on BR2_PREFER_STATIC_LIB
+ depends on BR2_PREFER_STATIC_LIB
depends on BR2_USE_MMU
diff --git a/package/libstrophe/Config.in b/package/libstrophe/Config.in
index ff80532..55dc162 100644
--- a/package/libstrophe/Config.in
+++ b/package/libstrophe/Config.in
@@ -12,4 +12,4 @@ config BR2_PACKAGE_LIBSTROPHE
https://github.com/strophe/libstrophe
comment "libstrophe needs a toolchain w/ threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 108b2b1..8884464 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -188,7 +188,7 @@ config BR2_PACKAGE_MPD_TWOLAME
Enable TwoLAME mp2 encoding.
comment "twolame support needs a toolchain w/ largefile"
- depends on !BR2_LARGEFILE
+ depends on !BR2_LARGEFILE
config BR2_PACKAGE_MPD_VORBIS
bool "vorbis"
diff --git a/package/opencore-amr/Config.in b/package/opencore-amr/Config.in
index 93b6457..1ccc631 100644
--- a/package/opencore-amr/Config.in
+++ b/package/opencore-amr/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_OPENCORE_AMR
http://opencore-amr.sourceforge.net/
comment "opencore-amr needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in
index 319b653..b0bdd52 100644
--- a/package/openvmtools/Config.in
+++ b/package/openvmtools/Config.in
@@ -16,7 +16,7 @@ config BR2_PACKAGE_OPENVMTOOLS
ICU locales and X11 tools are currently not supported.
NOTE: Support for vmblock-fuse will be enabled in openvmtools if the
- libfuse package is selected.
+ libfuse package is selected.
if BR2_PACKAGE_OPENVMTOOLS
diff --git a/package/phidgetwebservice/Config.in b/package/phidgetwebservice/Config.in
index b85166e..df41d2a 100644
--- a/package/phidgetwebservice/Config.in
+++ b/package/phidgetwebservice/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE
depends on !BR2_PREFER_STATIC_LIB # libphidget
select BR2_PACKAGE_LIBPHIDGET
help
- phidgetwebservice (the Phidget WebService) provides an HTTP
+ phidgetwebservice (the Phidget WebService) provides an HTTP
front-end to the libphidget device control API. This provides
an alternative to the libphidget C linkage interface for
controlling locally attached Phidgets USB devices and it also
diff --git a/package/php/Config.in b/package/php/Config.in
index 4ee14c3..32faa32 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -18,7 +18,7 @@ config BR2_PACKAGE_PHP_CGI
bool
config BR2_PACKAGE_PHP_FPM
- bool
+ bool
choice
prompt "Interface"
diff --git a/package/twolame/Config.in b/package/twolame/Config.in
index bd151e2..93cfe0b 100644
--- a/package/twolame/Config.in
+++ b/package/twolame/Config.in
@@ -10,4 +10,4 @@ config BR2_PACKAGE_TWOLAME
http://www.twolame.org/
comment "twolame needs a toolchain w/ largefile"
- depends on !BR2_LARGEFILE
+ depends on !BR2_LARGEFILE
diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index 81c61ac..6b1c492 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -28,7 +28,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT
Enable Hotspot 2.0 and IEEE 802.11u interworking functionality.
config BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG
- bool "Enable syslog support"
+ bool "Enable syslog support"
help
Enable support for sending debug messages to syslog.
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-06-22 21:05 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-22 21:05 [Buildroot] [git commit] package: indentation cleanup Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2015-06-18 21:41 Thomas Petazzoni
2015-01-15 8:41 Thomas Petazzoni
2014-12-30 10:17 Peter Korsgaard
2014-12-24 10:41 Thomas Petazzoni
2014-12-22 8:27 Thomas Petazzoni
2014-12-20 20:48 Thomas Petazzoni
2014-12-10 20:53 Thomas Petazzoni
2014-11-02 22:27 Peter Korsgaard
2014-11-03 7:33 ` Thomas Petazzoni
2014-11-03 8:00 ` Peter Korsgaard
2014-10-26 4:47 Peter Korsgaard
2014-10-25 8:38 Thomas Petazzoni
2014-10-24 23:11 Peter Korsgaard
2014-10-23 20:13 Thomas Petazzoni
2014-10-02 20:43 Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.