diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /eclass/meson.eclass | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index c094f4683913..905c4d89f501 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -1,4 +1,4 @@ -# Copyright 2017-2021 Gentoo Authors +# Copyright 2017-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: meson.eclass @@ -48,7 +48,7 @@ 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.59.4 - >=dev-util/ninja-1.8.2 + ${NINJA_DEPEND} dev-util/meson-format-array " @@ -285,6 +285,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} @@ -323,6 +325,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 |