summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRon Olson <tachoknight@gmail.com>2018-02-08 12:12:55 -0600
committerRon Olson <tachoknight@gmail.com>2018-02-08 12:12:55 -0600
commit5af0bfa15369a3e2d4617cb4fe1376f4ca299178 (patch)
treee70650634d5c62be250b87859563991ffd1b63b8
parent08c50293f90098ac9862c8ebcd2aad5bd6abaa09 (diff)
downloadswift-lang-5af0bfa15369a3e2d4617cb4fe1376f4ca299178.tar.gz
swift-lang-5af0bfa15369a3e2d4617cb4fe1376f4ca299178.tar.xz
swift-lang-5af0bfa15369a3e2d4617cb4fe1376f4ca299178.zip
Updated to latest Swift 4.1 beta release
-rw-r--r--swift-lang-4.1-change-lldb-location.patch16
-rw-r--r--swift-lang.spec9
2 files changed, 13 insertions, 12 deletions
diff --git a/swift-lang-4.1-change-lldb-location.patch b/swift-lang-4.1-change-lldb-location.patch
index ef08404..d7c9a9d 100644
--- a/swift-lang-4.1-change-lldb-location.patch
+++ b/swift-lang-4.1-change-lldb-location.patch
@@ -1,6 +1,6 @@
---- ./swift/lib/Driver/ToolChains.cpp.orig 2018-02-07 14:21:06.120431401 -0600
-+++ ./swift/lib/Driver/ToolChains.cpp 2018-02-08 08:14:18.345682537 -0600
-@@ -786,7 +786,7 @@
+--- ./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;
break;
case REPLJobAction::Mode::PreferLLDB:
@@ -8,13 +8,13 @@
+ useLLDB = true;
break;
}
-
-@@ -814,7 +814,7 @@
+
+@@ -833,7 +833,7 @@
ArgStringList Arguments;
Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg)));
-
+
- return {"lldb", Arguments};
+ return {"/usr/libexec/swift/lldb", Arguments};
}
-
-
+
+
diff --git a/swift-lang.spec b/swift-lang.spec
index cf75dd9..d69df22 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -1,9 +1,10 @@
%global debug_package %{nil}
-%global swifttag DEVELOPMENT-SNAPSHOT-2018-01-30-a
-
+%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-07-a
+%global swiftgithash 0a129ff
+%global swiftgitdate 20180207
Name: swift-lang
Version: 4.1
-Release: 0.20180130git39f8978%{?dist}
+Release: 0.%{swiftgitdate}git%{swiftgithash}%{?dist}
Summary: Apple's Swift programming language
License: ASL 2.0
URL: https://swift.org
@@ -127,5 +128,5 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift
%postun -p /sbin/ldconfig
%changelog
-* Tue Jan 16 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180130git39f8978
+* Thu Feb 08 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180207git0a129ff
- Initial package for Fedora