diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-02-28 15:29:37 -0600 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-02-28 15:29:37 -0600 |
| commit | f668e9a9bde8565bb4aa3cd8607d39f43a4eae76 (patch) | |
| tree | 5c9eb1942e7c52b6fbec98f806066404c53629ed | |
| parent | 0414349a7d90f450a563e238581edb9fe82b61b6 (diff) | |
| download | swift-lang-f668e9a9bde8565bb4aa3cd8607d39f43a4eae76.tar.gz swift-lang-f668e9a9bde8565bb4aa3cd8607d39f43a4eae76.tar.xz swift-lang-f668e9a9bde8565bb4aa3cd8607d39f43a4eae76.zip | |
Updated to latest version of Swift
| -rw-r--r-- | swift-lang-4.1-change-lldb-location.patch | 20 | ||||
| -rw-r--r-- | swift-lang.spec | 16 |
2 files changed, 22 insertions, 14 deletions
diff --git a/swift-lang-4.1-change-lldb-location.patch b/swift-lang-4.1-change-lldb-location.patch index 1b185b0..1dca984 100644 --- a/swift-lang-4.1-change-lldb-location.patch +++ b/swift-lang-4.1-change-lldb-location.patch @@ -1,20 +1,22 @@ ---- ./swift/lib/Driver/ToolChains.cpp.orig 2018-02-08 09:47:06.735905252 -0600 -+++ ./swift/lib/Driver/ToolChains.cpp 2018-02-08 09:48:23.601008225 -0600 -@@ -805,7 +805,7 @@ - useLLDB = true; +--- swift/lib/Driver/ToolChains.cpp.orig 2018-02-28 15:13:10.332955573 -0600 ++++ swift/lib/Driver/ToolChains.cpp 2018-02-28 15:20:07.657838858 -0600 +@@ -824,10 +824,8 @@ + useLLDB = false; break; + case REPLJobAction::Mode::RequireLLDB: +- useLLDB = true; +- break; case REPLJobAction::Mode::PreferLLDB: - useLLDB = !findProgramRelativeToSwift("lldb").empty(); + useLLDB = true; break; } - -@@ -833,7 +833,7 @@ + +@@ -855,7 +853,7 @@ ArgStringList Arguments; Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg))); - + - return {"lldb", Arguments}; + return {"/usr/libexec/swift-lldb/lldb", Arguments}; } - - + diff --git a/swift-lang.spec b/swift-lang.spec index e445c20..fccd959 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,10 +1,10 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-14-a -%global swiftgithash 5a1a34b -%global swiftgitdate 20180214 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-27-a +%global swiftgithash 5f2f440 +%global swiftgitdate 20180227 Name: swift-lang Version: 4.1 -Release: 0.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.2.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -64,6 +64,7 @@ and desktop apps, scaling up to cloud services. Most importantly, Swift is designed to make writing and maintaining correct programs easier for the developer. + %prep %setup -q -c swift -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 @@ -87,9 +88,12 @@ mv ninja-1.7.2 ninja %patch0 -p0 + %build +export VERBOSE=1 swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz + %install mkdir -p %{buildroot}%{_libexecdir}/swift-lldb mkdir -p %{buildroot}%{_bindir} @@ -155,5 +159,7 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift %postun -p /sbin/ldconfig %changelog -* Wed Feb 14 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180214git5a1a34b +* Wed Feb 28 2018 Ron Olson <tachoknight@gmail.com> 4.1-0.2.20180227git5f2f440 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-02-27-a +* Wed Feb 14 2018 Ron Olson <tachoknight@gmail.com> 4.1-0.1.20180214git5a1a34b - Initial package for Fedora |