From cdbcc399e4e387c8d7f9df2e08987ec37d9eab5c Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 27 Dec 2020 18:48:08 +0100 Subject: [PATCH] libdispatch: fix build with ndk r22 Patch from @buttaface. This commit is responsible: https://github.com/aosp-mirror/platform_bionic/commit/76e2b15 --- packages/libdispatch/build.sh | 1 + packages/libdispatch/src-shims-atomic.h.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/libdispatch/src-shims-atomic.h.patch diff --git a/packages/libdispatch/build.sh b/packages/libdispatch/build.sh index cc53ad4bc8..a046b46bbc 100644 --- a/packages/libdispatch/build.sh +++ b/packages/libdispatch/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@buttaface" _VERSION=5.3.3 TERMUX_PKG_VERSION=1:${_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${_VERSION}-RELEASE.tar.gz TERMUX_PKG_SHA256=84a482afefdcda26c7dc83e3b75e662ed7705786a34a6b4958c0cdc6cace2c46 TERMUX_PKG_DEPENDS="libc++, libblocksruntime" diff --git a/packages/libdispatch/src-shims-atomic.h.patch b/packages/libdispatch/src-shims-atomic.h.patch new file mode 100644 index 0000000000..9425127593 --- /dev/null +++ b/packages/libdispatch/src-shims-atomic.h.patch @@ -0,0 +1,15 @@ +https://github.com/aosp-mirror/platform_bionic/commit/76e2b15 + +diff --git a/src/shims/atomic.h b/src/shims/atomic.h +index c002e72..33ad5fe 100644 +--- a/src/shims/atomic.h ++++ b/src/shims/atomic.h +@@ -35,7 +35,7 @@ + #if defined(__cplusplus) + #define _Bool bool + #endif +-#include ++#include + + #define memory_order_ordered memory_order_seq_cst + #define memory_order_dependency memory_order_acquire