From b34d554cdcadf5c6df65b0b762ca3d8e0ea2f730 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 19 Nov 2018 21:39:19 -0600 Subject: First 5.0 version that builds and installs properly --- swift-lang.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index c11d9d0..439fe1f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -151,6 +151,11 @@ ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift mkdir -p %{buildroot}/usr/lib/swift cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/usr/lib/swift ln -fs /usr/lib/swift %{buildroot}/usr/lib/swift-lldb/swift +chmod 0755 %{buildroot}/usr/lib/swift/linux/libswiftDispatch.so +chmod 0755 %{buildroot}/usr/lib/swift/linux/libFoundation.so +chmod 0755 %{buildroot}/usr/lib/swift/linux/libXCTest.so +chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuild.so +chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuildSwift.so mkdir -p %{buildroot}/usr/lib/swift_static cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/usr/lib/swift_static @@ -164,7 +169,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %files -%license swift/LICENSE.txt +# % license swift/LICENSE.txt %{_bindir}/swift* %{_mandir}/man1/* /usr/lib/swift/ @@ -184,8 +189,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %files runtime -/usr/lib/swift/ -/usr/lib/swift/linux/ +/usr/lib/swift/linux/* %{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf -- cgit From 9463c9c0d2c23f3f1a8747bb4b3116fac731ec29 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 23 Nov 2018 07:18:47 -0600 Subject: Forgot I had commented out the license file line --- swift-lang.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 439fe1f..38c9786 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-16-a -%global swiftgithash 201dcba -%global swiftgitdate 20181116 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-22-a +%global swiftgithash fb52a2e +%global swiftgitdate 20181122 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.11.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.12.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -169,7 +169,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %files -# % license swift/LICENSE.txt +%license swift/LICENSE.txt %{_bindir}/swift* %{_mandir}/man1/* /usr/lib/swift/ @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Nov 23 2018 Ron Olson 5.0-0.12.20181122gitfb52a2e +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-22-a * Mon Nov 19 2018 Ron Olson 5.0-0.11.20181116git201dcba - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-16-a * Fri Nov 16 2018 Ron Olson 5.0-0.10.20181115git739169d -- cgit From 6209f52e9d9fdde1df825575eaa13545edfe7155 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 24 Nov 2018 09:14:45 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-11-23-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 38c9786..b0570ac 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-22-a -%global swiftgithash fb52a2e -%global swiftgitdate 20181122 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-23-a +%global swiftgithash a820992 +%global swiftgitdate 20181123 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.12.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.13.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Nov 24 2018 Ron Olson 5.0-0.13.20181123gita820992 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-23-a * Fri Nov 23 2018 Ron Olson 5.0-0.12.20181122gitfb52a2e - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-22-a * Mon Nov 19 2018 Ron Olson 5.0-0.11.20181116git201dcba -- cgit From 3423d133f532adabe78cffc01acf361055b76bec Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 26 Nov 2018 08:59:46 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-11-25-a --- swift-lang.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index b0570ac..e9b27d0 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-23-a +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-25-a %global swiftgithash a820992 -%global swiftgitdate 20181123 +%global swiftgitdate 20181125 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.13.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.14.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Nov 26 2018 Ron Olson 5.0-0.14.20181125gita820992 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-25-a * Sat Nov 24 2018 Ron Olson 5.0-0.13.20181123gita820992 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-23-a * Fri Nov 23 2018 Ron Olson 5.0-0.12.20181122gitfb52a2e -- cgit From e31ea1a85dedf53469b43d707003d1c29876f5d9 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 27 Nov 2018 08:57:39 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-11-26-a --- swift-lang.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index e9b27d0..fd5da8b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-25-a +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-26-a %global swiftgithash a820992 -%global swiftgitdate 20181125 +%global swiftgitdate 20181126 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.14.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.15.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Tue Nov 27 2018 Ron Olson 5.0-0.15.20181126gita820992 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-26-a * Mon Nov 26 2018 Ron Olson 5.0-0.14.20181125gita820992 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-25-a * Sat Nov 24 2018 Ron Olson 5.0-0.13.20181123gita820992 -- cgit From ea13633a55bcd788c787a1ed84b187d055e046b9 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 29 Nov 2018 09:14:02 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-11-28-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index fd5da8b..60145c5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-26-a -%global swiftgithash a820992 -%global swiftgitdate 20181126 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-28-a +%global swiftgithash 806cf57 +%global swiftgitdate 20181128 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.15.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.16.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Nov 29 2018 Ron Olson 5.0-0.16.20181128git806cf57 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-28-a * Tue Nov 27 2018 Ron Olson 5.0-0.15.20181126gita820992 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-26-a * Mon Nov 26 2018 Ron Olson 5.0-0.14.20181125gita820992 -- cgit From 3d85601a876844d7321bbe3470cb3d73d98de756 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 1 Dec 2018 09:24:05 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-11-30-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 60145c5..9f3a4fe 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-28-a -%global swiftgithash 806cf57 -%global swiftgitdate 20181128 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-30-a +%global swiftgithash d8f12cb +%global swiftgitdate 20181130 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.16.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.17.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Dec 01 2018 Ron Olson 5.0-0.17.20181130gitd8f12cb +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-30-a * Thu Nov 29 2018 Ron Olson 5.0-0.16.20181128git806cf57 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-28-a * Tue Nov 27 2018 Ron Olson 5.0-0.15.20181126gita820992 -- cgit From 2a2720dbfdbd62712b481d04b37b0d96f58c85dc Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 2 Dec 2018 09:32:09 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-12-01-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 9f3a4fe..582bff9 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-30-a -%global swiftgithash d8f12cb -%global swiftgitdate 20181130 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-01-a +%global swiftgithash b01ee72 +%global swiftgitdate 20181201 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.17.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.18.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sun Dec 02 2018 Ron Olson 5.0-0.18.20181201gitb01ee72 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-01-a * Sat Dec 01 2018 Ron Olson 5.0-0.17.20181130gitd8f12cb - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-30-a * Thu Nov 29 2018 Ron Olson 5.0-0.16.20181128git806cf57 -- cgit From 91c57103adc1279f6040f9a04271dbd59ddd1492 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 3 Dec 2018 09:24:36 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-12-02-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 582bff9..c043e04 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-01-a -%global swiftgithash b01ee72 -%global swiftgitdate 20181201 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-02-a +%global swiftgithash a8a8bdc +%global swiftgitdate 20181202 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.18.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.19.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Dec 03 2018 Ron Olson 5.0-0.19.20181202gita8a8bdc +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-02-a * Sun Dec 02 2018 Ron Olson 5.0-0.18.20181201gitb01ee72 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-01-a * Sat Dec 01 2018 Ron Olson 5.0-0.17.20181130gitd8f12cb -- cgit From 2949416332dd226e8e4510b9cae26a42e75c928d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 4 Dec 2018 09:26:13 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-12-03-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index c043e04..fac915e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-02-a -%global swiftgithash a8a8bdc -%global swiftgitdate 20181202 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-03-a +%global swiftgithash 3376f9f +%global swiftgitdate 20181203 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.19.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.20.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Tue Dec 04 2018 Ron Olson 5.0-0.20.20181203git3376f9f +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-03-a * Mon Dec 03 2018 Ron Olson 5.0-0.19.20181202gita8a8bdc - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-02-a * Sun Dec 02 2018 Ron Olson 5.0-0.18.20181201gitb01ee72 -- cgit From 83ed7fac09307c934f1273ef50efd6d8d6dcdb95 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 5 Dec 2018 09:23:11 -0600 Subject: Updated to DEVELOPMENT-SNAPSHOT-2018-12-04-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index fac915e..dc08869 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-03-a -%global swiftgithash 3376f9f -%global swiftgitdate 20181203 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-04-a +%global swiftgithash facaad1 +%global swiftgitdate 20181204 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.20.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.21.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -198,6 +198,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Dec 05 2018 Ron Olson 5.0-0.21.20181204gitfacaad1 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-04-a * Tue Dec 04 2018 Ron Olson 5.0-0.20.20181203git3376f9f - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-03-a * Mon Dec 03 2018 Ron Olson 5.0-0.19.20181202gita8a8bdc -- cgit From 469ca881d0af2965b3b0c6614e50ddadac29a176 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 5 Dec 2018 09:47:13 -0600 Subject: Added pull request from Egor Zhdan --- swift-lang.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/swift-lang.spec b/swift-lang.spec index e6acf86..469fc28 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -56,6 +56,8 @@ BuildRequires: ninja-build Requires: glibc-devel Requires: clang +Requires: ncurses-devel +Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} ExclusiveArch: x86_64 @@ -204,6 +206,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Dec 05 2018 Egor Zhdan +- Include dependencies to ncurser which are required by SourceKit and + included in Apple installation guide * Wed Oct 31 2018 Ron Olson 4.2.1-0.101.20181030git02a6ca9 - Updated to swift-4.2.1-RELEASE * Tue Oct 30 2018 Ron Olson 4.2-0.100.20181029gitf4134eb -- cgit From f1dfee1cd6b90fc1f117516e1be3c2eaa892865c Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 5 Dec 2018 12:55:45 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a --- swift-lang.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index c71c86a..f0a8b16 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-12-04-a -%global swiftgithash facaad1 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a +%global swiftgithash b74d54a %global swiftgitdate 20181204 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.21.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.22.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Dec 05 2018 Ron Olson 5.0-0.22.20181204gitb74d54a +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a * Wed Dec 05 2018 Egor Zhdan - Include dependencies to ncurser which are required by SourceKit and included in Apple installation guide -- cgit From ec301f78c30174f6656024174a28f80de5e516f1 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 7 Dec 2018 09:23:11 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-06-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index f0a8b16..4fc22f0 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a -%global swiftgithash b74d54a -%global swiftgitdate 20181204 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-06-a +%global swiftgithash 565e767 +%global swiftgitdate 20181206 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.22.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.23.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Dec 07 2018 Ron Olson 5.0-0.23.20181206git565e767 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-06-a * Wed Dec 05 2018 Ron Olson 5.0-0.22.20181204gitb74d54a - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a * Wed Dec 05 2018 Egor Zhdan -- cgit From e9ca1ca6f81868b1f5b8b34a4555108a7bedeb63 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 8 Dec 2018 09:16:35 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-07-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 4fc22f0..88a22f5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-06-a -%global swiftgithash 565e767 -%global swiftgitdate 20181206 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-07-a +%global swiftgithash 0a73e15 +%global swiftgitdate 20181207 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.23.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.24.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Dec 08 2018 Ron Olson 5.0-0.24.20181207git0a73e15 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-07-a * Fri Dec 07 2018 Ron Olson 5.0-0.23.20181206git565e767 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-06-a * Wed Dec 05 2018 Ron Olson 5.0-0.22.20181204gitb74d54a -- cgit From c8898525f92c5e9d005705b98796c027e4633bb9 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 9 Dec 2018 09:16:19 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-08-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 88a22f5..6a962a6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-07-a -%global swiftgithash 0a73e15 -%global swiftgitdate 20181207 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-08-a +%global swiftgithash 3945260 +%global swiftgitdate 20181208 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.24.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.25.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sun Dec 09 2018 Ron Olson 5.0-0.25.20181208git3945260 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-08-a * Sat Dec 08 2018 Ron Olson 5.0-0.24.20181207git0a73e15 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-07-a * Fri Dec 07 2018 Ron Olson 5.0-0.23.20181206git565e767 -- cgit From 0a444c686aff8e79aafd1505ce22b2211c958c4e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 10 Dec 2018 09:25:34 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-09-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 6a962a6..faf9d4b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-08-a -%global swiftgithash 3945260 -%global swiftgitdate 20181208 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-09-a +%global swiftgithash c14e1a3 +%global swiftgitdate 20181209 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.25.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.26.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Dec 10 2018 Ron Olson 5.0-0.26.20181209gitc14e1a3 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-09-a * Sun Dec 09 2018 Ron Olson 5.0-0.25.20181208git3945260 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-08-a * Sat Dec 08 2018 Ron Olson 5.0-0.24.20181207git0a73e15 -- cgit From 567e31876480835db004ed7e30fc5e4d010065ee Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 11 Dec 2018 09:20:08 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index faf9d4b..816310d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-09-a -%global swiftgithash c14e1a3 -%global swiftgitdate 20181209 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a +%global swiftgithash f83ec0c +%global swiftgitdate 20181210 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.26.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.27.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Tue Dec 11 2018 Ron Olson 5.0-0.27.20181210gitf83ec0c +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a * Mon Dec 10 2018 Ron Olson 5.0-0.26.20181209gitc14e1a3 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-09-a * Sun Dec 09 2018 Ron Olson 5.0-0.25.20181208git3945260 -- cgit From f153712f3bc35eda5f3b325536e5447d4230ec29 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 13 Dec 2018 13:57:04 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 816310d..7180ec2 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a -%global swiftgithash f83ec0c -%global swiftgitdate 20181210 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a +%global swiftgithash e231ae1 +%global swiftgitdate 20181212 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.27.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.28.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Dec 13 2018 Ron Olson 5.0-0.28.20181212gite231ae1 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a * Tue Dec 11 2018 Ron Olson 5.0-0.27.20181210gitf83ec0c - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a * Mon Dec 10 2018 Ron Olson 5.0-0.26.20181209gitc14e1a3 -- cgit From e68b7e4e858778a134f85ab90651b3d467ada641 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 14 Dec 2018 11:13:07 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-13-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 7180ec2..fb8abff 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a -%global swiftgithash e231ae1 -%global swiftgitdate 20181212 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-13-a +%global swiftgithash b490a2a +%global swiftgitdate 20181213 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.28.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.29.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Dec 14 2018 Ron Olson 5.0-0.29.20181213gitb490a2a +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-13-a * Thu Dec 13 2018 Ron Olson 5.0-0.28.20181212gite231ae1 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a * Tue Dec 11 2018 Ron Olson 5.0-0.27.20181210gitf83ec0c -- cgit From ebe4a22432063aaf3c2a4d4954f8de63177a984d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 15 Dec 2018 15:22:34 +0000 Subject: First version that builds on aarch64 --- aarch64-new-master-VarArgs.patch | 219 +++++++++++++++++++++++++++++++++++++++ swift-lang.spec | 32 ++++-- 2 files changed, 245 insertions(+), 6 deletions(-) create mode 100644 aarch64-new-master-VarArgs.patch diff --git a/aarch64-new-master-VarArgs.patch b/aarch64-new-master-VarArgs.patch new file mode 100644 index 0000000..c07cef0 --- /dev/null +++ b/aarch64-new-master-VarArgs.patch @@ -0,0 +1,219 @@ +diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp +index ff503bf..c601288 100644 +--- swift/lib/ClangImporter/ImportDecl.cpp ++++ swift/lib/ClangImporter/ImportDecl.cpp +@@ -322,8 +322,11 @@ getSwiftStdlibType(const clang::TypedefNameDecl *D, + break; + + case MappedCTypeKind::VaList: +- if (ClangTypeSize != ClangCtx.getTypeSize(ClangCtx.VoidPtrTy)) +- return std::make_pair(Type(), ""); ++ if (ClangTypeSize != ClangCtx.getTypeSize(ClangCtx.VoidPtrTy)) { ++ if (ClangCtx.getTargetInfo().getBuiltinVaListKind() != ++ clang::TargetInfo::AArch64ABIBuiltinVaList) ++ return std::make_pair(Type(), ""); ++ } + break; + + case MappedCTypeKind::ObjCBool: +diff --git a/stdlib/public/core/CTypes.swift b/stdlib/public/core/CTypes.swift +index b46fa89..bdbe228 100644 +--- swift/stdlib/public/core/CTypes.swift ++++ swift/stdlib/public/core/CTypes.swift +@@ -219,6 +219,29 @@ extension UInt { + } + + /// A wrapper around a C `va_list` pointer. ++#if arch(arm64) && os(Linux) ++@_fixed_layout ++public struct CVaListPointer { ++ @usableFromInline // unsafe-performance ++ internal var value: (__stack: UnsafeMutablePointer?, ++ __gr_top: UnsafeMutablePointer?, ++ __vr_top: UnsafeMutablePointer?, ++ __gr_off: Int32, ++ __vr_off: Int32) ++ ++ @inlinable // unsafe-performance ++ public // @testable ++ init(__stack: UnsafeMutablePointer?, ++ __gr_top: UnsafeMutablePointer?, ++ __vr_top: UnsafeMutablePointer?, ++ __gr_off: Int32, ++ __vr_off: Int32) { ++ value = (__stack, __gr_top, __vr_top, __gr_off, __vr_off) ++ } ++} ++ ++#else ++ + @_fixed_layout + public struct CVaListPointer { + @usableFromInline // unsafe-performance +@@ -238,6 +261,8 @@ extension CVaListPointer : CustomDebugStringConvertible { + } + } + ++#endif ++ + @inlinable + internal func _memcpy( + dest destination: UnsafeMutableRawPointer, +diff --git a/stdlib/public/core/VarArgs.swift b/stdlib/public/core/VarArgs.swift +index 5d42c58..859d987 100644 +--- swift/stdlib/public/core/VarArgs.swift ++++ swift/stdlib/public/core/VarArgs.swift +@@ -90,6 +90,23 @@ internal let _registerSaveWords = _countGPRegisters + _countFPRegisters * _fpReg + internal let _countGPRegisters = 16 + @usableFromInline + internal let _registerSaveWords = _countGPRegisters ++ ++#elseif arch(arm64) && os(Linux) ++// ARM Procedure Call Standard for aarch64. (IHI0055B) ++// The va_list type may refer to any parameter in a parameter list may be in one ++// of three memory locations depending on its type and position in the argument ++// list : ++// 1. GP register save area x0 - x7 ++// 2. 128-bit FP/SIMD register save area q0 - q7 ++// 3. Stack argument area ++@usableFromInline ++internal let _countGPRegisters = 8 ++@usableFromInline ++internal let _countFPRegisters = 8 ++@usableFromInline ++internal let _fpRegisterWords = 16 / MemoryLayout.size ++@usableFromInline ++internal let _registerSaveWords = _countGPRegisters + (_countFPRegisters * _fpRegisterWords) + #endif + + #if arch(s390x) +@@ -498,6 +515,129 @@ final internal class _VaListBuilder { + Builtin.addressof(&self.header))) + } + } ++#elseif arch(arm64) && os(Linux) ++ ++@_fixed_layout // FIXME(sil-serialize-all) ++@usableFromInline // FIXME(sil-serialize-all) ++final internal class __VaListBuilder { ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal init() { ++ // Prepare the register save area. ++ allocated = _registerSaveWords ++ storage = allocStorage(wordCount: allocated) ++ // Append stack arguments after register save area. ++ count = allocated ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ deinit { ++ if let allocatedStorage = storage { ++ deallocStorage(wordCount: allocated, storage: allocatedStorage) ++ } ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal func append(_ arg: CVarArg) { ++ var encoded = arg._cVarArgEncoding ++ ++ if arg is _CVarArgPassedAsDouble ++ && fpRegistersUsed < _countFPRegisters { ++ var startIndex = (fpRegistersUsed * _fpRegisterWords) ++ for w in encoded { ++ storage[startIndex] = w ++ startIndex += 1 ++ } ++ fpRegistersUsed += 1 ++ } else if encoded.count == 1 ++ && !(arg is _CVarArgPassedAsDouble) ++ && gpRegistersUsed < _countGPRegisters { ++ var startIndex = ( _fpRegisterWords * _countFPRegisters) + gpRegistersUsed ++ storage[startIndex] = encoded[0] ++ gpRegistersUsed += 1 ++ } else { ++ // Arguments in stack slot. ++ appendWords(encoded) ++ } ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal func va_list() -> CVaListPointer { ++ let vr_top = storage + (_fpRegisterWords * _countFPRegisters) ++ let gr_top = vr_top + _countGPRegisters ++ ++ return CVaListPointer(__stack: gr_top, __gr_top: gr_top, ++ __vr_top: vr_top, __gr_off: -64, __vr_off: -128) ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal func appendWords(_ words: [Int]) { ++ let newCount = count + words.count ++ if newCount > allocated { ++ let oldAllocated = allocated ++ let oldStorage = storage ++ let oldCount = count ++ ++ allocated = max(newCount, allocated * 2) ++ let newStorage = allocStorage(wordCount: allocated) ++ storage = newStorage ++ // Count is updated below. ++ if let allocatedOldStorage = oldStorage { ++ newStorage.moveInitialize(from: allocatedOldStorage, count: oldCount) ++ deallocStorage(wordCount: oldAllocated, storage: allocatedOldStorage) ++ } ++ } ++ ++ let allocatedStorage = storage! ++ for word in words { ++ allocatedStorage[count] = word ++ count += 1 ++ } ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal func rawSizeAndAlignment( ++ _ wordCount: Int ++ ) -> (Builtin.Word, Builtin.Word) { ++ return ((wordCount * MemoryLayout.stride)._builtinWordValue, ++ requiredAlignmentInBytes._builtinWordValue) ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal func allocStorage(wordCount: Int) -> UnsafeMutablePointer { ++ let (rawSize, rawAlignment) = rawSizeAndAlignment(wordCount) ++ let rawStorage = Builtin.allocRaw(rawSize, rawAlignment) ++ return UnsafeMutablePointer(rawStorage) ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal func deallocStorage( ++ wordCount: Int, storage: UnsafeMutablePointer ++ ) { ++ let (rawSize, rawAlignment) = rawSizeAndAlignment(wordCount) ++ Builtin.deallocRaw(storage._rawValue, rawSize, rawAlignment) ++ } ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal let requiredAlignmentInBytes = MemoryLayout.alignment ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal var count = 0 ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal var allocated = 0 ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal var storage: UnsafeMutablePointer! ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal var gpRegistersUsed = 0 ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal var fpRegistersUsed = 0 ++ ++ @usableFromInline // FIXME(sil-serialize-all) ++ internal var overflowWordsUsed = 0 ++} + + #else + diff --git a/swift-lang.spec b/swift-lang.spec index 816310d..d76887a 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a -%global swiftgithash f83ec0c -%global swiftgitdate 20181210 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a +%global swiftgithash e231ae1 +%global swiftgitdate 20181212 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.27.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.31.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -26,8 +26,9 @@ Source12: https://github.com/apple/swift-xcode-playground-support/archive/ Source13: swift-lang.conf Source14: swift-lang-runtime.conf -Patch0: change-lldb-location.patch +Patch0: change-lldb-location.patch Patch1: no-ninja-build.patch +Patch2: aarch64-new-master-VarArgs.patch BuildRequires: clang BuildRequires: cmake @@ -58,7 +59,7 @@ Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 aarch64 %description @@ -108,6 +109,11 @@ 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 %patch1 -p0 +# Specific patch for VarArg handling for Swift on ARM +%ifarch aarch64 +%patch2 -p0 +%endif + %build export VERBOSE=1 @@ -184,7 +190,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m /usr/lib/swift/os/ /usr/lib/swift/pm/ /usr/lib/swift/shims/ +%ifarch aarch64 +/usr/lib/swift/linux/aarch64/ +%else /usr/lib/swift/linux/x86_64/ +%endif /usr/lib/swift_static/ %{_libexecdir}/swift-lldb/ %{_sysconfdir}/ld.so.conf.d/swift-lang.conf @@ -200,6 +210,16 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Dec 15 2018 Ron Olson 5.0-0.31.20181212gite231ae1 +- First version that supports aarch64 +* Thu Dec 13 2018 Ron Olson 5.0-0.31.20181212gite231ae1 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a +* Thu Dec 13 2018 Ron Olson 5.0-0.30.20181212gite231ae1 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a +* Thu Dec 13 2018 Ron Olson 5.0-0.29.20181212gite231ae1 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-12-a +* Tue Dec 11 2018 Ron Olson 5.0-0.28.20181210gitf83ec0c +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a * Tue Dec 11 2018 Ron Olson 5.0-0.27.20181210gitf83ec0c - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-10-a * Mon Dec 10 2018 Ron Olson 5.0-0.26.20181209gitc14e1a3 -- cgit From f36d4a94960f3f7bb7399dbdcb44cc6efb1fe8d1 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 15 Dec 2018 11:02:47 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-14-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index fb8abff..c3b6091 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-13-a -%global swiftgithash b490a2a -%global swiftgitdate 20181213 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-14-a +%global swiftgithash ee39236 +%global swiftgitdate 20181214 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.29.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.30.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -200,6 +200,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Dec 15 2018 Ron Olson 5.0-0.30.20181214gitee39236 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-14-a * Fri Dec 14 2018 Ron Olson 5.0-0.29.20181213gitb490a2a - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-13-a * Thu Dec 13 2018 Ron Olson 5.0-0.28.20181212gite231ae1 -- cgit From 9a9febe253f270521861bdab898c1f6c70b5bd5f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 17 Dec 2018 11:15:11 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-16-a --- swift-lang.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 1287264..6038e18 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-14-a -%global swiftgithash ee39236 -%global swiftgitdate 20181214 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-16-a +%global swiftgithash 109112f +%global swiftgitdate 20181216 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.30.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.31.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -210,6 +210,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Dec 17 2018 Ron Olson 5.0-0.31.20181216git109112f +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-16-a * Sat Dec 15 2018 Ron Olson 5.0-0.31.20181212gite231ae1 - First version that supports aarch64 * Thu Dec 13 2018 Ron Olson 5.0-0.31.20181212gite231ae1 -- cgit From b892888408b23a34b370b54a50547815eb3ebc6a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 18 Dec 2018 11:14:52 -0600 Subject: Updated to 5.0-DEVELOPMENT-SNAPSHOT-2018-12-17-a --- swift-lang.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 6038e18..d34519d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-16-a +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2018-12-17-a %global swiftgithash 109112f -%global swiftgitdate 20181216 +%global swiftgitdate 20181217 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.31.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.32.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -210,6 +210,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Tue Dec 18 2018 Ron Olson 5.0-0.32.20181217git109112f +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-17-a * Mon Dec 17 2018 Ron Olson 5.0-0.31.20181216git109112f - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-16-a * Sat Dec 15 2018 Ron Olson 5.0-0.31.20181212gite231ae1 -- cgit