diff options
| author |   Martin Väth <martin@mvath.de> | 2022-07-10 15:06:19 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2022-07-10 15:06:19 +0200 |
| commit | 82d3d9f8a028f6c1b7ce930e6ab9085c6013b2fa (patch) | |
| tree | 371fbe817d64f2ad390b537f220acf8c774cd448 /eclass/meson.eclass | |
| parent | app-portage/logclean: Version bump (diff) | |
| download | mv-82d3d9f8a028f6c1b7ce930e6ab9085c6013b2fa.tar.gz mv-82d3d9f8a028f6c1b7ce930e6ab9085c6013b2fa.tar.bz2 mv-82d3d9f8a028f6c1b7ce930e6ab9085c6013b2fa.zip | |
app-portage/eix: Version bump. meson.eclass: Update from gentoo repository
Signed-off-by: Martin Väth <martin@mvath.de>
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index c9d20578..4656c277 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -51,12 +51,12 @@ inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs EXPORT_FUNCTIONS src_configure src_compile src_test src_install -_MESON_DEPEND=">=dev-util/meson-0.58.2-r1 - >=dev-util/ninja-1.8.2 +_MESON_DEPEND=">=dev-util/meson-0.59.4 + ${NINJA_DEPEND} dev-util/meson-format-array " -# @ECLASS-VARIABLE: MESON_AUTO_DEPEND +# @ECLASS_VARIABLE: MESON_AUTO_DEPEND # @DESCRIPTION: # Set to 'no' to disable automatically adding to DEPEND. This lets # ebuilds form conditional depends by using ${MESON_DEPEND} in @@ -71,18 +71,18 @@ if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then fi __MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass -# @ECLASS-VARIABLE: BUILD_DIR +# @ECLASS_VARIABLE: BUILD_DIR # @DEFAULT_UNSET # @DESCRIPTION: # Build directory, location where all generated files should be placed. # If this isn't set, it defaults to ${WORKDIR}/${P}-build. -# @ECLASS-VARIABLE: EMESON_BUILDTYPE +# @ECLASS_VARIABLE: EMESON_BUILDTYPE # @DESCRIPTION: # The buildtype value to pass to meson setup. : ${EMESON_BUILDTYPE=plain} -# @ECLASS-VARIABLE: EMESON_SOURCE +# @ECLASS_VARIABLE: EMESON_SOURCE # @DEFAULT_UNSET # @DESCRIPTION: # The location of the source files for the project; this is the source @@ -298,6 +298,8 @@ meson_feature() { meson_src_configure() { debug-print-function ${FUNCNAME} "$@" + [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" + local BUILD_CFLAGS=${BUILD_CFLAGS} local BUILD_CPPFLAGS=${BUILD_CPPFLAGS} local BUILD_CXXFLAGS=${BUILD_CXXFLAGS} @@ -336,6 +338,16 @@ meson_src_configure() { --build.pkg-config-path "${BUILD_PKG_CONFIG_PATH}${BUILD_PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig" --pkg-config-path "${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig" --native-file "$(_meson_create_native_file)" + + # gcc[pch] is masked in profiles due to consistent bugginess + # without forcing this off, some packages may fail too (like gjs, + # bug #839549), but in any case, we don't want to bother attempting + # this. + -Db_pch=false + + # It's Gentoo policy to not have builds die on blanket -Werror, as it's + # an upstream development matter. bug #754279. + -Dwerror=false ) if [[ -n ${EMESON_BUILDTYPE} ]]; then @@ -435,6 +447,7 @@ meson_install() { local mesoninstallargs=( -C "${BUILD_DIR}" --destdir "${D}" + --no-rebuild "$@" ) |