Skip to content

Commit d10fd45

Browse files
committed
rebuild(swift): patch to build with NDK 26b, including libdispatch and llbuild
1 parent 344793a commit d10fd45

10 files changed

+376
-89
lines changed

packages/libdispatch/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The libdispatch project, for concurrency on multicore ha
33
TERMUX_PKG_LICENSE="Apache-2.0"
44
TERMUX_PKG_MAINTAINER="@finagolfin"
55
TERMUX_PKG_VERSION="1:5.9"
6+
TERMUX_PKG_REVISION=1
67
TERMUX_PKG_SRCURL=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${TERMUX_PKG_VERSION:2}-RELEASE.tar.gz
78
TERMUX_PKG_SHA256=db30ccf6b20963112ab3aad256c2e49a18041a9806cf2f05854fe63a90d688c2
89
TERMUX_PKG_AUTO_UPDATE=false

packages/libdispatch/dispatch-dispatch.h.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

packages/llbuild/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A low-level build system, used by the Swift Package Mana
33
TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
44
TERMUX_PKG_MAINTAINER="@finagolfin"
55
TERMUX_PKG_VERSION=5.9
6+
TERMUX_PKG_REVISION=1
67
TERMUX_PKG_SRCURL=https://github.com/apple/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-RELEASE.tar.gz
78
TERMUX_PKG_SHA256=cc8dfb098db4b0210ca5466f59d3e5fc55c4eedcd835263e6eae7dd719ba8203
89
TERMUX_PKG_DEPENDS="libc++, libandroid-spawn, libsqlite"

packages/llbuild/products-libllbuild-include-llbuild-buildsystem.h.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/swift/bionic-odr-checking-workarounds.patch

Lines changed: 0 additions & 56 deletions
This file was deleted.

packages/swift/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language"
33
TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
44
TERMUX_PKG_MAINTAINER="@finagolfin"
55
TERMUX_PKG_VERSION=5.9.1
6+
TERMUX_PKG_REVISION=1
67
SWIFT_RELEASE="RELEASE"
78
TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz
89
TERMUX_PKG_SHA256=d63c9743fa1d35c8c6203745955375fd69c710897de96d1c6245d2c9e42fbb49
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
diff --git a/llvm-project/clang/tools/IndexStore/IndexStore.exports b/llvm-project/clang/tools/IndexStore/IndexStore.exports
2+
index a24b8bbad9fe..1d5beaa02ba3 100644
3+
--- a/llvm-project/clang/tools/IndexStore/IndexStore.exports
4+
+++ b/llvm-project/clang/tools/IndexStore/IndexStore.exports
5+
@@ -10,9 +10,7 @@ indexstore_store_create_with_options
6+
indexstore_store_dispose
7+
indexstore_store_get_unit_modification_time
8+
indexstore_store_get_unit_name_from_output_path
9+
-indexstore_store_units_apply
10+
indexstore_store_units_apply_f
11+
-indexstore_store_set_unit_event_handler
12+
indexstore_store_set_unit_event_handler_f
13+
indexstore_store_start_unit_event_listening
14+
indexstore_store_stop_unit_event_listening
15+
@@ -33,19 +31,13 @@ indexstore_symbol_relation_get_symbol
16+
indexstore_occurrence_get_symbol
17+
indexstore_occurrence_get_roles
18+
indexstore_occurrence_get_line_col
19+
-indexstore_occurrence_relations_apply
20+
indexstore_occurrence_relations_apply_f
21+
indexstore_record_reader_create
22+
indexstore_record_reader_dispose
23+
-indexstore_record_reader_search_symbols
24+
indexstore_record_reader_search_symbols_f
25+
-indexstore_record_reader_symbols_apply
26+
indexstore_record_reader_symbols_apply_f
27+
-indexstore_record_reader_occurrences_apply
28+
indexstore_record_reader_occurrences_apply_f
29+
-indexstore_record_reader_occurrences_in_line_range_apply
30+
indexstore_record_reader_occurrences_in_line_range_apply_f
31+
-indexstore_record_reader_occurrences_of_symbols_apply
32+
indexstore_record_reader_occurrences_of_symbols_apply_f
33+
indexstore_unit_dependency_get_kind
34+
indexstore_unit_dependency_get_filepath
35+
@@ -68,9 +60,7 @@ indexstore_unit_reader_get_working_dir
36+
indexstore_unit_reader_get_output_file
37+
indexstore_unit_reader_get_sysroot_path
38+
indexstore_unit_reader_get_target
39+
-indexstore_unit_reader_dependencies_apply
40+
indexstore_unit_reader_dependencies_apply_f
41+
-indexstore_unit_reader_includes_apply
42+
indexstore_unit_reader_includes_apply_f
43+
indexstore_unit_reader_has_main_file
44+
indexstore_unit_reader_is_debug_compilation

0 commit comments

Comments
 (0)