network-manager-applet: fix gcc6 build + gir musl
Enable gir for musl again because glib was fixed in #4693
This commit is contained in:
parent
5704e3c0c5
commit
ff1d9000f1
1 changed files with 11 additions and 10 deletions
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'network-manager-applet'
|
||||
pkgname=network-manager-applet
|
||||
version=1.0.10
|
||||
revision=2
|
||||
revision=3
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --without-bluetooth
|
||||
|
@ -23,16 +23,17 @@ checksum=b045ac3eaa68ccbbefe91510ad67b4002a7e09d1e5ce1c4bf9a67619bd2cf0eb
|
|||
|
||||
# Package build options
|
||||
build_options="gir"
|
||||
# Enable gir for non-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)
|
||||
;;
|
||||
*) # Enable gir for non-cross builds
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
build_options_default+=" gir"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
CFLAGS="-O2 -pipe"
|
||||
_gccver=$(gcc --version|awk '/^gcc \(GCC\)/ { print $3 }')
|
||||
if [ "${_gccver%%.*}" -gt 5 ]; then
|
||||
# Fix gcc6 build error for warning -Wmisleading-indentation
|
||||
CFLAGS+=" -Wno-error=misleading-indentation"
|
||||
fi
|
||||
|
||||
libnm-gtk_package() {
|
||||
short_desc+=" - runtime library"
|
||||
|
|
Loading…
Reference in a new issue