diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-02-13 10:50:47 -0600 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-02-13 10:50:47 -0600 |
| commit | 87783af0a2bb7689354ea2b197867504d79332bd (patch) | |
| tree | 60fea980fbbea791bdde1043f7c9233eb49b2253 | |
| parent | 5c3ec8d0f9049b40d6df3f2680550023c092594f (diff) | |
| download | swift-lang-87783af0a2bb7689354ea2b197867504d79332bd.tar.gz swift-lang-87783af0a2bb7689354ea2b197867504d79332bd.tar.xz swift-lang-87783af0a2bb7689354ea2b197867504d79332bd.zip | |
Fix for Swift failing to build using Clang 6
| -rw-r--r-- | swift-lang-4.1-fix-for-clang-6.patch | 11 | ||||
| -rw-r--r-- | swift-lang.spec | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/swift-lang-4.1-fix-for-clang-6.patch b/swift-lang-4.1-fix-for-clang-6.patch new file mode 100644 index 0000000..f50d408 --- /dev/null +++ b/swift-lang-4.1-fix-for-clang-6.patch @@ -0,0 +1,11 @@ +--- swift/include/swift/Basic/ArrayRefView.h.orig 2018-02-13 10:36:07.091252447 -0600 ++++ swift/include/swift/Basic/ArrayRefView.h 2018-02-13 10:36:48.915917269 -0600 +@@ -47,6 +47,8 @@ + Projected operator->() const { return operator*(); } + iterator &operator++() { Ptr++; return *this; } + iterator operator++(int) { return iterator(Ptr++); } ++ iterator &operator--() { Ptr--; return *this; } ++ iterator operator--(int) { return iterator(Ptr--); } + bool operator==(iterator rhs) const { return Ptr == rhs.Ptr; } + bool operator!=(iterator rhs) const { return Ptr != rhs.Ptr; } + diff --git a/swift-lang.spec b/swift-lang.spec index 9890df2..6bf8349 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-07-a -%global swiftgithash 0a129ff -%global swiftgitdate 20180207 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-08-a +%global swiftgithash 54a3597 +%global swiftgitdate 20180208 Name: swift-lang Version: 4.1 Release: 0.%{swiftgitdate}git%{swiftgithash}%{?dist} @@ -25,6 +25,7 @@ Source13: https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz#/ninj Source14: swift-lang.conf Patch0: %{name}-%{version}-change-lldb-location.patch +Patch1: %{name}-%{version}-fix-for-clang-6.patch BuildRequires: which BuildRequires: clang @@ -86,6 +87,7 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo mv ninja-1.7.2 ninja %patch0 -p0 +%patch1 -p0 %build swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -155,5 +157,5 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift %postun -p /sbin/ldconfig %changelog -* Thu Feb 08 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180207git0a129ff +* Sun Feb 11 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180208git54a3597 - Initial package for Fedora |