Skip to content

Commit

Permalink
rebuild(swift): patch to build with NDK 26b, including libdispatch an…
Browse files Browse the repository at this point in the history
…d llbuild
  • Loading branch information
finagolfin committed Nov 19, 2023
1 parent 344793a commit d10fd45
Show file tree
Hide file tree
Showing 10 changed files with 376 additions and 89 deletions.
1 change: 1 addition & 0 deletions packages/libdispatch/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The libdispatch project, for concurrency on multicore ha
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@finagolfin"
TERMUX_PKG_VERSION="1:5.9"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${TERMUX_PKG_VERSION:2}-RELEASE.tar.gz
TERMUX_PKG_SHA256=db30ccf6b20963112ab3aad256c2e49a18041a9806cf2f05854fe63a90d688c2
TERMUX_PKG_AUTO_UPDATE=false
Expand Down
15 changes: 0 additions & 15 deletions packages/libdispatch/dispatch-dispatch.h.patch

This file was deleted.

1 change: 1 addition & 0 deletions packages/llbuild/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A low-level build system, used by the Swift Package Mana
TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
TERMUX_PKG_MAINTAINER="@finagolfin"
TERMUX_PKG_VERSION=5.9
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/apple/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-RELEASE.tar.gz
TERMUX_PKG_SHA256=cc8dfb098db4b0210ca5466f59d3e5fc55c4eedcd835263e6eae7dd719ba8203
TERMUX_PKG_DEPENDS="libc++, libandroid-spawn, libsqlite"
Expand Down

This file was deleted.

56 changes: 0 additions & 56 deletions packages/swift/bionic-odr-checking-workarounds.patch

This file was deleted.

1 change: 1 addition & 0 deletions packages/swift/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language"
TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
TERMUX_PKG_MAINTAINER="@finagolfin"
TERMUX_PKG_VERSION=5.9.1
TERMUX_PKG_REVISION=1
SWIFT_RELEASE="RELEASE"
TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz
TERMUX_PKG_SHA256=d63c9743fa1d35c8c6203745955375fd69c710897de96d1c6245d2c9e42fbb49
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
diff --git a/llvm-project/clang/tools/IndexStore/IndexStore.exports b/llvm-project/clang/tools/IndexStore/IndexStore.exports
index a24b8bbad9fe..1d5beaa02ba3 100644
--- a/llvm-project/clang/tools/IndexStore/IndexStore.exports
+++ b/llvm-project/clang/tools/IndexStore/IndexStore.exports
@@ -10,9 +10,7 @@ indexstore_store_create_with_options
indexstore_store_dispose
indexstore_store_get_unit_modification_time
indexstore_store_get_unit_name_from_output_path
-indexstore_store_units_apply
indexstore_store_units_apply_f
-indexstore_store_set_unit_event_handler
indexstore_store_set_unit_event_handler_f
indexstore_store_start_unit_event_listening
indexstore_store_stop_unit_event_listening
@@ -33,19 +31,13 @@ indexstore_symbol_relation_get_symbol
indexstore_occurrence_get_symbol
indexstore_occurrence_get_roles
indexstore_occurrence_get_line_col
-indexstore_occurrence_relations_apply
indexstore_occurrence_relations_apply_f
indexstore_record_reader_create
indexstore_record_reader_dispose
-indexstore_record_reader_search_symbols
indexstore_record_reader_search_symbols_f
-indexstore_record_reader_symbols_apply
indexstore_record_reader_symbols_apply_f
-indexstore_record_reader_occurrences_apply
indexstore_record_reader_occurrences_apply_f
-indexstore_record_reader_occurrences_in_line_range_apply
indexstore_record_reader_occurrences_in_line_range_apply_f
-indexstore_record_reader_occurrences_of_symbols_apply
indexstore_record_reader_occurrences_of_symbols_apply_f
indexstore_unit_dependency_get_kind
indexstore_unit_dependency_get_filepath
@@ -68,9 +60,7 @@ indexstore_unit_reader_get_working_dir
indexstore_unit_reader_get_output_file
indexstore_unit_reader_get_sysroot_path
indexstore_unit_reader_get_target
-indexstore_unit_reader_dependencies_apply
indexstore_unit_reader_dependencies_apply_f
-indexstore_unit_reader_includes_apply
indexstore_unit_reader_includes_apply_f
indexstore_unit_reader_has_main_file
indexstore_unit_reader_is_debug_compilation

0 comments on commit d10fd45

Please sign in to comment.