From 3705b1f8e683896b15882d5f974a6e63ee3473d8 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Wed, 12 Sep 2018 21:42:30 +0200 Subject: [PATCH] glib: fix armv5tel build Closes: #2690 [via git-merge-pr] --- srcpkgs/glib/patches/fix-armv5tel-build.patch | 11 +++++++++++ srcpkgs/glib/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glib/patches/fix-armv5tel-build.patch diff --git a/srcpkgs/glib/patches/fix-armv5tel-build.patch b/srcpkgs/glib/patches/fix-armv5tel-build.patch new file mode 100644 index 00000000000..09fbdb1c525 --- /dev/null +++ b/srcpkgs/glib/patches/fix-armv5tel-build.patch @@ -0,0 +1,11 @@ +--- meson.build ++++ meson.build +@@ -1543,7 +1543,7 @@ atomicdefine = ''' + # We know that we can always use real ("lock free") atomic operations with MSVC + if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops') + have_atomic_lock_free = true +- if host_system == 'android' and not cc.compiles(atomicdefine, name : 'atomic ops define') ++ if not cc.compiles(atomicdefine, name : 'atomic ops define') + # When building for armv5 on Android, gcc 4.9 provides + # __sync_bool_compare_and_swap but doesn't define + # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index f6da6d5c785..d5909c92881 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template file for 'glib' pkgname=glib version=2.58.0 -revision=3 +revision=4 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=false" hostmakedepends="pkg-config python3 libxslt docbook-xsl"