On Fri, 12 Jun 2020 17:43:10 -0400 Mike Gilbert <flop...@gentoo.org> wrote:
> On Fri, Jun 12, 2020 at 5:25 PM Sergei Trofimovich <sly...@gentoo.org> wrote: > > > > x11-libs/libdrm and media-libs/libglvnd fail to find 'nm' > > tool on sys-devel/binutils-config[-native-symlinks] system as: > > `meson.build:40:0: ERROR: Program(s) ['nm'] not found or not executable` > > > > It's caused by the code that locates the tool as: > > `prog_nm = find_program('nm')`. > > > > The change adds 'nm' tool along with other binutils tools. > > > > CC: William Hubbs <willi...@gentoo.org> > > CC: Mike Gilbert <flop...@gentoo.org> > > Closes: https://bugs.gentoo.org/720886 > > Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> > > --- > > eclass/meson.eclass | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/eclass/meson.eclass b/eclass/meson.eclass > > index e79faa1beea..1590c1f14cf 100644 > > --- a/eclass/meson.eclass > > +++ b/eclass/meson.eclass > > @@ -178,6 +178,7 @@ _meson_create_cross_file() { > > cpp = $(_meson_env_array "$(tc-getCXX)") > > fortran = $(_meson_env_array "$(tc-getFC)") > > llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' > > + nm = $(_meson_env_array "$(tc-getNM)") > > objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") > > objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") > > pkgconfig = '$(tc-getPKG_CONFIG)' > > @@ -228,6 +229,7 @@ _meson_create_native_file() { > > cpp = $(_meson_env_array "$(tc-getBUILD_CXX)") > > fortran = $(_meson_env_array "$(tc-getBUILD_PROG FC gfortran)") > > llvm-config = '$(tc-getBUILD_PROG LLVM_CONFIG llvm-config)' > > + nm = $(_meson_env_array "$(tc-getBUILD_NM)") > > objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)") > > objcpp = $(_meson_env_array "$(tc-getBUILD_PROG OBJCXX c++)") > > pkgconfig = '$(tc-getBUILD_PKG_CONFIG)' > > -- > > 2.27.0 > > > > Looks good. Thank you! Pushed as: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da03d40f146a646c38e75fd0a6fc299b5aeba505 -- Sergei