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>
127 lines
3.5 KiB
Makefile
127 lines
3.5 KiB
Makefile
################################################################################
|
|
#
|
|
# valgrind
|
|
#
|
|
################################################################################
|
|
|
|
VALGRIND_VERSION = 3.10.0
|
|
VALGRIND_SITE = http://valgrind.org/downloads
|
|
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
|
|
VALGRIND_LICENSE = GPLv2 GFDLv1.2
|
|
VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
|
|
VALGRIND_CONF_OPTS = --disable-tls
|
|
VALGRIND_AUTORECONF = YES
|
|
|
|
# On ARM, Valgrind only supports ARMv7, and uses the arch part of the
|
|
# host tuple to determine whether it's being built for ARMv7 or
|
|
# not. Therefore, we adjust the host tuple to specify we're on
|
|
# ARMv7. The valgrind package is guaranteed, through Config.in, to
|
|
# only be selected on Cortex A8 and Cortex A9 platforms.
|
|
ifeq ($(BR2_cortex_a5)$(BR2_cortex_a7)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a12)$(BR2_cortex_a15),y)
|
|
VALGRIND_CONF_OPTS += \
|
|
--host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME))
|
|
endif
|
|
|
|
define VALGRIND_INSTALL_UCLIBC_SUPP
|
|
$(INSTALL) -D -m 0644 package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/uclibc.supp
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_INSTALL_UCLIBC_SUPP
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_MEMCHECK),)
|
|
define VALGRIND_REMOVE_MEMCHECK
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*memcheck*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MEMCHECK
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_CACHEGRIND),)
|
|
define VALGRIND_REMOVE_CACHEGRIND
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*cachegrind*
|
|
for i in cg_annotate cg_diff cg_merge; do \
|
|
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
|
|
done
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_CACHEGRIND
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_CALLGRIND),)
|
|
define VALGRIND_REMOVE_CALLGRIND
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*callgrind*
|
|
for i in callgrind_annotate callgrind_control ; do \
|
|
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
|
|
done
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_CALLGRIND
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_HELGRIND),)
|
|
define VALGRIND_REMOVE_HELGRIND
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*helgrind*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_HELGRIND
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_DRD),)
|
|
define VALGRIND_REMOVE_DRD
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*drd*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DRD
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_MASSIF),)
|
|
define VALGRIND_REMOVE_MASSIF
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*massif*
|
|
rm -f $(TARGET_DIR)/usr/bin/ms_script
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MASSIF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_DHAT),)
|
|
define VALGRIND_REMOVE_DHAT
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*dhat*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DHAT
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_PTRCHECK),)
|
|
define VALGRIND_REMOVE_PTRCHECK
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*ptrcheck*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_PTRCHECK
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_BBV),)
|
|
define VALGRIND_REMOVE_BBV
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*bbv*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_BBV
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_LACKEY),)
|
|
define VALGRIND_REMOVE_LACKEY
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*lackey*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_LACKEY
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_VALGRIND_NULGRIND),)
|
|
define VALGRIND_REMOVE_NULGRIND
|
|
rm -f $(TARGET_DIR)/usr/lib/valgrind/*none*
|
|
endef
|
|
|
|
VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_NULGRIND
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|