diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-04-12 21:47:18 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-04-12 21:47:18 -0500 |
| commit | 2e8955e9705389aa27522097b6092787cf78e0a4 (patch) | |
| tree | f498ee523e3d4dc57e24032e56ceae9e3f064d34 | |
| parent | f668e9a9bde8565bb4aa3cd8607d39f43a4eae76 (diff) | |
| download | swift-lang-2e8955e9705389aa27522097b6092787cf78e0a4.tar.gz swift-lang-2e8955e9705389aa27522097b6092787cf78e0a4.tar.xz swift-lang-2e8955e9705389aa27522097b6092787cf78e0a4.zip | |
Actual working version of 4.2-dev
| -rw-r--r-- | swift-lang-4.2-change-lldb-location.patch (renamed from swift-lang-4.1-change-lldb-location.patch) | 9 | ||||
| -rw-r--r-- | swift-lang.spec | 16 |
2 files changed, 15 insertions, 10 deletions
diff --git a/swift-lang-4.1-change-lldb-location.patch b/swift-lang-4.2-change-lldb-location.patch index 1dca984..7a13cb1 100644 --- a/swift-lang-4.1-change-lldb-location.patch +++ b/swift-lang-4.2-change-lldb-location.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- swift/lib/Driver/ToolChains.cpp.orig 2018-04-12 15:42:53.633440991 -0500 ++++ swift/lib/Driver/ToolChains.cpp 2018-04-12 15:44:37.578628169 -0500 +@@ -841,10 +841,8 @@ useLLDB = false; break; case REPLJobAction::Mode::RequireLLDB: @@ -12,7 +12,7 @@ break; } -@@ -855,7 +853,7 @@ +@@ -872,7 +870,7 @@ ArgStringList Arguments; Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg))); @@ -20,3 +20,4 @@ + return {"/usr/libexec/swift-lldb/lldb", Arguments}; } + diff --git a/swift-lang.spec b/swift-lang.spec index fccd959..730b37d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,10 +1,10 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-27-a -%global swiftgithash 5f2f440 -%global swiftgitdate 20180227 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-04-11-a +%global swiftgithash 537a846 +%global swiftgitdate 20180411 Name: swift-lang -Version: 4.1 -Release: 0.2.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 4.2 +Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -111,7 +111,6 @@ ln -fs swift %{buildroot}/usr/bin/swiftc ln -fs swift %{buildroot}/usr/bin/swift-format install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb -install -m 0755 %{_builddir}/usr/bin/liblldb-intel-mpxtable.so %{buildroot}%{_libexecdir}/swift-lldb install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb mkdir -p %{buildroot}/usr/lib/swift-lldb @@ -122,6 +121,9 @@ ln -fs liblldb.so.5.0.0 %{buildroot}/usr/lib/swift-lldb/liblldb.so.5 ln -fs liblldb.so.5 %{buildroot}/usr/lib/swift-lldb/liblldb.so cp %{_builddir}/usr/lib/libsourcekitdInProc.so %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libswiftDemangle.so %{buildroot}/usr/lib/swift-lldb +cp %{_builddir}/usr/lib/liblldbIntelFeatures.so.5.0.0 %{buildroot}/usr/lib/swift-lldb +ln -fs liblldbIntelFeatures.so.5.0.0 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so.5 +ln -fs liblldbIntelFeatures.so.5 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift mkdir -p %{buildroot}/usr/lib/swift @@ -159,6 +161,8 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift %postun -p /sbin/ldconfig %changelog +* Thu Apr 12 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.3.20180411git537a846 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-11-a * 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 |