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>
76 lines
2.8 KiB
Makefile
76 lines
2.8 KiB
Makefile
################################################################################
|
|
#
|
|
# ccache
|
|
#
|
|
################################################################################
|
|
|
|
CCACHE_VERSION = 3.1.8
|
|
CCACHE_SITE = http://samba.org/ftp/ccache
|
|
CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
|
|
CCACHE_LICENSE = GPLv3+, others
|
|
CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
|
|
|
|
# Force ccache to use its internal zlib. The problem is that without
|
|
# this, ccache would link against the zlib of the build system, but we
|
|
# might build and install a different version of zlib in $(O)/host
|
|
# afterwards, which ccache will pick up. This might break if there is
|
|
# a version mismatch. A solution would be to add host-zlib has a
|
|
# dependency of ccache, but it would require tuning the zlib .mk file
|
|
# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy
|
|
# path: tell ccache to use its internal copy of zlib, so that ccache
|
|
# has zero dependency besides the C library.
|
|
HOST_CCACHE_CONF_OPTS += ccache_cv_zlib_1_2_3=no
|
|
|
|
# Patch host-ccache as follows:
|
|
# - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR
|
|
# is already used by autotargets for the ccache package.
|
|
# BR_CACHE_DIR is exported by Makefile based on config option
|
|
# BR2_CCACHE_DIR.
|
|
# - ccache shouldn't use the compiler binary mtime to detect a change in
|
|
# the compiler, because in the context of Buildroot, that completely
|
|
# defeats the purpose of ccache. Of course, that leaves the user
|
|
# responsible for purging its cache when the compiler changes.
|
|
# - Change hard-coded last-ditch default to match path in .config, to avoid
|
|
# the need to specify BR_CACHE_DIR when invoking ccache directly.
|
|
define HOST_CCACHE_PATCH_CONFIGURATION
|
|
sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c
|
|
sed -i 's,getenv("CCACHE_COMPILERCHECK"),"none",' $(@D)/ccache.c
|
|
sed -i 's,"%s/.ccache","$(BR_CACHE_DIR)",' $(@D)/ccache.c
|
|
endef
|
|
|
|
HOST_CCACHE_POST_CONFIGURE_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION
|
|
|
|
define HOST_CCACHE_MAKE_CACHE_DIR
|
|
mkdir -p $(BR_CACHE_DIR)
|
|
endef
|
|
|
|
HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_MAKE_CACHE_DIR
|
|
|
|
# Provide capability to do initial ccache setup (e.g. increase default size)
|
|
BR_CCACHE_INITIAL_SETUP = $(call qstrip,$(BR2_CCACHE_INITIAL_SETUP))
|
|
ifneq ($(BR_CCACHE_INITIAL_SETUP),)
|
|
define HOST_CCACHE_DO_INITIAL_SETUP
|
|
@$(call MESSAGE,"Applying initial settings")
|
|
$(CCACHE) $(BR_CCACHE_INITIAL_SETUP)
|
|
$(CCACHE) -s
|
|
endef
|
|
|
|
HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP
|
|
endif
|
|
|
|
$(eval $(host-autotools-package))
|
|
|
|
ifeq ($(BR2_CCACHE),y)
|
|
ccache-stats: host-ccache
|
|
$(Q)$(CCACHE) -s
|
|
|
|
ccache-options: host-ccache
|
|
ifeq ($(CCACHE_OPTIONS),)
|
|
$(Q)echo "Usage: make ccache-options CCACHE_OPTIONS=\"opts\""
|
|
$(Q)echo "where 'opts' corresponds to one or more valid ccache options" \
|
|
"(see ccache help text below)"
|
|
$(Q)echo
|
|
endif
|
|
$(Q)$(CCACHE) $(CCACHE_OPTIONS)
|
|
endif
|