2014-02-23 15:17:16 +01:00
|
|
|
################################################################################
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
################################################################################
|
|
|
|
|
|
.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
|
|
|
PERL_ARCHNAME = $(ARCH)-linux
|
2014-10-17 20:48:01 +02:00
|
|
|
PERL_RUN = PERL5LIB= $(HOST_DIR)/usr/bin/perl
|
2014-02-23 15:17:16 +01:00
|
|
|
|
|
|
|
|
################################################################################
|
|
|
|
|
# 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
|
2014-07-24 20:57:41 +02:00
|
|
|
# argument 2 is the uppercase package name, including a HOST_ prefix
|
2014-02-23 15:17:16 +01:00
|
|
|
# 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
|
|
|
|
|
|
2015-09-04 10:31:13 +02:00
|
|
|
# Target packages need both the perl interpreter on the target (for
|
|
|
|
|
# runtime) and the perl interpreter on the host (for
|
|
|
|
|
# compilation). However, host packages only need the perl
|
|
|
|
|
# interpreter on the host.
|
|
|
|
|
ifeq ($(4),target)
|
|
|
|
|
$(2)_DEPENDENCIES += host-perl perl
|
|
|
|
|
else
|
2014-10-11 08:36:44 +02:00
|
|
|
$(2)_DEPENDENCIES += host-perl
|
2015-09-04 10:31:13 +02:00
|
|
|
endif
|
2014-10-11 08:36:44 +02:00
|
|
|
|
2014-02-23 15:17:16 +01:00
|
|
|
#
|
|
|
|
|
# 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 \
|
2014-07-13 15:03:21 +02:00
|
|
|
$$($(2)_CONF_ENV) \
|
2014-03-20 19:35:42 +01:00
|
|
|
PERL_MM_USE_DEFAULT=1 \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Build.PL \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
--config ar="$$(TARGET_AR)" \
|
|
|
|
|
--config full_ar="$$(TARGET_AR)" \
|
|
|
|
|
--config cc="$$(TARGET_CC)" \
|
|
|
|
|
--config ccflags="$$(TARGET_CFLAGS)" \
|
2014-08-14 20:49:59 +02:00
|
|
|
--config optimize=" " \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
--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 \
|
2014-02-23 15:17:16 +01:00
|
|
|
--destdir $$(TARGET_DIR) \
|
|
|
|
|
--installdirs vendor \
|
|
|
|
|
--install_path lib=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
--install_path arch=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$$(PERL_ARCHNAME) \
|
2014-02-23 15:17:16 +01:00
|
|
|
--install_path bin=/usr/bin \
|
|
|
|
|
--install_path script=/usr/bin \
|
|
|
|
|
--install_path bindoc=/usr/share/man/man1 \
|
|
|
|
|
--install_path libdoc=/usr/share/man/man3 \
|
2014-09-27 21:32:44 +02:00
|
|
|
$$($(2)_CONF_OPTS); \
|
2014-02-23 15:17:16 +01:00
|
|
|
else \
|
2014-07-13 15:03:21 +02:00
|
|
|
$$($(2)_CONF_ENV) \
|
2014-03-20 19:35:42 +01:00
|
|
|
PERL_MM_USE_DEFAULT=1 \
|
2014-02-23 15:17:16 +01:00
|
|
|
PERL_AUTOINSTALL=--skipdeps \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Makefile.PL \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
AR="$$(TARGET_AR)" \
|
|
|
|
|
FULL_AR="$$(TARGET_AR)" \
|
|
|
|
|
CC="$$(TARGET_CC)" \
|
|
|
|
|
CCFLAGS="$$(TARGET_CFLAGS)" \
|
2014-08-14 20:49:59 +02:00
|
|
|
OPTIMIZE=" " \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
LD="$$(TARGET_CC)" \
|
|
|
|
|
LDDLFLAGS="-shared $$(TARGET_LDFLAGS)" \
|
|
|
|
|
LDFLAGS="$$(TARGET_LDFLAGS)" \
|
2014-02-23 15:17:16 +01:00
|
|
|
DESTDIR=$$(TARGET_DIR) \
|
|
|
|
|
INSTALLDIRS=vendor \
|
|
|
|
|
INSTALLVENDORLIB=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
INSTALLVENDORARCH=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$$(PERL_ARCHNAME) \
|
2014-02-23 15:17:16 +01:00
|
|
|
INSTALLVENDORBIN=/usr/bin \
|
|
|
|
|
INSTALLVENDORSCRIPT=/usr/bin \
|
|
|
|
|
INSTALLVENDORMAN1DIR=/usr/share/man/man1 \
|
|
|
|
|
INSTALLVENDORMAN3DIR=/usr/share/man/man3 \
|
2014-09-27 21:32:44 +02:00
|
|
|
$$($(2)_CONF_OPTS); \
|
2014-02-23 15:17:16 +01:00
|
|
|
fi
|
|
|
|
|
endef
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
# Configure package for host
|
|
|
|
|
define $(2)_CONFIGURE_CMDS
|
|
|
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
2014-07-13 15:03:21 +02:00
|
|
|
$$($(2)_CONF_ENV) \
|
2014-03-20 19:35:42 +01:00
|
|
|
PERL_MM_USE_DEFAULT=1 \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Build.PL \
|
2014-09-27 21:32:44 +02:00
|
|
|
$$($(2)_CONF_OPTS); \
|
2014-02-23 15:17:16 +01:00
|
|
|
else \
|
2014-07-13 15:03:21 +02:00
|
|
|
$$($(2)_CONF_ENV) \
|
2014-03-20 19:35:42 +01:00
|
|
|
PERL_MM_USE_DEFAULT=1 \
|
2014-02-23 15:17:16 +01:00
|
|
|
PERL_AUTOINSTALL=--skipdeps \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Makefile.PL \
|
2014-09-27 21:32:44 +02:00
|
|
|
$$($(2)_CONF_OPTS); \
|
2014-02-23 15:17:16 +01:00
|
|
|
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 \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Build $$($(2)_BUILD_OPTS) build; \
|
2014-02-23 15:17:16 +01:00
|
|
|
else \
|
infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are
evaluated using $(eval) which causes variable references to be a bit
different than in regular make code. As we want most references to be
expanded only at the time of the $(eval) we should not use standard
references $(VAR) but rather use double dollar signs $$(VAR). This includes
function references like $(call), $(subst), etc. The only exception is the
reference to pkgdir/pkgname and numbered variables, which are parameters to
the inner block: $(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the
different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in
particular when the value of HOST_FOO_VAR would be obtained from the
corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, a test
is added to check for a host package (the only case where such constructions
are relevant; these are not circular).
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting
$(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while
originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows
the value of all variables, and the expression that led to that value.
However, if the expression was coming from an inner-xxx-targets block, and
was using single dollar signs, it would show in printvars as
VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME,
FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch has been verified using 'make printvars',
'make manual' and 'make legal-info' before and after applying this patch,
and comparing the output.
Insight-provided-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-11 21:12:24 +02:00
|
|
|
$$(MAKE1) \
|
|
|
|
|
PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
|
2015-12-06 15:14:34 +01:00
|
|
|
FIXIN=: \
|
2014-09-27 21:32:45 +02:00
|
|
|
$$($(2)_BUILD_OPTS) pure_all; \
|
2014-02-23 15:17:16 +01:00
|
|
|
fi
|
|
|
|
|
endef
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
# Build package for host
|
|
|
|
|
define $(2)_BUILD_CMDS
|
|
|
|
|
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Build $$($(2)_BUILD_OPTS) build; \
|
2014-02-23 15:17:16 +01:00
|
|
|
else \
|
2014-09-27 21:32:45 +02:00
|
|
|
$$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
|
2014-02-23 15:17:16 +01:00
|
|
|
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 \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Build $$($(2)_INSTALL_TARGET_OPTS) install; \
|
2014-02-23 15:17:16 +01:00
|
|
|
else \
|
2014-09-27 21:32:40 +02:00
|
|
|
$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
|
2014-02-23 15:17:16 +01:00
|
|
|
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 \
|
2014-10-11 08:36:44 +02:00
|
|
|
$$(PERL_RUN) Build $$($(2)_INSTALL_TARGET_OPTS) install; \
|
2014-02-23 15:17:16 +01:00
|
|
|
else \
|
2014-09-27 21:32:40 +02:00
|
|
|
$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
|
2014-02-23 15:17:16 +01:00
|
|
|
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)
|
