diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-01-12 12:58:40 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-01-12 12:58:40 -0500 |
| commit | 0f4d1f24fe31a5ac37cf3e3c32833e4d4e9e09d7 (patch) | |
| tree | cca286279de5477dcc8c5ede6e0d1369d9523a1f /eclass/meson.eclass | |
| parent | app-admin/conserver: Fixed build with sys-devel/autoconf:2.70 (diff) | |
| download | gentoo-0f4d1f24fe31a5ac37cf3e3c32833e4d4e9e09d7.tar.gz gentoo-0f4d1f24fe31a5ac37cf3e3c32833e4d4e9e09d7.tar.bz2 gentoo-0f4d1f24fe31a5ac37cf3e3c32833e4d4e9e09d7.zip | |
Revert "meson.eclass: fix machine files"
needs_exe_wrapper and pkg_config_libdir are not built-in options.
Reverts: e3cc29cc79d4e94d0144c3ebc4d8cf00d4ee2e70
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index de46be1cac7a..67b7ca831fd2 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -120,7 +120,7 @@ _meson_env_array() { # @FUNCTION: _meson_get_machine_info # @USAGE: <tuple> -# @RETURN: system/cpu_family/cpu/builtin_options variables +# @RETURN: system/cpu_family/cpu variables # @INTERNAL # @DESCRIPTION: # Translate toolchain tuple into machine values for meson. @@ -146,17 +146,6 @@ _meson_get_machine_info() { # This may require adjustment based on CFLAGS cpu=${tuple%%-*} - - local ver_opt - case "${EAPI}" in - 6) ver_opt=--host-root ;; - *) ver_opt=-b ;; - esac - if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then - builtin_options="[properties]" - else - builtin_options="[built-in options]" - fi } # @FUNCTION: _meson_create_cross_file @@ -166,7 +155,7 @@ _meson_get_machine_info() { # Creates a cross file. meson uses this to define settings for # cross-compilers. This function is called from meson_src_configure. _meson_create_cross_file() { - local system cpu_family cpu builtin_options + local system cpu_family cpu _meson_get_machine_info "${CHOST}" local fn=${T}/meson.${CHOST}.${ABI}.ini @@ -185,7 +174,7 @@ _meson_create_cross_file() { strip = $(_meson_env_array "$(tc-getSTRIP)") windres = $(_meson_env_array "$(tc-getRC)") - ${builtin_options} + [properties] c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") @@ -217,10 +206,11 @@ _meson_create_cross_file() { # Creates a native file. meson uses this to define settings for # native compilers. This function is called from meson_src_configure. _meson_create_native_file() { - local system cpu_family cpu builtin_options + local system cpu_family cpu _meson_get_machine_info "${CBUILD}" local fn=${T}/meson.${CBUILD}.${ABI}.ini + cat > "${fn}" <<-EOF [binaries] ar = $(_meson_env_array "$(tc-getBUILD_AR)") @@ -235,7 +225,7 @@ _meson_create_native_file() { strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") - ${builtin_options} + [properties] 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}") |