diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /eclass/meson.eclass | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 1590c1f14cf5..21338280df33 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.51.2 +MESON_DEPEND=">=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2" if [[ ${EAPI:-0} == [6] ]]; then @@ -373,20 +373,7 @@ meson_src_configure() { local -x BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}" ( - # https://bugs.gentoo.org/720860 - if ver_test "$(meson --version)" -lt "0.54"; then - local -x CFLAGS=${BUILD_CFLAGS} - local -x CPPFLAGS=${BUILD_CPPFLAGS} - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x FFLAGS=${BUILD_FCFLAGS} - local -x OBJCFLAGS=${BUILD_OBJCFLAGS} - local -x OBJCXXFLAGS=${BUILD_OBJCXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - else - # https://bugs.gentoo.org/720818 - export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH} - fi - + export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH} echo "${mesonargs[@]}" >&2 "${mesonargs[@]}" ) || die |