diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-07-04 19:40:13 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-07-04 19:41:05 -0400 |
| commit | c56769fcf286f6041cd9d9b0e5c6f9a05245c69c (patch) | |
| tree | 11b8f2548917282c2c0cbbb416861ffdb7de5c3f /eclass | |
| parent | sys-fs/zfs: update live ebuild, add pam useflag (diff) | |
| download | gentoo-c56769fcf286f6041cd9d9b0e5c6f9a05245c69c.tar.gz gentoo-c56769fcf286f6041cd9d9b0e5c6f9a05245c69c.tar.bz2 gentoo-c56769fcf286f6041cd9d9b0e5c6f9a05245c69c.zip | |
meson.eclass: depend on >=dev-util/meson-0.54.0
Also remove compatibility code for earlier versions.
Closes: https://bugs.gentoo.org/730650
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to '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 |