f268f7131b
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
81 lines
2.5 KiB
Makefile
81 lines
2.5 KiB
Makefile
################################################################################
|
||
#
|
||
# qemu
|
||
#
|
||
################################################################################
|
||
|
||
QEMU_VERSION = 2.1.0
|
||
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
|
||
QEMU_SITE = http://wiki.qemu.org/download
|
||
QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c
|
||
QEMU_LICENSE_FILES = COPYING COPYING.LIB
|
||
# NOTE: there is no top-level license file for non-(L)GPL licenses;
|
||
# the non-(L)GPL license texts are specified in the affected
|
||
# individual source files.
|
||
|
||
#-------------------------------------------------------------
|
||
# Host-qemu
|
||
|
||
HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
|
||
|
||
# BR ARCH qemu
|
||
# ------- ----
|
||
# arm arm
|
||
# armeb armeb
|
||
# avr32 not supported
|
||
# bfin not supported
|
||
# i386 i386
|
||
# i486 i386
|
||
# i586 i386
|
||
# i686 i386
|
||
# x86_64 x86_64
|
||
# m68k m68k
|
||
# microblaze microblaze
|
||
# mips mips
|
||
# mipsel mipsel
|
||
# mips64 ?
|
||
# mips64el ?
|
||
# powerpc ppc
|
||
# sh2a not supported
|
||
# sh4 sh4
|
||
# sh4eb sh4eb
|
||
# sh4a ?
|
||
# sh4aeb ?
|
||
# sh64 not supported
|
||
# sparc sparc
|
||
|
||
HOST_QEMU_ARCH = $(ARCH)
|
||
ifeq ($(HOST_QEMU_ARCH),i486)
|
||
HOST_QEMU_ARCH = i386
|
||
endif
|
||
ifeq ($(HOST_QEMU_ARCH),i586)
|
||
HOST_QEMU_ARCH = i386
|
||
endif
|
||
ifeq ($(HOST_QEMU_ARCH),i686)
|
||
HOST_QEMU_ARCH = i386
|
||
endif
|
||
ifeq ($(HOST_QEMU_ARCH),powerpc)
|
||
HOST_QEMU_ARCH = ppc
|
||
endif
|
||
HOST_QEMU_TARGETS = $(HOST_QEMU_ARCH)-linux-user
|
||
|
||
# Note: although QEMU has a ./configure script, it is not a real autotools
|
||
# package, and ./configure chokes on options such as --host or --target.
|
||
# So, provide out own _CONFIGURE_CMDS to override the defaults.
|
||
define HOST_QEMU_CONFIGURE_CMDS
|
||
(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
|
||
--target-list="$(HOST_QEMU_TARGETS)" \
|
||
--prefix="$(HOST_DIR)/usr" \
|
||
--interp-prefix=$(STAGING_DIR) \
|
||
--cc="$(HOSTCC)" \
|
||
--host-cc="$(HOSTCC)" \
|
||
--extra-cflags="$(HOST_CFLAGS)" \
|
||
--extra-ldflags="$(HOST_LDFLAGS)" \
|
||
)
|
||
endef
|
||
|
||
$(eval $(host-autotools-package))
|
||
|
||
# variable used by other packages
|
||
QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)
|