From d1974439b30c1864f6498acae0d74d158ace1b0e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 16 Nov 2018 14:34:39 -0600 Subject: First attempt at post 4.2.1 using what will be 5.0 sources --- change-lldb-location.patch | 20 +++++++++++++++ no-ninja-build.patch | 10 +++++--- reflection-template.patch | 18 -------------- swift-lang-4.2.1-change-lldb-location.patch | 23 ----------------- swift-lang.spec | 38 ++++++++++++----------------- 5 files changed, 42 insertions(+), 67 deletions(-) create mode 100644 change-lldb-location.patch delete mode 100644 reflection-template.patch delete mode 100644 swift-lang-4.2.1-change-lldb-location.patch diff --git a/change-lldb-location.patch b/change-lldb-location.patch new file mode 100644 index 0000000..3d324e7 --- /dev/null +++ b/change-lldb-location.patch @@ -0,0 +1,20 @@ +--- swift/lib/Driver/ToolChains.cpp.orig 2018-11-16 09:22:38.058780122 -0600 ++++ swift/lib/Driver/ToolChains.cpp 2018-11-16 09:31:08.699326699 -0600 +@@ -881,7 +881,7 @@ + useLLDB = true; + break; + case REPLJobAction::Mode::PreferLLDB: +- useLLDB = !findProgramRelativeToSwift("lldb").empty(); ++ useLLDB = true; + break; + } + +@@ -909,7 +909,7 @@ + ArgStringList Arguments; + Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg))); + +- return {"lldb", Arguments}; ++ return {"/usr/libexec/swift-lldb/lldb", Arguments}; + } + + ToolChain::InvocationInfo diff --git a/no-ninja-build.patch b/no-ninja-build.patch index e0a350f..a6bfdb9 100644 --- a/no-ninja-build.patch +++ b/no-ninja-build.patch @@ -1,7 +1,11 @@ ---- swift/utils/build-presets.orig 2018-06-12 12:33:42.690456898 -0500 -+++ swift/utils/build-presets.ini 2018-06-12 12:34:18.454458545 -0500 -@@ -717,7 +717,6 @@ +--- swift/utils/build-presets.ini.orig 2018-11-16 10:19:42.143559064 -0600 ++++ swift/utils/build-presets.ini 2018-11-16 10:20:13.638776829 -0600 +@@ -716,11 +716,9 @@ + llbuild + swiftpm xctest +-libicu + dash-dash -build-ninja diff --git a/reflection-template.patch b/reflection-template.patch deleted file mode 100644 index 22f3ec2..0000000 --- a/reflection-template.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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(__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-4.2.1-change-lldb-location.patch b/swift-lang-4.2.1-change-lldb-location.patch deleted file mode 100644 index 7a13cb1..0000000 --- a/swift-lang-4.2.1-change-lldb-location.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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: -- useLLDB = true; -- break; - case REPLJobAction::Mode::PreferLLDB: -- useLLDB = !findProgramRelativeToSwift("lldb").empty(); -+ useLLDB = true; - break; - } - -@@ -872,7 +870,7 @@ - ArgStringList Arguments; - Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg))); - -- return {"lldb", Arguments}; -+ return {"/usr/libexec/swift-lldb/lldb", Arguments}; - } - - diff --git a/swift-lang.spec b/swift-lang.spec index e6acf86..f86ef26 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2.1-RELEASE -%global swiftgithash 02a6ca9 -%global swiftgitdate 20181030 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-11-15-a +%global swiftgithash 739169d +%global swiftgitdate 20181115 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 4.2.1 -Release: 0.101.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.0 +Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -26,10 +26,8 @@ Source12: https://github.com/apple/swift-xcode-playground-support/archive/ Source13: swift-lang.conf 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 +Patch0: change-lldb-location.patch +Patch1: no-ninja-build.patch BuildRequires: clang BuildRequires: cmake @@ -105,16 +103,9 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # as the swift executable (i.e. /usr/bin). %patch0 -p0 -# sys/ustat.h was removed from glibc (per https://sourceware.org/git/?p=glibc.git;a=commit;h=cf2478d53ad7071e84c724a986b56fe17f4f4ca7) -# A patch has been submitted to resolve this upstream (https://github.com/apple/swift-compiler-rt/pull/20) but until -# it is merged this patch is necessary to build Swift on Fedora with the latest glibc. -%patch1 -p0 - # Since we require ninja for building, there's no sense to rebuild it just for Swift -%patch2 -p0 +%patch1 -p0 -# Template issue with clang 7.0 -%patch3 -p0 %build export VERBOSE=1 @@ -148,14 +139,13 @@ install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift # make up the Swift toolchain. Since we use subdirectories for the # libraries, no actual .so files are dumped in /usr/lib. mkdir -p %{buildroot}/usr/lib/swift-lldb -cp %{_builddir}/usr/lib/liblldb.so.6.0.0 %{buildroot}/usr/lib/swift-lldb -ln -fs liblldb.so.6.0.0 %{buildroot}/usr/lib/swift-lldb/liblldb.so.6 -ln -fs liblldb.so.6 %{buildroot}/usr/lib/swift-lldb/liblldb.so +cp %{_builddir}/usr/lib/liblldb.so.7.0.0 %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.7.0.0 %{buildroot}/usr/lib/swift-lldb/liblldb.so.7 +ln -fs liblldb.so.7 %{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.6.0.0 %{buildroot}/usr/lib/swift-lldb -ln -fs liblldbIntelFeatures.so.6.0.0 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so.6 -ln -fs liblldbIntelFeatures.so.6 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so +cp %{_builddir}/usr/lib/liblldbIntelFeatures.so.7 %{buildroot}/usr/lib/swift-lldb +ln -fs liblldbIntelFeatures.so.7 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift mkdir -p %{buildroot}/usr/lib/swift @@ -204,6 +194,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Nov 16 2018 Ron Olson 5.0-0.1.20181115git739169d +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-15-a * 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