diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-05-22 12:35:38 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-05-22 12:50:42 -0400 |
| commit | b46bdbdc23d5a1d073cd8afab602581f1ae0f4d8 (patch) | |
| tree | 5811b4b329f81a1a86c24f89c96b37db1eb5ba69 /eclass | |
| parent | dev-db/kdb: Drop 3.2.0 (r0) (diff) | |
| download | gentoo-b46bdbdc23d5a1d073cd8afab602581f1ae0f4d8.tar.gz gentoo-b46bdbdc23d5a1d073cd8afab602581f1ae0f4d8.tar.bz2 gentoo-b46bdbdc23d5a1d073cd8afab602581f1ae0f4d8.zip | |
meson.eclass: move compiler flags to [built-in options]
Resolves deprecation notices since meson 0.56.0.
Closes: https://bugs.gentoo.org/738710
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/meson.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index d87d61f44ae4..0acc490452f2 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -54,7 +54,7 @@ EXPORT_FUNCTIONS src_configure src_compile src_test src_install if [[ -z ${_MESON_ECLASS} ]]; then _MESON_ECLASS=1 -MESON_DEPEND=">=dev-util/meson-0.54.0 +MESON_DEPEND=">=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array " @@ -180,7 +180,7 @@ _meson_create_cross_file() { strip = $(_meson_env_array "$(tc-getSTRIP)") windres = $(_meson_env_array "$(tc-getRC)") - [properties] + [built-in options] c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") @@ -191,6 +191,8 @@ _meson_create_cross_file() { objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}") objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}") objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}") + + [properties] needs_exe_wrapper = true sys_root = '${SYSROOT}' pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' @@ -232,7 +234,7 @@ _meson_create_native_file() { strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") - [properties] + [built-in options] c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") @@ -243,6 +245,8 @@ _meson_create_native_file() { objc_link_args = $(_meson_env_array "${BUILD_OBJCFLAGS} ${BUILD_LDFLAGS}") objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}") objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}") + + [properties] needs_exe_wrapper = false pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' |