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>
135 lines
3.9 KiB
Makefile
135 lines
3.9 KiB
Makefile
################################################################################
|
|
#
|
|
# nodejs
|
|
#
|
|
################################################################################
|
|
|
|
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))
|
|
HOST_NODEJS_DEPENDENCIES = host-python host-zlib
|
|
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
|
|
NODEJS_LICENSE_FILES = LICENSE
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
NODEJS_DEPENDENCIES += openssl
|
|
endif
|
|
|
|
# nodejs build system is based on python, but only support python-2.6 or
|
|
# python-2.7. So, we have to enforce PYTHON interpreter to be python2.
|
|
define HOST_NODEJS_CONFIGURE_CMDS
|
|
# Build with the static, built-in OpenSSL which is supplied as part of
|
|
# the nodejs source distribution. This is needed on the host because
|
|
# NPM is non-functional without it, and host-openssl isn't part of
|
|
# buildroot.
|
|
(cd $(@D); \
|
|
$(HOST_CONFIGURE_OPTS) \
|
|
PYTHON=$(HOST_DIR)/usr/bin/python2 \
|
|
$(HOST_DIR)/usr/bin/python2 ./configure \
|
|
--prefix=$(HOST_DIR)/usr \
|
|
--without-snapshot \
|
|
--without-dtrace \
|
|
--without-etw \
|
|
--shared-zlib \
|
|
)
|
|
endef
|
|
|
|
define HOST_NODEJS_BUILD_CMDS
|
|
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
|
|
$(MAKE) -C $(@D) \
|
|
$(HOST_CONFIGURE_OPTS)
|
|
endef
|
|
|
|
define HOST_NODEJS_INSTALL_CMDS
|
|
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
|
|
$(MAKE) -C $(@D) install \
|
|
$(HOST_CONFIGURE_OPTS)
|
|
endef
|
|
|
|
ifeq ($(BR2_i386),y)
|
|
NODEJS_CPU = ia32
|
|
else ifeq ($(BR2_x86_64),y)
|
|
NODEJS_CPU = x64
|
|
else ifeq ($(BR2_mipsel),y)
|
|
NODEJS_CPU = mipsel
|
|
else ifeq ($(BR2_arm),y)
|
|
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
|
|
else
|
|
NODEJS_ARM_FP = softfp
|
|
endif
|
|
endif
|
|
|
|
define NODEJS_CONFIGURE_CMDS
|
|
(cd $(@D); \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
LD="$(TARGET_CXX)" \
|
|
PYTHON=$(HOST_DIR)/usr/bin/python2 \
|
|
$(HOST_DIR)/usr/bin/python2 ./configure \
|
|
--prefix=/usr \
|
|
--without-snapshot \
|
|
--shared-zlib \
|
|
$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
|
|
$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
|
|
--without-dtrace \
|
|
--without-etw \
|
|
--dest-cpu=$(NODEJS_CPU) \
|
|
$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \
|
|
--dest-os=linux \
|
|
)
|
|
endef
|
|
|
|
define NODEJS_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
|
|
$(MAKE) -C $(@D) \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
LD="$(TARGET_CXX)"
|
|
endef
|
|
|
|
#
|
|
# Build the list of modules to install based on the booleans for
|
|
# popular modules, as well as the "additional modules" list.
|
|
#
|
|
NODEJS_MODULES_LIST= $(call qstrip,\
|
|
$(if $(BR2_PACKAGE_NODEJS_MODULES_EXPRESS),express) \
|
|
$(if $(BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT),coffee-script) \
|
|
$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))
|
|
|
|
#
|
|
# We can only call NPM if there's something to install.
|
|
#
|
|
ifneq ($(NODEJS_MODULES_LIST),)
|
|
define NODEJS_INSTALL_MODULES
|
|
# If you're having trouble with module installation, adding -d to the
|
|
# npm install call below and setting npm_config_rollback=false can both
|
|
# help in diagnosing the problem.
|
|
(cd $(TARGET_DIR)/usr/lib && mkdir -p node_modules && \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
LD="$(TARGET_CXX)" \
|
|
npm_config_arch=$(NODEJS_CPU) \
|
|
npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \
|
|
$(HOST_DIR)/usr/bin/npm install \
|
|
$(NODEJS_MODULES_LIST) \
|
|
)
|
|
endef
|
|
endif
|
|
|
|
define NODEJS_INSTALL_TARGET_CMDS
|
|
$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
|
|
$(MAKE) -C $(@D) install \
|
|
DESTDIR=$(TARGET_DIR) \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
LD="$(TARGET_CXX)"
|
|
$(NODEJS_INSTALL_MODULES)
|
|
endef
|
|
|
|
# node.js configure is a Python script and does not use autotools
|
|
$(eval $(generic-package))
|
|
$(eval $(host-generic-package))
|