moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

network-manager-applet: fix gcc6 build + gir musl

Browse source 
Enable gir for musl again because glib was fixed in #4693
This commit is contained in:
Juergen Buchmueller 2016-09-13 06:13:59 +02:00
parent 5704e3c0c5
commit ff1d9000f1
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
srcpkgs/network-manager-applet/template
View file

@ -1,7 +1,7 @@
# Template file for 'network-manager-applet' # Template file for 'network-manager-applet'
pkgname=network-manager-applet pkgname=network-manager-applet
version=1.0.10 version=1.0.10
revision=2 revision=3
lib32disabled=yes lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-static --without-bluetooth configure_args="--disable-static --without-bluetooth
@ -23,16 +23,17 @@ checksum=b045ac3eaa68ccbbefe91510ad67b4002a7e09d1e5ce1c4bf9a67619bd2cf0eb
# Package build options # Package build options
build_options="gir" build_options="gir"
# Enable gir for non-cross builds
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gir"
fi
case "$XBPS_TARGET_MACHINE" in CFLAGS="-O2 -pipe"
*-musl) # Disable gir for musl (broken on x86_64-musl) _gccver=$(gcc --version|awk '/^gcc \(GCC\)/ { print $3 }')
;; if [ "${_gccver%%.*}" -gt 5 ]; then
*) # Enable gir for non-cross builds # Fix gcc6 build error for warning -Wmisleading-indentation
if [ -z "$CROSS_BUILD" ]; then CFLAGS+=" -Wno-error=misleading-indentation"
build_options_default+=" gir" fi
fi
;;
esac
libnm-gtk_package() { libnm-gtk_package() {
short_desc+=" - runtime library" short_desc+=" - runtime library"