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>
192 lines
5.9 KiB
Makefile
192 lines
5.9 KiB
Makefile
################################################################################
|
|
# Perl package infrastructure
|
|
#
|
|
# This file implements an infrastructure that eases development of
|
|
# package .mk files for Perl packages.
|
|
#
|
|
# See the Buildroot documentation for details on the usage of this
|
|
# infrastructure
|
|
#
|
|
# In terms of implementation, this perl infrastructure requires
|
|
# the .mk file to only specify metadata information about the
|
|
# package: name, version, download URL, etc.
|
|
#
|
|
# We still allow the package .mk file to override what the different
|
|
# steps are doing, if needed. For example, if <PKG>_BUILD_CMDS is
|
|
# already defined, it is used as the list of commands to perform to
|
|
# build the package, instead of the default perl behaviour. The
|
|
# package can also define some post operation hooks.
|
|
#
|
|
################################################################################
|
|
|
|
PERL_ARCHNAME = $(ARCH)-linux
|
|
|
|
################################################################################
|
|
# inner-perl-package -- defines how the configuration, compilation and
|
|
# installation of a perl package should be done, implements a
|
|
# few hooks to tune the build process for perl specifities and
|
|
# calls the generic package infrastructure to generate the necessary
|
|
# make targets
|
|
#
|
|
# argument 1 is the lowercase package name
|
|
# argument 2 is the uppercase package name, including a HOST_ prefix
|
|
# for host packages
|
|
# argument 3 is the uppercase package name, without the HOST_ prefix
|
|
# for host packages
|
|
# argument 4 is the type (target or host)
|
|
################################################################################
|
|
|
|
define inner-perl-package
|
|
|
|
#
|
|
# Configure step. Only define it if not already defined by the package
|
|
# .mk file. And take care of the differences between host and target
|
|
# packages.
|
|
#
|
|
ifndef $(2)_CONFIGURE_CMDS
|
|
ifeq ($(4),target)
|
|
|
|
# Configure package for target
|
|
define $(2)_CONFIGURE_CMDS
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
|
$$($(2)_CONF_ENV) \
|
|
PERL_MM_USE_DEFAULT=1 \
|
|
perl Build.PL \
|
|
--config ar="$$(TARGET_AR)" \
|
|
--config full_ar="$$(TARGET_AR)" \
|
|
--config cc="$$(TARGET_CC)" \
|
|
--config ccflags="$$(TARGET_CFLAGS)" \
|
|
--config optimize=" " \
|
|
--config ld="$$(TARGET_CC)" \
|
|
--config lddlflags="-shared $$(TARGET_LDFLAGS)" \
|
|
--config ldflags="$$(TARGET_LDFLAGS)" \
|
|
--include_dirs $$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
|
|
--destdir $$(TARGET_DIR) \
|
|
--installdirs vendor \
|
|
--install_path lib=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \
|
|
--install_path arch=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$$(PERL_ARCHNAME) \
|
|
--install_path bin=/usr/bin \
|
|
--install_path script=/usr/bin \
|
|
--install_path bindoc=/usr/share/man/man1 \
|
|
--install_path libdoc=/usr/share/man/man3 \
|
|
$$($(2)_CONF_OPTS); \
|
|
else \
|
|
$$($(2)_CONF_ENV) \
|
|
PERL_MM_USE_DEFAULT=1 \
|
|
PERL_AUTOINSTALL=--skipdeps \
|
|
perl Makefile.PL \
|
|
AR="$$(TARGET_AR)" \
|
|
FULL_AR="$$(TARGET_AR)" \
|
|
CC="$$(TARGET_CC)" \
|
|
CCFLAGS="$$(TARGET_CFLAGS)" \
|
|
OPTIMIZE=" " \
|
|
LD="$$(TARGET_CC)" \
|
|
LDDLFLAGS="-shared $$(TARGET_LDFLAGS)" \
|
|
LDFLAGS="$$(TARGET_LDFLAGS)" \
|
|
DESTDIR=$$(TARGET_DIR) \
|
|
INSTALLDIRS=vendor \
|
|
INSTALLVENDORLIB=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \
|
|
INSTALLVENDORARCH=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$$(PERL_ARCHNAME) \
|
|
INSTALLVENDORBIN=/usr/bin \
|
|
INSTALLVENDORSCRIPT=/usr/bin \
|
|
INSTALLVENDORMAN1DIR=/usr/share/man/man1 \
|
|
INSTALLVENDORMAN3DIR=/usr/share/man/man3 \
|
|
$$($(2)_CONF_OPTS); \
|
|
fi
|
|
endef
|
|
else
|
|
|
|
# Configure package for host
|
|
define $(2)_CONFIGURE_CMDS
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
|
$$($(2)_CONF_ENV) \
|
|
PERL_MM_USE_DEFAULT=1 \
|
|
perl Build.PL \
|
|
--install_base $$(HOST_DIR)/usr \
|
|
--installdirs vendor \
|
|
$$($(2)_CONF_OPTS); \
|
|
else \
|
|
$$($(2)_CONF_ENV) \
|
|
PERL_MM_USE_DEFAULT=1 \
|
|
PERL_AUTOINSTALL=--skipdeps \
|
|
perl Makefile.PL \
|
|
INSTALL_BASE=$$(HOST_DIR)/usr \
|
|
INSTALLDIRS=vendor \
|
|
$$($(2)_CONF_OPTS); \
|
|
fi
|
|
endef
|
|
endif
|
|
endif
|
|
|
|
#
|
|
# Build step. Only define it if not already defined by the package .mk
|
|
# file. And take care of the differences between host and target
|
|
# packages.
|
|
#
|
|
ifndef $(2)_BUILD_CMDS
|
|
ifeq ($(4),target)
|
|
|
|
# Build package for target
|
|
define $(2)_BUILD_CMDS
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
|
perl Build $$($(2)_BUILD_OPTS) build; \
|
|
else \
|
|
$$(MAKE1) \
|
|
PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
|
|
$$($(2)_BUILD_OPTS) pure_all; \
|
|
fi
|
|
endef
|
|
else
|
|
|
|
# Build package for host
|
|
define $(2)_BUILD_CMDS
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
|
perl Build $$($(2)_BUILD_OPTS) build; \
|
|
else \
|
|
$$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
|
|
fi
|
|
endef
|
|
endif
|
|
endif
|
|
|
|
#
|
|
# Host installation step. Only define it if not already defined by the
|
|
# package .mk file.
|
|
#
|
|
ifndef $(2)_INSTALL_CMDS
|
|
define $(2)_INSTALL_CMDS
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
|
perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
|
|
else \
|
|
$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
|
|
fi
|
|
endef
|
|
endif
|
|
|
|
#
|
|
# Target installation step. Only define it if not already defined by
|
|
# the package .mk file.
|
|
#
|
|
ifndef $(2)_INSTALL_TARGET_CMDS
|
|
define $(2)_INSTALL_TARGET_CMDS
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
|
perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
|
|
else \
|
|
$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
|
|
fi
|
|
endef
|
|
endif
|
|
|
|
# Call the generic package infrastructure to generate the necessary
|
|
# make targets
|
|
$(call inner-generic-package,$(1),$(2),$(3),$(4))
|
|
|
|
endef
|
|
|
|
################################################################################
|
|
# perl-package -- the target generator macro for Perl packages
|
|
################################################################################
|
|
|
|
perl-package = $(call inner-perl-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
|
|
host-perl-package = $(call inner-perl-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host)
|