NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/network-manager: fix detection of pppd

Browse Source 
With the switch to meson in 58c5846631 (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 <yann.morin@orange.com>
Cc: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yann E. MORIN 2022-09-12 11:58:00 +02:00 committed by Thomas Petazzoni
parent 4134dff620
commit ceabca4b85
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/network-manager/network-manager.mk
View File

@ -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