.mk files: bulk aligment and whitespace cleanup of assignments

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>
2014-10-07 09:06:03 +02:00 · 2014-10-07 09:06:03 +02:00 · f268f7131b
parent cf197b2d18
commit f268f7131b
134 changed files with 396 additions and 396 deletions
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@ -56,7 +56,7 @@ UBOOT_BIN          = u-boot.bin
 UBOOT_BIN_IFT = $(UBOOT_BIN).ift
 endif

-UBOOT_ARCH=$(KERNEL_ARCH)
+UBOOT_ARCH = $(KERNEL_ARCH)

 UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
 UBOOT_MAKE_OPTS += \
--- a/fs/romfs/romfs.mk
+++ b/fs/romfs/romfs.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-ROMFS_TARGET=$(IMAGE).romfs
+ROMFS_TARGET = $(IMAGE).romfs

 ROOTFS_ROMFS_DEPENDENCIES = host-genromfs

--- a/linux/linux.mk
+++ b/linux/linux.mk
@ -113,7 +113,7 @@ ifeq ($(LINUX_IMAGE_NAME),)
 LINUX_IMAGE_NAME = $(LINUX_TARGET_NAME)
 endif

-LINUX_KERNEL_UIMAGE_LOADADDR=$(call qstrip,$(BR2_LINUX_KERNEL_UIMAGE_LOADADDR))
+LINUX_KERNEL_UIMAGE_LOADADDR = $(call qstrip,$(BR2_LINUX_KERNEL_UIMAGE_LOADADDR))
 ifneq ($(LINUX_KERNEL_UIMAGE_LOADADDR),)
 LINUX_MAKE_FLAGS += LOADADDR="$(LINUX_KERNEL_UIMAGE_LOADADDR)"
 endif
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@ -17,7 +17,7 @@ AXEL_LDFLAGS += -lintl
 endif

 ifneq ($(BR2_ENABLE_LOCALE),y)
-AXEL_DISABLE_I18N=--i18n=0
+AXEL_DISABLE_I18N = --i18n=0
 endif

 define AXEL_CONFIGURE_CMDS
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@ -99,7 +99,7 @@ HOST_DBUS_CONF_OPTS = \
 		--with-xml=expat

 # dbus for the host
-DBUS_HOST_INTROSPECT=$(HOST_DBUS_DIR)/introspect.xml
+DBUS_HOST_INTROSPECT = $(HOST_DBUS_DIR)/introspect.xml

 HOST_DBUS_GEN_INTROSPECT = \
 	$(HOST_DIR)/usr/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT)
--- a/package/gnu-efi/gnu-efi.mk
+++ b/package/gnu-efi/gnu-efi.mk
@ -17,9 +17,9 @@ GNU_EFI_LICENSE_FILES = debian/copyright
 GNU_EFI_INSTALL_TARGET = NO

 ifeq ($(BR2_i386),y)
-GNU_EFI_PLATFORM=ia32
+GNU_EFI_PLATFORM = ia32
 else ifeq ($(BR2_x86_64),y)
-GNU_EFI_PLATFORM=x86_64
+GNU_EFI_PLATFORM = x86_64
 endif

 define GNU_EFI_BUILD_CMDS
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@ -11,8 +11,8 @@ LINUX_FUSION_DEPENDENCIES = linux
 LINUX_FUSION_LICENSE = GPLv2+
 LINUX_FUSION_LICENSE_FILES = debian/copyright

-LINUX_FOR_FUSION=$(LINUX_VERSION_PROBED)
-LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
+LINUX_FOR_FUSION = $(LINUX_VERSION_PROBED)
+LINUX_FUSION_ETC_DIR = $(TARGET_DIR)/etc/udev/rules.d

 LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
 LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX_DIR)
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@ -18,7 +18,7 @@ LTTNG_LIBUST_DEPENDENCIES += python
 else ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LTTNG_LIBUST_DEPENDENCIES += python3
 else
-LTTNG_LIBUST_CONF_ENV=am_cv_pathless_PYTHON="none"
+LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none"
 endif

 $(eval $(autotools-package))
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@ -32,9 +32,9 @@ endif
 # bitness is used. Of course, this assumes that the 32 bits multilib
 # libraries are installed.
 ifeq ($(BR2_ARCH_IS_64),y)
-LUAJIT_HOST_CC=$(HOSTCC)
+LUAJIT_HOST_CC = $(HOSTCC)
 else
-LUAJIT_HOST_CC=$(HOSTCC) -m32
+LUAJIT_HOST_CC = $(HOSTCC) -m32
 endif

 # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@ -49,20 +49,20 @@ define HOST_NODEJS_INSTALL_CMDS
 endef

 ifeq ($(BR2_i386),y)
-NODEJS_CPU=ia32
+NODEJS_CPU = ia32
 else ifeq ($(BR2_x86_64),y)
-NODEJS_CPU=x64
+NODEJS_CPU = x64
 else ifeq ($(BR2_mipsel),y)
-NODEJS_CPU=mipsel
+NODEJS_CPU = mipsel
 else ifeq ($(BR2_arm),y)
-NODEJS_CPU=arm
+NODEJS_CPU = arm
 # V8 needs to know what floating point ABI the target is using.  There's also
 # a 'hard' option which we're not exposing here at the moment, because
 # buildroot itself doesn't really support it at present.
 ifeq ($(BR2_SOFT_FLOAT),y)
-NODEJS_ARM_FP=soft
+NODEJS_ARM_FP = soft
 else
-NODEJS_ARM_FP=softfp
+NODEJS_ARM_FP = softfp
 endif
 endif

--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@ -17,7 +17,7 @@ else
 	PCIUTILS_ZLIB=no
 endif

-PCIUTILS_DNS=no
+PCIUTILS_DNS = no

 ifeq ($(BR2_PACKAGE_KMOD),y)
 	PCIUTILS_DEPENDENCIES += kmod
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@ -21,7 +21,7 @@ export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
 # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
 # external-deps target.
-DL_MODE=DOWNLOAD
+DL_MODE = DOWNLOAD

 # DL_DIR may have been set already from the environment
 ifeq ($(origin DL_DIR),undefined)
@ -44,16 +44,16 @@ DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd)
 # * scp://www.example.com:dir/file (with domainseparator :)
 #
 # geturischeme: http
-geturischeme=$(firstword $(subst ://, ,$(call qstrip,$(1))))
+geturischeme = $(firstword $(subst ://, ,$(call qstrip,$(1))))
 # stripurischeme: www.example.com/dir/file
-stripurischeme=$(lastword $(subst ://, ,$(call qstrip,$(1))))
+stripurischeme = $(lastword $(subst ://, ,$(call qstrip,$(1))))
 # domain: www.example.com
-domain=$(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1))))
+domain = $(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1))))
 # notdomain: dir/file
-notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1)))
+notdomain = $(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1)))
 #
 # default domainseparator is /, specify alternative value as first argument
-domainseparator=$(if $(1),$(1),/)
+domainseparator = $(if $(1),$(1),/)

 # github(user,package,version): returns site of GitHub repository
 github = https://github.com/$(1)/$(2)/archive/$(3)
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@ -100,7 +100,7 @@ endef
 #
 # legal-info helper functions
 #
-LEGAL_INFO_SEPARATOR="::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::"
+LEGAL_INFO_SEPARATOR = "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::"

 define legal-warning # text
 	echo "WARNING: $(1)" >>$(LEGAL_WARNINGS)
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@ -44,7 +44,7 @@ endef

 PROFTPD_POST_CONFIGURE_HOOKS = PROFTPD_MAKENAMES

-PROFTPD_MAKE=$(MAKE1)
+PROFTPD_MAKE = $(MAKE1)

 define PROFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
--- a/package/python-mad/python-mad.mk
+++ b/package/python-mad/python-mad.mk
@ -14,9 +14,9 @@ PYTHON_MAD_LICENSE_FILES = COPYING
 PYTHON_MAD_DEPENDENCIES = libmad

 ifeq ($(BR2_ENDIAN),"LITTLE")
-PYTHON_MAD_ENDIAN=little
+PYTHON_MAD_ENDIAN = little
 else
-PYTHON_MAD_ENDIAN=big
+PYTHON_MAD_ENDIAN = big
 endif

 define PYTHON_MAD_CONFIGURE_CMDS
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@ -57,7 +57,7 @@ endif
 ifeq ($(HOST_QEMU_ARCH),powerpc)
    HOST_QEMU_ARCH = ppc
 endif
-HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
+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.
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@ -28,7 +28,7 @@ ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
 QT_CONFIGURE_OPTS += -opensource -confirm-license
 endif

-QT_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
+QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))

 ifneq ($(QT_CONFIG_FILE),)
 QT_CONFIGURE_OPTS += -qconfig buildroot
@ -588,7 +588,7 @@ ifeq ($(BR2_PACKAGE_QT_TEST),y)
 QT_INSTALL_LIBS += QtTest
 endif

-QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
+QT_CONF_FILE = $(HOST_DIR)/usr/bin/qt.conf

 # Since host programs and spec files have been moved to $(HOST_DIR),
 # we need to tell qmake the new location of the various elements,
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@ -21,7 +21,7 @@ endif

 THTTPD_POST_PATCH_HOOKS = THTTPD_DEBIAN_PATCHES

-THTTPD_MAKE=$(MAKE1)
+THTTPD_MAKE = $(MAKE1)

 define THTTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/thttpd $(TARGET_DIR)/usr/sbin/thttpd
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@ -17,7 +17,7 @@ ZXING_DEPENDENCIES += libiconv
 else
 # There is no locale support in the toolchain and libiconv
 # is not available so disable iconv support in zxing
-ZING_MAKE_OPTS=CXXFLAGS+="-DNO_ICONV"
+ZING_MAKE_OPTS = CXXFLAGS+="-DNO_ICONV"
 endif
 endif

--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@ -17,7 +17,7 @@ endef
 -include $(sort $(wildcard support/dependencies/check-host-*.mk))

 ifeq ($(BR2_STRIP_sstrip),y)
-DEPENDENCIES_HOST_PREREQ+=host-sstrip
+DEPENDENCIES_HOST_PREREQ += host-sstrip
 endif

 ifeq ($(BR2_CCACHE),y)
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@ -62,22 +62,22 @@
 #  of Buildroot is handled identical for the 2 toolchain types.

 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
-LIB_EXTERNAL_LIBS+=libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
+LIB_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy)
-LIB_EXTERNAL_LIBS+=ld-linux-armhf.so.*
+LIB_EXTERNAL_LIBS += ld-linux-armhf.so.*
 else
-LIB_EXTERNAL_LIBS+=ld*.so.*
+LIB_EXTERNAL_LIBS += ld*.so.*
 endif
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-LIB_EXTERNAL_LIBS+=libpthread.so.*
+LIB_EXTERNAL_LIBS += libpthread.so.*
 ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
-LIB_EXTERNAL_LIBS+=libthread_db.so.*
+LIB_EXTERNAL_LIBS += libthread_db.so.*
 endif # gdbserver
 endif # ! no threads
 endif

 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
-LIB_EXTERNAL_LIBS+=libnss_files.so.* libnss_dns.so.*
+LIB_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.*
 endif

 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
@ -85,10 +85,10 @@ LIB_EXTERNAL_LIBS += libc.so libgcc_s.so.*
 endif

 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-USR_LIB_EXTERNAL_LIBS+=libstdc++.so.*
+USR_LIB_EXTERNAL_LIBS += libstdc++.so.*
 endif

-LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
+LIB_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))

 # Details about sysroot directory selection.
 #
@ -127,11 +127,11 @@ LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
 # each variant-specific sysroot directory.


-TOOLCHAIN_EXTERNAL_PREFIX=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
+TOOLCHAIN_EXTERNAL_PREFIX = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
-TOOLCHAIN_EXTERNAL_INSTALL_DIR=$(HOST_DIR)/opt/ext-toolchain
+TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain
 else
-TOOLCHAIN_EXTERNAL_INSTALL_DIR=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
+TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 endif

 ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
@ -147,10 +147,10 @@ TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
 endif
 endif

-TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
-TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
-TOOLCHAIN_EXTERNAL_CXX=$(TOOLCHAIN_EXTERNAL_CROSS)g++
-TOOLCHAIN_EXTERNAL_READELF=$(TOOLCHAIN_EXTERNAL_CROSS)readelf
+TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
+TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc
+TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++
+TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = -DBR_SYSROOT='"$(STAGING_SUBDIR)"'

 ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),)
@ -163,17 +163,17 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
 	-DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"'
 endif

-CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+CC_TARGET_TUNE_ := $(call qstrip,$(BR2_GCC_TARGET_TUNE))
 ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
-CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))
+CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU))
 else
-CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
+CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
 endif
-CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
-CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
-CC_TARGET_FPU_:=$(call qstrip,$(BR2_GCC_TARGET_FPU))
-CC_TARGET_FLOAT_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
-CC_TARGET_MODE_:=$(call qstrip,$(BR2_GCC_TARGET_MODE))
+CC_TARGET_ARCH_ := $(call qstrip,$(BR2_GCC_TARGET_ARCH))
+CC_TARGET_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_ABI))
+CC_TARGET_FPU_ := $(call qstrip,$(BR2_GCC_TARGET_FPU))
+CC_TARGET_FLOAT_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
+CC_TARGET_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_MODE))

 # march/mtune/floating point mode needs to be passed to the external toolchain
 # to select the right multilib variant