From 4d07141874805558174f4a06bd421edd2bb808cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 22 Jun 2016 19:29:13 +0200 Subject: [PATCH] NetworkManager: disable gir for *-musl Building with gir is broken for x86_64-musl and probably also i686-musl. Enable it it only for non-cross non-musl builds. --- srcpkgs/NetworkManager/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index f679d29a6f6..aacf58e20b1 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -42,10 +42,16 @@ make_dirs=" # Package build options build_options="gir" -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" -fi +case "$XBPS_TARGET_MACHINE" in + *-musl) # Disable gir for musl (broken on x86_64-musl) + # See: https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/12337/steps/shell_3/logs/stdio + ;; + *) # Enable gir for non-cross builds + if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" + fi + ;; +esac pre_configure() { NOCONFIGURE=1 ./autogen.sh