2018-05-15 13:51:52 -06:00
|
|
|
################################################################################
|
|
|
|
|
# Meson package infrastructure
|
|
|
|
|
#
|
|
|
|
|
# This file implements an infrastructure that eases development of
|
|
|
|
|
# package .mk files for Meson packages. It should be used for all
|
|
|
|
|
# packages that use Meson as their build system.
|
|
|
|
|
#
|
|
|
|
|
# See the Buildroot documentation for details on the usage of this
|
|
|
|
|
# infrastructure
|
|
|
|
|
#
|
|
|
|
|
# In terms of implementation, this Meson 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 Meson behaviour. The
|
|
|
|
|
# package can also define some post operation hooks.
|
|
|
|
|
#
|
|
|
|
|
################################################################################
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Pass PYTHONNOUSERSITE environment variable when invoking Meson or Ninja, so
|
|
|
|
|
# $(HOST_DIR)/bin/python3 will not look for Meson modules in
|
|
|
|
|
# $HOME/.local/lib/python3.x/site-packages
|
|
|
|
|
#
|
|
|
|
|
MESON = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/meson
|
|
|
|
|
NINJA = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/ninja
|
|
|
|
|
NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS)
|
|
|
|
|
|
|
|
|
|
################################################################################
|
|
|
|
|
# inner-meson-package -- defines how the configuration, compilation and
|
|
|
|
|
# installation of a Meson package should be done, implements a few hooks to
|
|
|
|
|
# tune the build process 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-meson-package
|
|
|
|
|
|
|
|
|
|
$(2)_CONF_ENV ?=
|
|
|
|
|
$(2)_CONF_OPTS ?=
|
|
|
|
|
$(2)_NINJA_ENV ?=
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# 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)
|
|
|
|
|
|
infra/pkg-meson: allow packages to pass custom compiler/linker flags
Meson does not allow to pass CFLAGS/LDFLAGS/CXXFLAGS via the environment
or via command-line arguments or options (instead, those flags from the
environment are passed to the host compiler, which is seldom what we
need). The only way to pas those flags is via the cross-compilation.conf
file.
Add LIBFOO_CFLAGS, LIBFOO_LDFLAGS and LIBFOO_CXXFLAGS variables to allow
packages to provide their own flags, possibly overriding the generic
ones entirely, as we allow for other infras. Those per-package flags will
then be used to generate the per-package cross-compilation.conf.
This means that the meson infra is the first and only infra for which
FOO_CFLAGS, FOO_LDFLAGS, and FOO_CXXFLAGS are meaningful, while for the
other infras, they are just variables private to the package itself.
Instead of naming those variables after the meson infra (e.g.
FOO_MESON_CFLAGS), we name them with a generic name, as maybe, just
maybe, we could also change the other infras to also recognise those
variables.
Just like for the HOST_MESON_SED_CFLAGS etc., we need to add auxiliary
variables to do convert the shell-formatted argument list into the
JSON-formatted list that meson expects. We can't use a pure-make
construct because the CFLAGS can contain quoting that needs to be
expanded by the shell. Similarly, we need a condition on the strip'ed
variable to avoid passing empty arguments.
To mimic this feature for packages that are built from the SDK, we also
install a templatised version of cross-compilation.conf, with three new
placeholders for custom flags. If a user wants to build a package that
needs custom flags, they can use that template to generate a per-package
cross-compilation.conf.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-24 14:25:48 -06:00
|
|
|
$(2)_CFLAGS ?= $$(TARGET_CFLAGS)
|
|
|
|
|
$(2)_LDFLAGS ?= $$(TARGET_LDFLAGS)
|
|
|
|
|
$(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS)
|
|
|
|
|
|
|
|
|
|
$(2)_MESON_SED_CFLAGS = $$(if $$(strip $$($(2)_CFLAGS)),`printf '"%s"$$(comma) ' $$($(2)_CFLAGS)`)
|
|
|
|
|
$(2)_MESON_SED_LDFLAGS = $$(if $$(strip $$($(2)_LDFLAGS)),`printf '"%s"$$(comma) ' $$($(2)_LDFLAGS)`)
|
|
|
|
|
$(2)_MESON_SED_CXXFLAGS = $$(if $$(strip $$($(2)_CXXFLAGS)),`printf '"%s"$$(comma) ' $$($(2)_CXXFLAGS)`)
|
|
|
|
|
|
2018-05-15 13:51:52 -06:00
|
|
|
# Configure package for target
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
define $(2)_CONFIGURE_CMDS
|
|
|
|
|
rm -rf $$($$(PKG)_SRCDIR)/build
|
|
|
|
|
mkdir -p $$($$(PKG)_SRCDIR)/build
|
package/pkg-meson: support per-package directories
Currently, package/meson/meson.mk generates a single global
cross-compilation.conf file, with the path to the compiler, cflags,
ldflags, and various other details. This file is then used when
building all meson-based packages.
This causes two problems:
- It is not compatible with per-package directories, because with
per-package folders, we need to use a different compiler, and
possibly CFLAGS/LDFLAGS for each package.
- It is not possible to define per package CFLAGS. Indeed, when
cross-compiling, meson doesn't support passing CFLAGS through the
environment, only the CFLAGS from cross-compilation.conf are taken
into account.
For this reason, this commit:
- Introduces a per-package cross-compilation.conf, which is generated
by the pkg-meson infrastructure in the "configure" step right
before calling meson. The file is generated in $(@D)/build/, and
because it is generated within a given package "configure" step,
the compiler path is the one of this package.
- Keeps the global cross-compilation.conf in $(HOST_DIR)/etc/meson/,
for the SDK use-case of Buildroot. Since we want the final and
global values of the compiler path, CFLAGS and LDFLAGS, generating
this global cross-compilation.conf is moved to a
TARGET_FINALIZE_HOOKS. If we were keeping this as a
HOST_MESON_POST_INSTALL_HOOKS, it would contain values specific to
the host-meson package.
For now, we don't yet support per-package CFLAGS/LDFLAGS, but having
such per-package cross-compilation.conf is a necessary preparation to
achieve this goal.
This commit has been tested by building all Buildroot packages that
use meson: json-glib, systemd, enlightenment, at-spi2-core, ncmpc,
libmpdclient and ncmpc.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas:
- add extended commit log
- in pkg-meson.mk, re-use variables defined in meson.mk to do the
replacement of CFLAGS/LDFLAGS/CXXFLAGS
- move the generation of the global cross-compilation.conf to a
TARGET_FINALIZE_HOOKS
- testing with per-package folders]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-11-30 03:40:03 -07:00
|
|
|
sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
|
2019-02-24 17:52:45 -07:00
|
|
|
-e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
|
package/pkg-meson: support per-package directories
Currently, package/meson/meson.mk generates a single global
cross-compilation.conf file, with the path to the compiler, cflags,
ldflags, and various other details. This file is then used when
building all meson-based packages.
This causes two problems:
- It is not compatible with per-package directories, because with
per-package folders, we need to use a different compiler, and
possibly CFLAGS/LDFLAGS for each package.
- It is not possible to define per package CFLAGS. Indeed, when
cross-compiling, meson doesn't support passing CFLAGS through the
environment, only the CFLAGS from cross-compilation.conf are taken
into account.
For this reason, this commit:
- Introduces a per-package cross-compilation.conf, which is generated
by the pkg-meson infrastructure in the "configure" step right
before calling meson. The file is generated in $(@D)/build/, and
because it is generated within a given package "configure" step,
the compiler path is the one of this package.
- Keeps the global cross-compilation.conf in $(HOST_DIR)/etc/meson/,
for the SDK use-case of Buildroot. Since we want the final and
global values of the compiler path, CFLAGS and LDFLAGS, generating
this global cross-compilation.conf is moved to a
TARGET_FINALIZE_HOOKS. If we were keeping this as a
HOST_MESON_POST_INSTALL_HOOKS, it would contain values specific to
the host-meson package.
For now, we don't yet support per-package CFLAGS/LDFLAGS, but having
such per-package cross-compilation.conf is a necessary preparation to
achieve this goal.
This commit has been tested by building all Buildroot packages that
use meson: json-glib, systemd, enlightenment, at-spi2-core, ncmpc,
libmpdclient and ncmpc.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas:
- add extended commit log
- in pkg-meson.mk, re-use variables defined in meson.mk to do the
replacement of CFLAGS/LDFLAGS/CXXFLAGS
- move the generation of the global cross-compilation.conf to a
TARGET_FINALIZE_HOOKS
- testing with per-package folders]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-11-30 03:40:03 -07:00
|
|
|
-e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
|
|
|
|
|
-e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
|
infra/pkg-meson: allow packages to pass custom compiler/linker flags
Meson does not allow to pass CFLAGS/LDFLAGS/CXXFLAGS via the environment
or via command-line arguments or options (instead, those flags from the
environment are passed to the host compiler, which is seldom what we
need). The only way to pas those flags is via the cross-compilation.conf
file.
Add LIBFOO_CFLAGS, LIBFOO_LDFLAGS and LIBFOO_CXXFLAGS variables to allow
packages to provide their own flags, possibly overriding the generic
ones entirely, as we allow for other infras. Those per-package flags will
then be used to generate the per-package cross-compilation.conf.
This means that the meson infra is the first and only infra for which
FOO_CFLAGS, FOO_LDFLAGS, and FOO_CXXFLAGS are meaningful, while for the
other infras, they are just variables private to the package itself.
Instead of naming those variables after the meson infra (e.g.
FOO_MESON_CFLAGS), we name them with a generic name, as maybe, just
maybe, we could also change the other infras to also recognise those
variables.
Just like for the HOST_MESON_SED_CFLAGS etc., we need to add auxiliary
variables to do convert the shell-formatted argument list into the
JSON-formatted list that meson expects. We can't use a pure-make
construct because the CFLAGS can contain quoting that needs to be
expanded by the shell. Similarly, we need a condition on the strip'ed
variable to avoid passing empty arguments.
To mimic this feature for packages that are built from the SDK, we also
install a templatised version of cross-compilation.conf, with three new
placeholders for custom flags. If a user wants to build a package that
needs custom flags, they can use that template to generate a per-package
cross-compilation.conf.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-24 14:25:48 -06:00
|
|
|
-e "s%@TARGET_CFLAGS@%$$($(2)_MESON_SED_CFLAGS)%g" \
|
|
|
|
|
-e "s%@TARGET_LDFLAGS@%$$($(2)_MESON_SED_LDFLAGS)%g" \
|
|
|
|
|
-e "s%@TARGET_CXXFLAGS@%$$($(2)_MESON_SED_CXXFLAGS)%g" \
|
package/pkg-meson: support per-package directories
Currently, package/meson/meson.mk generates a single global
cross-compilation.conf file, with the path to the compiler, cflags,
ldflags, and various other details. This file is then used when
building all meson-based packages.
This causes two problems:
- It is not compatible with per-package directories, because with
per-package folders, we need to use a different compiler, and
possibly CFLAGS/LDFLAGS for each package.
- It is not possible to define per package CFLAGS. Indeed, when
cross-compiling, meson doesn't support passing CFLAGS through the
environment, only the CFLAGS from cross-compilation.conf are taken
into account.
For this reason, this commit:
- Introduces a per-package cross-compilation.conf, which is generated
by the pkg-meson infrastructure in the "configure" step right
before calling meson. The file is generated in $(@D)/build/, and
because it is generated within a given package "configure" step,
the compiler path is the one of this package.
- Keeps the global cross-compilation.conf in $(HOST_DIR)/etc/meson/,
for the SDK use-case of Buildroot. Since we want the final and
global values of the compiler path, CFLAGS and LDFLAGS, generating
this global cross-compilation.conf is moved to a
TARGET_FINALIZE_HOOKS. If we were keeping this as a
HOST_MESON_POST_INSTALL_HOOKS, it would contain values specific to
the host-meson package.
For now, we don't yet support per-package CFLAGS/LDFLAGS, but having
such per-package cross-compilation.conf is a necessary preparation to
achieve this goal.
This commit has been tested by building all Buildroot packages that
use meson: json-glib, systemd, enlightenment, at-spi2-core, ncmpc,
libmpdclient and ncmpc.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas:
- add extended commit log
- in pkg-meson.mk, re-use variables defined in meson.mk to do the
replacement of CFLAGS/LDFLAGS/CXXFLAGS
- move the generation of the global cross-compilation.conf to a
TARGET_FINALIZE_HOOKS
- testing with per-package folders]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-11-30 03:40:03 -07:00
|
|
|
-e "s%@HOST_DIR@%$$(HOST_DIR)%g" \
|
2019-09-28 14:04:30 -06:00
|
|
|
$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES), \
|
2019-10-06 09:10:21 -06:00
|
|
|
-e "/^\[binaries\]$$$$/s:$$$$:\n$$(x):" \
|
2019-09-28 14:04:30 -06:00
|
|
|
) \
|
package/pkg-meson: support per-package directories
Currently, package/meson/meson.mk generates a single global
cross-compilation.conf file, with the path to the compiler, cflags,
ldflags, and various other details. This file is then used when
building all meson-based packages.
This causes two problems:
- It is not compatible with per-package directories, because with
per-package folders, we need to use a different compiler, and
possibly CFLAGS/LDFLAGS for each package.
- It is not possible to define per package CFLAGS. Indeed, when
cross-compiling, meson doesn't support passing CFLAGS through the
environment, only the CFLAGS from cross-compilation.conf are taken
into account.
For this reason, this commit:
- Introduces a per-package cross-compilation.conf, which is generated
by the pkg-meson infrastructure in the "configure" step right
before calling meson. The file is generated in $(@D)/build/, and
because it is generated within a given package "configure" step,
the compiler path is the one of this package.
- Keeps the global cross-compilation.conf in $(HOST_DIR)/etc/meson/,
for the SDK use-case of Buildroot. Since we want the final and
global values of the compiler path, CFLAGS and LDFLAGS, generating
this global cross-compilation.conf is moved to a
TARGET_FINALIZE_HOOKS. If we were keeping this as a
HOST_MESON_POST_INSTALL_HOOKS, it would contain values specific to
the host-meson package.
For now, we don't yet support per-package CFLAGS/LDFLAGS, but having
such per-package cross-compilation.conf is a necessary preparation to
achieve this goal.
This commit has been tested by building all Buildroot packages that
use meson: json-glib, systemd, enlightenment, at-spi2-core, ncmpc,
libmpdclient and ncmpc.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas:
- add extended commit log
- in pkg-meson.mk, re-use variables defined in meson.mk to do the
replacement of CFLAGS/LDFLAGS/CXXFLAGS
- move the generation of the global cross-compilation.conf to a
TARGET_FINALIZE_HOOKS
- testing with per-package folders]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-11-30 03:40:03 -07:00
|
|
|
package/meson/cross-compilation.conf.in \
|
|
|
|
|
> $$($$(PKG)_SRCDIR)/build/cross-compilation.conf
|
2018-05-15 13:51:52 -06:00
|
|
|
PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \
|
|
|
|
|
--prefix=/usr \
|
|
|
|
|
--libdir=lib \
|
|
|
|
|
--default-library=$(if $(BR2_STATIC_LIBS),static,shared) \
|
|
|
|
|
--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
|
package/pkg-meson: support per-package directories
Currently, package/meson/meson.mk generates a single global
cross-compilation.conf file, with the path to the compiler, cflags,
ldflags, and various other details. This file is then used when
building all meson-based packages.
This causes two problems:
- It is not compatible with per-package directories, because with
per-package folders, we need to use a different compiler, and
possibly CFLAGS/LDFLAGS for each package.
- It is not possible to define per package CFLAGS. Indeed, when
cross-compiling, meson doesn't support passing CFLAGS through the
environment, only the CFLAGS from cross-compilation.conf are taken
into account.
For this reason, this commit:
- Introduces a per-package cross-compilation.conf, which is generated
by the pkg-meson infrastructure in the "configure" step right
before calling meson. The file is generated in $(@D)/build/, and
because it is generated within a given package "configure" step,
the compiler path is the one of this package.
- Keeps the global cross-compilation.conf in $(HOST_DIR)/etc/meson/,
for the SDK use-case of Buildroot. Since we want the final and
global values of the compiler path, CFLAGS and LDFLAGS, generating
this global cross-compilation.conf is moved to a
TARGET_FINALIZE_HOOKS. If we were keeping this as a
HOST_MESON_POST_INSTALL_HOOKS, it would contain values specific to
the host-meson package.
For now, we don't yet support per-package CFLAGS/LDFLAGS, but having
such per-package cross-compilation.conf is a necessary preparation to
achieve this goal.
This commit has been tested by building all Buildroot packages that
use meson: json-glib, systemd, enlightenment, at-spi2-core, ncmpc,
libmpdclient and ncmpc.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas:
- add extended commit log
- in pkg-meson.mk, re-use variables defined in meson.mk to do the
replacement of CFLAGS/LDFLAGS/CXXFLAGS
- move the generation of the global cross-compilation.conf to a
TARGET_FINALIZE_HOOKS
- testing with per-package folders]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-11-30 03:40:03 -07:00
|
|
|
--cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
|
2018-05-15 13:51:52 -06:00
|
|
|
$$($$(PKG)_CONF_OPTS) \
|
|
|
|
|
$$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build
|
|
|
|
|
endef
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
# Configure package for host
|
|
|
|
|
define $(2)_CONFIGURE_CMDS
|
|
|
|
|
rm -rf $$($$(PKG)_SRCDIR)/build
|
|
|
|
|
mkdir -p $$($$(PKG)_SRCDIR)/build
|
|
|
|
|
$$(HOST_CONFIGURE_OPTS) \
|
|
|
|
|
$$($$(PKG)_CONF_ENV) $$(MESON) \
|
|
|
|
|
--prefix=$$(HOST_DIR) \
|
|
|
|
|
--libdir=lib \
|
|
|
|
|
--sysconfdir=$$(HOST_DIR)/etc \
|
|
|
|
|
--localstatedir=$$(HOST_DIR)/var \
|
|
|
|
|
--default-library=shared \
|
|
|
|
|
--buildtype=release \
|
|
|
|
|
$$($$(PKG)_CONF_OPTS) \
|
|
|
|
|
$$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build
|
|
|
|
|
endef
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
$(2)_DEPENDENCIES += host-meson
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Build step. Only define it if not already defined by the package .mk
|
|
|
|
|
# file.
|
|
|
|
|
#
|
|
|
|
|
ifndef $(2)_BUILD_CMDS
|
|
|
|
|
ifeq ($(4),target)
|
|
|
|
|
define $(2)_BUILD_CMDS
|
|
|
|
|
$$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
|
2018-12-26 01:52:28 -07:00
|
|
|
$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
|
2018-05-15 13:51:52 -06:00
|
|
|
endef
|
|
|
|
|
else
|
|
|
|
|
define $(2)_BUILD_CMDS
|
|
|
|
|
$$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
|
2018-12-26 01:52:28 -07:00
|
|
|
$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
|
2018-05-15 13:51:52 -06:00
|
|
|
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
|
|
|
|
|
$$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
|
|
|
|
|
$$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install
|
|
|
|
|
endef
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Staging installation step. Only define it if not already defined by
|
|
|
|
|
# the package .mk file.
|
|
|
|
|
#
|
|
|
|
|
ifndef $(2)_INSTALL_STAGING_CMDS
|
|
|
|
|
define $(2)_INSTALL_STAGING_CMDS
|
|
|
|
|
$$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \
|
|
|
|
|
$$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install
|
|
|
|
|
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
|
|
|
|
|
$$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \
|
|
|
|
|
$$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install
|
|
|
|
|
endef
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Call the generic package infrastructure to generate the necessary
|
|
|
|
|
# make targets
|
|
|
|
|
$(call inner-generic-package,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
################################################################################
|
|
|
|
|
# meson-package -- the target generator macro for Meson packages
|
|
|
|
|
################################################################################
|
|
|
|
|
|
|
|
|
|
meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
|
|
|
|
|
host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host)
|
package/meson: install cross-compilation.conf during toolchain install
package/meson installs a cross-compilation.conf file in
$(HOST_DIR)/etc/meson, via TARGET_FINALIZE_HOOKS.
package/pkg-cmake.mk installs a toolchainfile.cmake in
$(HOST_DIR)/share/buildroot, via TOOLCHAIN_POST_INSTALL_STAGING_HOOKS.
Both files have a similar concept, they describe some flags/paths needed for
compilation using respective build systems. One difference is that the meson
file is added for external compilation, from the SDK, while the cmake file
is used internally in Buildroot.
The 'problem' of using TARGET_FINALIZE_HOOKS for the meson file, is that it
installs a 'host' file from target-finalize, which is conceptually incorrect
since not just TARGET_DIR but also HOST_DIR is "regenerated" on a subsequent
'make' when everything was already built (i.e. only target-finalize is run).
This can easily be fixed, by using the same hook as cmake uses, i.e.
TOOLCHAIN_POST_INSTALL_STAGING_HOOKS.
Note that actually even for cmake, TOOLCHAIN_POST_INSTALL_STAGING_HOOKS is
not the best hook to install a host file. A better hook would have been
TOOLCHAIN_POST_INSTALL_HOOKS, but this triggers only for 'host' packages,
and 'toolchain' is treated as a 'target' package.
Also, the hook (and therefore also the definition of
PKG_MESON_INSTALL_CROSS_CONF) is moved to pkg-meson.mk, again to make it
more similar to how it's done for cmake. Otherwise check-package
complains that the meson package is setting variables that don't start
with MESON_.
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-02-25 14:11:46 -07:00
|
|
|
|
|
|
|
|
################################################################################
|
|
|
|
|
# Generation of the Meson cross-compilation.conf file
|
|
|
|
|
################################################################################
|
|
|
|
|
|
|
|
|
|
# Generate a Meson cross-compilation.conf suitable for use with the
|
|
|
|
|
# SDK; also install the file as a template for users to add their
|
|
|
|
|
# own flags if they need to.
|
|
|
|
|
define PKG_MESON_INSTALL_CROSS_CONF
|
|
|
|
|
mkdir -p $(HOST_DIR)/etc/meson
|
|
|
|
|
sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
|
|
|
|
|
-e "s%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
|
|
|
|
|
-e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
|
|
|
|
|
-e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
|
|
|
|
|
-e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)@PKG_TARGET_CFLAGS@%g" \
|
|
|
|
|
-e "s%@TARGET_LDFLAGS@%$(HOST_MESON_SED_LDFLAGS)@PKG_TARGET_CFLAGS@%g" \
|
|
|
|
|
-e "s%@TARGET_CXXFLAGS@%$(HOST_MESON_SED_CXXFLAGS)@PKG_TARGET_CFLAGS@%g" \
|
|
|
|
|
-e "s%@HOST_DIR@%$(HOST_DIR)%g" \
|
|
|
|
|
$(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
|
|
|
|
|
> $(HOST_DIR)/etc/meson/cross-compilation.conf.in
|
|
|
|
|
sed -e "s%@PKG_TARGET_CFLAGS@%%g" \
|
|
|
|
|
-e "s%@PKG_TARGET_LDFLAGS@%%g" \
|
|
|
|
|
-e "s%@PKG_TARGET_CXXFLAGS@%%g" \
|
|
|
|
|
$(HOST_DIR)/etc/meson/cross-compilation.conf.in \
|
|
|
|
|
> $(HOST_DIR)/etc/meson/cross-compilation.conf
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
|