diff options
| author | Ron Olson <tachoknight@gmail.com> | 2019-10-27 18:47:25 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2019-10-27 18:47:25 -0500 |
| commit | abf19e2d6c9448d2cb9d37cedd4c75bf6851f22c (patch) | |
| tree | e7f343a74af51a7edd9d763eccf6b4961fd69aa6 | |
| parent | 933920d0339d7eab9d4adc7f7487969120c4874f (diff) | |
| download | swift-lang-abf19e2d6c9448d2cb9d37cedd4c75bf6851f22c.tar.gz swift-lang-abf19e2d6c9448d2cb9d37cedd4c75bf6851f22c.tar.xz swift-lang-abf19e2d6c9448d2cb9d37cedd4c75bf6851f22c.zip | |
First attempt at adding sourcekit
| -rw-r--r-- | build-setup.patch | 24 | ||||
| -rw-r--r-- | swift-lang.spec | 9 |
2 files changed, 6 insertions, 27 deletions
diff --git a/build-setup.patch b/build-setup.patch index d0cc4e2..65a956d 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -5,7 +5,7 @@ [preset: mixin_linux_install_components_with_clang] swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc -llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd -+llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt ++llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd [preset: mixin_linux_installation] mixin-preset= @@ -22,25 +22,3 @@ install-swift install-lldb install-llbuild -@@ -782,8 +779,8 @@ - test-optimized - foundation - libdispatch --indexstore-db --sourcekit-lsp -+indexstore-db=0 -+sourcekit-lsp=0 - lit-args=-v --time-tests - - dash-dash -@@ -996,8 +993,8 @@ - xctest - foundation - libdispatch --indexstore-db --sourcekit-lsp -+indexstore-db=0 -+sourcekit-lsp=0 - dash-dash - - install-swift diff --git a/swift-lang.spec b/swift-lang.spec index f243712..364aa4d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -25,8 +25,9 @@ Source9: https://github.com/apple/swift-llvm/archive/swift-%{swifttag}.ta Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz -Source13: swift-lang.conf -Source14: swift-lang-runtime.conf +Source13: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz +Source14: swift-lang.conf +Source15: swift-lang-runtime.conf Patch0: change-lldb-location.patch Patch1: build-setup.patch @@ -97,7 +98,7 @@ Runtime libraries for Swift programs %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is @@ -115,6 +116,7 @@ mv swift-llvm-swift-%{swifttag} llvm mv swift-package-manager-swift-%{swifttag} swiftpm mv swift-swift-%{swifttag} swift mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support +mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp # This patch tells the Swift executable to look for its Swift-specific # lldb executable in /usr/libexec/swift-lldb, not in the same directory @@ -142,7 +144,6 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo %build export VERBOSE=1 -export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 # We may not have /usr/bin/python, so we roll our own # because the build script expects there to be one. mkdir $PWD/binforpython |