From ceabca4b853203ee5a97e63f69deaead41db3678 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 12 Sep 2022 11:58:00 +0200 Subject: [PATCH] package/network-manager: fix detection of pppd With the switch to meson in 58c58466319a (package/network-manager: migrate autotools build system to meson), the detection of pppd is broken for cross-compilation: Has header "pppd/pppd.h" : YES Program pppd /sbin/pppd /usr/sbin/pppd found: NO ../../../O/br-2022.08/vtc/build/network-manager-1.36.4/meson.build:570:4: ERROR: Assert failed: pppd required but not found, please provide a valid pppd path or use -Dppp=false to disable it Indeed, meson will simply look for existing files on the host, and that can't work in cross-compilation. Fix that by telling meson the results it can't find by itself. Signed-off-by: Yann E. MORIN Cc: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a3bcd4dab8..105273a74c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -103,7 +103,10 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += -Dppp=true +NETWORK_MANAGER_CONF_OPTS += \ + -Dppp=true \ + -Dpppd=/usr/sbin/pppd \ + -Dpppd_plugin_dir=/usr/lib/pppd/$(PPPD_VERSION) else NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif