NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9ddc1b5c93
kumquat-buildroot/package/pkg-meson.mk

211 lines
7.6 KiB
Makefile
Raw Normal View History

pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02: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 22:25:48 +02:00
$(2)_CFLAGS ?= $$(TARGET_CFLAGS)
$(2)_LDFLAGS ?= $$(TARGET_LDFLAGS)
$(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS)
pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02:00
# Configure package for target
#
#
define $(2)_CONFIGURE_CMDS
rm -rf $$($$(PKG)_SRCDIR)/build
mkdir -p $$($$(PKG)_SRCDIR)/build
package/pkg-meson.mk: refactor flags substitution with make-comma-list pkg-meson defines variables _MESON_SED_CFLAGS, _MESON_SED_LDFLAGS and _MESON_SED_CXXFLAGS that reformat the make-style flags (space-separated and unquoted) as meson-style flags (comma-separated and double-quoted). Similar variables are also defined in meson.mk. A future patch will add even more similar cases. However, we already have a macro that does something similar for generating JSON output: make-comma-list. So let's use that. However, make-comma-list doesn't add all the shell-expanded magic like _MESON_SED_CFLAGS, which results in the double quotes being removed by the shell. Therefore, we also need to change the quoting around it to single quotes instead of double quotes. For consistency, the quotes of the other sed expressions are changed as well. Except for the _MESON_EXTRA_BINARIES: the values set by packages (e.g. mesa3d) already contain single quotes, so changing the surrounding double quotes to single quotes would break them. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [yann.morin.1998@free.fr: slight fix in commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-05 11:33:02 +01:00
sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%g' \
-e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \
meson: Strip quotes from BR2_ENDIAN The values in the cross-compilation file are expected to be quoted with single quotes, which we have in our template. However, the endian value we are injecting comes from Kconfig, so it is double-quoted, and those quotes end up in the cross-compilation files we generate (the internal one, and the SDK one): endian = '"little"' So qstrip the value before we inject it. Propagate the fix to the two generated files by using the same variable HOST_MESON_TARGET_ENDIAN in both cases, rather than replicating the (flawed) logic. While at it, also use the common GCC_TARGET_CPU variable for the SDK file too. Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 19:38:33 +01:00
-e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \
-e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \
package/meson: bump to version 0.55.0 Drop fix rpath patch which is no longer needed. Drop g-ir-scanner/g-ir-compiler override patch which is now upstream. Rebase remaining patches. Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-07-17 10:03:56 +02:00
-e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \
-e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \
-e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \
package/pkg-meson.mk: refactor flags substitution with make-comma-list pkg-meson defines variables _MESON_SED_CFLAGS, _MESON_SED_LDFLAGS and _MESON_SED_CXXFLAGS that reformat the make-style flags (space-separated and unquoted) as meson-style flags (comma-separated and double-quoted). Similar variables are also defined in meson.mk. A future patch will add even more similar cases. However, we already have a macro that does something similar for generating JSON output: make-comma-list. So let's use that. However, make-comma-list doesn't add all the shell-expanded magic like _MESON_SED_CFLAGS, which results in the double quotes being removed by the shell. Therefore, we also need to change the quoting around it to single quotes instead of double quotes. For consistency, the quotes of the other sed expressions are changed as well. Except for the _MESON_EXTRA_BINARIES: the values set by packages (e.g. mesa3d) already contain single quotes, so changing the surrounding double quotes to single quotes would break them. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [yann.morin.1998@free.fr: slight fix in commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-05 11:33:02 +01:00
-e 's%@HOST_DIR@%$$(HOST_DIR)%g' \
package/pkg-meson.mk: explicitly specify pkg-config settings meson is able to distinguish between host (= native) and target (= cross) compilation. It will explicitly pass different options to pkg-config to distinguish them. Therefore, we don't need to use the pkg-config wrapper when using meson, and can instead pass the pkg-config settings through the cross-compilation.conf. This is important because in some situations (e.g. for the Python configuration), meson sets the PKG_CONFIG_LIBDIR variable to a different value before calling pkg-config. Relying on our wrapper script doesn't work in that case (except if the script would unconditionally set PKG_CONFIG_LIBDIR, which it doesn't do at the moment). Add the sys_root and pkg_config_lib settings to cross-compilation.conf and use pkgconf directly instead of the wrapper. Note that this requires us to substitute STAGING_DIR as well, with an absolute path. This is not a big deal since cross-compilation.conf is regenerated for every package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-05 11:33:04 +01:00
-e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \
package/meson: make pkg-config --static aware Our pkg-config wrapper is not used since commit 4e0bc29993376613d200e892d491e31ea5a49622, this raise static build failures with libglib2 because --static is not passed anymore to pkg-config so add a patch to get back the old behaviour. The patch was proposed upstream https://github.com/mesonbuild/meson/pull/6629, and the feedback was not very positive. However, we need a solution that works for Buildroot now, and this proposal is simple enough. Fixes: http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-02-15 16:26:20 +01:00
-e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \
package/pkg-meson.mk: fix multiple _MESON_EXTRA_BINARIES If multiple entries are specified for _MESON_EXTRA_BINARIES, the current sed expression will only replace the first one. Specifically, from GNU sed 4.8 the manual says: /regexp/ Match lines matching the regular expression regexp. Matching is performed on the current pattern space, which can be modified with commands such as ``s///''. so after the first binary has been added, the next entry no longer matches since the pattern space has been modifed. Instead of adding a script for each value, apply the match once and add a subsitution for all entries at once. Signed-off-by: John Keeping <john@metanate.com> Tested-by: Peter Seiderer <ps.report@gmx.net> [yann.morin.1998@free.fr: do a single substitution] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-10 13:15:10 +01:00
-e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \
package/pkg-meson.mk: add FOO_MESON_EXTRA_PROPERTIES With autoconf packages, we often specify ac_cv_func_... cached values to avoid runtime checks during configure. With meson the equivalent is setting properties in cross-compilation.conf which we cannot do in Buildroot at the moment. For example, libglib2 used to set ac_cv_func_printf_unix98 and ac_cv_func_vsnprintf_c99 so that the system printf could be used, but with the conversion to meson these checks fail and the gnulib fallback is used. Add infrastructure in the same way as FOO_MESON_EXTRA_BINARIES to allow per-package modification to the cross-compilation properties. Signed-off-by: John Keeping <john@metanate.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: do a single substitution as in a1e3c7b693] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 12:22:55 +01:00
-e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \
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 11:40:03 +01:00
package/meson/cross-compilation.conf.in \
> $$($$(PKG)_SRCDIR)/build/cross-compilation.conf
pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02: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 11:40:03 +01:00
--cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
package/pkg-meson: force-disable binary stripping In buildroot, stripping for the target is configured and implemented with the global `BR2_STRIP_strip` option that drive the stripping in the target-finalize step. So, we explicitly disable stripping at build time for the target variants. For the host variants, however, we don't much care about symbols and stuff, but smaller executables will hopefully load faster than bigger ones (disputable, given that sections in ELF files are paged-in on-demand), so we explictly enable stripping. Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com> [yann.morin.1998@free.fr: - add burb about the target-finalize step - enable stripping for host variants ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-12-25 13:15:59 +01:00
-Dstrip=false \
package/pkg-meson.mk: set correct pkgconfig for native dependencies This sets the correct build.pkg_config_path for all meson packages so that dependencies with native: true will properly use the the host pkgconfig instead of the target pkgconfig. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-04-28 14:22:12 +02:00
-Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \
pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02: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 \
package/pkg-meson: force-disable binary stripping In buildroot, stripping for the target is configured and implemented with the global `BR2_STRIP_strip` option that drive the stripping in the target-finalize step. So, we explicitly disable stripping at build time for the target variants. For the host variants, however, we don't much care about symbols and stuff, but smaller executables will hopefully load faster than bigger ones (disputable, given that sections in ELF files are paged-in on-demand), so we explictly enable stripping. Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com> [yann.morin.1998@free.fr: - add burb about the target-finalize step - enable stripping for host variants ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-12-25 13:15:59 +01:00
-Dstrip=true \
pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02:00
$$($$(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) \
package/pkg-meson: allow meson packages to specify custom build rules Some packages may want to build only specific targets, instead of the default. So, allow them to provide FOO_NINJA_OPTS (not really options, but we just mimicked the naming we already have for autotools packages). Update the manual accordingly. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Cc: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-26 09:52:28 +01:00
$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02:00
endef
else
define $(2)_BUILD_CMDS
$$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
package/pkg-meson: allow meson packages to specify custom build rules Some packages may want to build only specific targets, instead of the default. So, allow them to provide FOO_NINJA_OPTS (not really options, but we just mimicked the naming we already have for autotools packages). Update the manual accordingly. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Cc: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-26 09:52:28 +01:00
$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-05-15 21:51:52 +02: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 22:11:46 +01: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
package/pkg-meson.mk: refactor flags substitution with make-comma-list pkg-meson defines variables _MESON_SED_CFLAGS, _MESON_SED_LDFLAGS and _MESON_SED_CXXFLAGS that reformat the make-style flags (space-separated and unquoted) as meson-style flags (comma-separated and double-quoted). Similar variables are also defined in meson.mk. A future patch will add even more similar cases. However, we already have a macro that does something similar for generating JSON output: make-comma-list. So let's use that. However, make-comma-list doesn't add all the shell-expanded magic like _MESON_SED_CFLAGS, which results in the double quotes being removed by the shell. Therefore, we also need to change the quoting around it to single quotes instead of double quotes. For consistency, the quotes of the other sed expressions are changed as well. Except for the _MESON_EXTRA_BINARIES: the values set by packages (e.g. mesa3d) already contain single quotes, so changing the surrounding double quotes to single quotes would break them. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [yann.morin.1998@free.fr: slight fix in commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-05 11:33:02 +01:00
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' \
package/meson: bump to version 0.55.0 Drop fix rpath patch which is no longer needed. Drop g-ir-scanner/g-ir-compiler override patch which is now upstream. Rebase remaining patches. Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-07-17 10:03:56 +02:00
-e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \
-e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \
-e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \
package/pkg-meson.mk: refactor flags substitution with make-comma-list pkg-meson defines variables _MESON_SED_CFLAGS, _MESON_SED_LDFLAGS and _MESON_SED_CXXFLAGS that reformat the make-style flags (space-separated and unquoted) as meson-style flags (comma-separated and double-quoted). Similar variables are also defined in meson.mk. A future patch will add even more similar cases. However, we already have a macro that does something similar for generating JSON output: make-comma-list. So let's use that. However, make-comma-list doesn't add all the shell-expanded magic like _MESON_SED_CFLAGS, which results in the double quotes being removed by the shell. Therefore, we also need to change the quoting around it to single quotes instead of double quotes. For consistency, the quotes of the other sed expressions are changed as well. Except for the _MESON_EXTRA_BINARIES: the values set by packages (e.g. mesa3d) already contain single quotes, so changing the surrounding double quotes to single quotes would break them. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [yann.morin.1998@free.fr: slight fix in commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-05 11:33:02 +01:00
-e 's%@HOST_DIR@%$(HOST_DIR)%g' \
package/pkg-meson.mk: fix cross-compilation.conf $$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF. $$ resulted in `$(STAGING_DIR)` in the file instead of the expanded value. Note that this change only affects the etc config at: host/etc/meson/cross-compilation.conf Per-package cross-compilation.conf files are already correct. Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 20:19:39 +01:00
-e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \
package/pkg-meson.mk: fix generation of pkg_config_static prop fixes following in the generated cross-complation.conf file: pkg_config_static = '$(if $(BR2_STATIC_LIBS),true,false)' Signed-off-by: Norbert Lange <nolange79@gmail.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-09-15 12:05:43 +02:00
-e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \
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 22:11:46 +01:00
$(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
> $(HOST_DIR)/etc/meson/cross-compilation.conf.in
package/pkg-meson.mk: refactor flags substitution with make-comma-list pkg-meson defines variables _MESON_SED_CFLAGS, _MESON_SED_LDFLAGS and _MESON_SED_CXXFLAGS that reformat the make-style flags (space-separated and unquoted) as meson-style flags (comma-separated and double-quoted). Similar variables are also defined in meson.mk. A future patch will add even more similar cases. However, we already have a macro that does something similar for generating JSON output: make-comma-list. So let's use that. However, make-comma-list doesn't add all the shell-expanded magic like _MESON_SED_CFLAGS, which results in the double quotes being removed by the shell. Therefore, we also need to change the quoting around it to single quotes instead of double quotes. For consistency, the quotes of the other sed expressions are changed as well. Except for the _MESON_EXTRA_BINARIES: the values set by packages (e.g. mesa3d) already contain single quotes, so changing the surrounding double quotes to single quotes would break them. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [yann.morin.1998@free.fr: slight fix in commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-05 11:33:02 +01:00
sed -e 's%@PKG_TARGET_CFLAGS@%%g' \
-e 's%@PKG_TARGET_LDFLAGS@%%g' \
-e 's%@PKG_TARGET_CXXFLAGS@%%g' \
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 22:11:46 +01:00
$(HOST_DIR)/etc/meson/cross-compilation.conf.in \
> $(HOST_DIR)/etc/meson/cross-compilation.conf
endef
package/pkg-meson: ensure the global cross-compilation.conf file is correct Currently, the cross-compilation.conf installed in $(HOST_DIR)/etc/meson/cross-compilation.conf for use by the SDK is generated in a post-install-staging hook of the toolchain package. With per-package directory support enabled, this means that the generated cross-compilation.conf contains references to the per-package directory of the toolchain/ package, which is not want we want: [binaries] c = '/home/thomas/projets/buildroot/output/per-package/toolchain/host/bin/arm-linux-gcc' cpp = '/home/thomas/projets/buildroot/output/per-package/toolchain/host/bin/arm-linux-g++' ar = '/home/thomas/projets/buildroot/output/per-package/toolchain/host/bin/arm-linux-ar' strip = '/home/thomas/projets/buildroot/output/per-package/toolchain/host/bin/arm-linux-strip' pkgconfig = '/home/thomas/projets/buildroot/output/per-package/toolchain/host/usr/bin/pkg-config' So instead, we generate this file in TOOLCHAIN_TARGET_FINALIZE_HOOKS, so that the global paths are used: [binaries] c = '/home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc' cpp = '/home/thomas/projets/buildroot/output/host/bin/arm-linux-g++' ar = '/home/thomas/projets/buildroot/output/host/bin/arm-linux-ar' strip = '/home/thomas/projets/buildroot/output/host/bin/arm-linux-strip' pkgconfig = '/home/thomas/projets/buildroot/output/host/usr/bin/pkg-config' Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-12-04 16:02:25 +01:00
TOOLCHAIN_TARGET_FINALIZE_HOOKS += PKG_MESON_INSTALL_CROSS_CONF
Reference in New Issue Copy Permalink