On Wed, 2020-09-02 at 14:39 +0200, Christian Ehrhardt wrote: > The checks for libfdt try dependency() first which would only work if > a pkg-config would be present but libfdt has none. > Then it probes for the lib path itself via cc.find_library. > > But later it adds the result of either probe to ext_deps which ends up > in build and also the resulting pkg-config to contain toolchain versioned > paths in Libs.private like: > /usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu/libfdt.so > which obviously breaks on toolchain updates. > > In general libs used multiple times - ipn3ke + ifpga in this case - are > checked centrally in config/meson.build so move it there and fix the > adding of dependencies to not use the full file path. > > The result is libfdt in pkg-config now showing up as: > Libs.private: -pthread -lm -ldl -lnuma -lfdt -lpcap > > Signed-off-by: Christian Ehrhardt <christian.ehrha...@canonical.com> > Reviewed-by: Luca Boccassi <bl...@debian.org> > Reviewed-by: Bruce Richardson <bruce.richard...@intel.com> > --- > config/meson.build | 9 +++++++++ > drivers/net/ipn3ke/meson.build | 6 +----- > drivers/raw/ifpga/meson.build | 7 +------ > 3 files changed, 11 insertions(+), 11 deletions(-)
Given this is low-risk and it fixes a build failure that is happening right now in Debian/Ubuntu, I'll pick it up for 19.11.4 straight away. -- Kind regards, Luca Boccassi
