5d882b71a8
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>
171 lines
5.6 KiB
Makefile
171 lines
5.6 KiB
Makefile
################################################################################
|
|
# 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 ?=
|
|
$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
|
|
|
|
#
|
|
# 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
|
|
rm -rf $$($$(PKG)_SRCDIR)/build
|
|
mkdir -p $$($$(PKG)_SRCDIR)/build
|
|
sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
|
|
-e "s%@TARGET_ARCH@%$$(ARCH)%g" \
|
|
-e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
|
|
-e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
|
|
-e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \
|
|
-e "s%@TARGET_LDFLAGS@%$$(HOST_MESON_SED_LDFLAGS)%g" \
|
|
-e "s%@TARGET_CXXFLAGS@%$$(HOST_MESON_SED_CXXFLAGS)%g" \
|
|
-e "s%@HOST_DIR@%$$(HOST_DIR)%g" \
|
|
package/meson/cross-compilation.conf.in \
|
|
> $$($$(PKG)_SRCDIR)/build/cross-compilation.conf
|
|
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) \
|
|
--cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
|
|
$$($$(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) \
|
|
$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
|
|
endef
|
|
else
|
|
define $(2)_BUILD_CMDS
|
|
$$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
|
|
$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
|
|
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)
|