diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-09-09 21:59:42 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-09-09 21:59:42 -0500 |
| commit | 8ae0d821d070398ee2f3c1c3087161e6f63dd259 (patch) | |
| tree | fa2727c2e4b1dbc7a3f513f66a7b85616f7273d3 | |
| parent | 28d6e210d03cbdab6b86c81e4d8aacf0d26a3066 (diff) | |
| download | swift-lang-8ae0d821d070398ee2f3c1c3087161e6f63dd259.tar.gz swift-lang-8ae0d821d070398ee2f3c1c3087161e6f63dd259.tar.xz swift-lang-8ae0d821d070398ee2f3c1c3087161e6f63dd259.zip | |
Added patch to handle changes to Clang 7.0 regarding template handling
| -rw-r--r-- | reflection-template.patch | 18 | ||||
| -rw-r--r-- | swift-lang.spec | 7 |
2 files changed, 24 insertions, 1 deletions
diff --git a/reflection-template.patch b/reflection-template.patch new file mode 100644 index 0000000..22f3ec2 --- /dev/null +++ b/reflection-template.patch @@ -0,0 +1,18 @@ +--- swift/include/swift/Reflection/TypeRef.h.orig 2018-09-09 16:18:28.138659278 -0500 ++++ swift/include/swift/Reflection/TypeRef.h 2018-09-09 16:20:47.423286114 -0500 +@@ -48,12 +48,12 @@ + + #define FIND_OR_CREATE_TYPEREF(Allocator, TypeRefTy, ...) \ + auto ID = Profile(__VA_ARGS__); \ +- const auto Entry = Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.find(ID); \ +- if (Entry != Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.end()) \ ++ const auto Entry = Allocator.TypeRefTy##s.find(ID); \ ++ if (Entry != Allocator.TypeRefTy##s.end()) \ + return Entry->second; \ + const auto TR = \ + Allocator.DEPENDENT_TEMPLATE makeTypeRef<TypeRefTy>(__VA_ARGS__); \ +- Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.insert({ID, TR}); \ ++ Allocator.TypeRefTy##s.insert({ID, TR}); \ + return TR; + + /// An identifier containing the unique bit pattern made up of all of the diff --git a/swift-lang.spec b/swift-lang.spec index 8b1c00d..daf5ff7 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,7 +6,7 @@ %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.65.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.66.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -29,6 +29,7 @@ Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch +Patch3: reflection-template.patch BuildRequires: clang BuildRequires: cmake @@ -112,6 +113,8 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Since we require ninja for building, there's no sense to rebuild it just for Swift %patch2 -p0 +# Template issue with clang 7.0 +%patch3 -p0 %build export VERBOSE=1 @@ -201,6 +204,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sun Sep 09 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.66.20180908gitbe88499 +- Added patch for clang 7.0 * Sun Sep 09 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.65.20180908gitbe88499 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-08-a * Sat Sep 08 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.64.20180907gitc922f68 |