From 164f37c713e3256113f1bfd3cdb22171480aeaa5 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 11 Jul 2018 11:04:08 -0500 Subject: [PATCH 001/152] Initial import (#1536780) --- .gitignore | 13 ++ README.md | 3 - compiler-rt-no-ustat.patch | 49 ++++ no-ninja-build.patch | 10 + sources | 13 ++ swift-lang-4.2-change-lldb-location.patch | 23 ++ swift-lang-runtime.conf | 1 + swift-lang.conf | 1 + swift-lang.spec | 268 ++++++++++++++++++++++ time-struct-redefined.patch | 10 + 10 files changed, 388 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 compiler-rt-no-ustat.patch create mode 100644 no-ninja-build.patch create mode 100644 sources create mode 100644 swift-lang-4.2-change-lldb-location.patch create mode 100644 swift-lang-runtime.conf create mode 100644 swift-lang.conf create mode 100644 swift-lang.spec create mode 100644 time-struct-redefined.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aaa9862 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +/clang.tar.gz +/cmark.tar.gz +/corelibs-foundation.tar.gz +/corelibs-libdispatch.tar.gz +/corelibs-xctest.tar.gz +/llbuild.tar.gz +/lldb.tar.gz +/llvm.tar.gz +/package-manager.tar.gz +/swift-compiler-rt.tar.gz +/swift-integration-tests.tar.gz +/swift-xcode-playground-support.tar.gz +/swift.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 482e0bb..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# swift-lang - -The swift-lang package \ No newline at end of file diff --git a/compiler-rt-no-ustat.patch b/compiler-rt-no-ustat.patch new file mode 100644 index 0000000..2499d66 --- /dev/null +++ b/compiler-rt-no-ustat.patch @@ -0,0 +1,49 @@ +--- compiler-rt-orig/lib/sanitizer_common/sanitizer_common_syscalls.inc 2018-05-21 10:41:12.089534263 -0500 ++++ compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc 2018-05-21 10:47:21.172510188 -0500 +@@ -923,16 +923,6 @@ + } + } + +-#if !SANITIZER_ANDROID +-PRE_SYSCALL(ustat)(long dev, void *ubuf) {} +- +-POST_SYSCALL(ustat)(long res, long dev, void *ubuf) { +- if (res >= 0) { +- if (ubuf) POST_WRITE(ubuf, struct_ustat_sz); +- } +-} +-#endif // !SANITIZER_ANDROID +- + PRE_SYSCALL(stat64)(const void *filename, void *statbuf) { + if (filename) + PRE_READ(filename, +diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +--- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-05-21 10:41:12.080534263 -0500 ++++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-05-21 10:45:29.503517472 -0500 +@@ -159,7 +159,6 @@ + # include + #endif + #include +-#include + #include + #include + #include +@@ -253,7 +252,6 @@ + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID +diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2018-05-21 10:41:12.081534263 -0500 ++++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2018-05-21 10:44:28.392521458 -0500 +@@ -197,7 +197,6 @@ + int v[10]; + }; + +- extern unsigned struct_ustat_sz; + extern unsigned struct_rlimit64_sz; + extern unsigned struct_statvfs64_sz; + diff --git a/no-ninja-build.patch b/no-ninja-build.patch new file mode 100644 index 0000000..e0a350f --- /dev/null +++ b/no-ninja-build.patch @@ -0,0 +1,10 @@ +--- 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 @@ + xctest + dash-dash + +-build-ninja + install-swift + install-lldb + install-llbuild diff --git a/sources b/sources new file mode 100644 index 0000000..9654ac3 --- /dev/null +++ b/sources @@ -0,0 +1,13 @@ +SHA512 (clang.tar.gz) = 8976b546dc6e8cd6815aee1bdbf3126e21624bdb97a231be528b5e959e151f20c4d62198ab1d18e0517f01850cbbad147943879df494692b08a14d8abf8b7e04 +SHA512 (cmark.tar.gz) = 64527b4297968d188e09a7e6d8108d430755e3f761250e5e30febe443da5d2d41c96ba521edfe4c846a6875c642cbb7696ca49fa9bba2077376c75cfab170cf2 +SHA512 (corelibs-foundation.tar.gz) = 793206df3fe6e7c0ef6b4eeea1a56fd14bf6cf0e86d527e5b284fa42ee68be0758127e43590409614873f0160af10e64a61218fce798e09e6599820b35c59a74 +SHA512 (corelibs-libdispatch.tar.gz) = ca1ebaadfb51ed8083d08e6df88ec132d4ccb39d7f73f756a3882b10448c939e0b93ff3f0c96d030ca3be8bb412ac306e7e051b2eb1085538eaba7522652360d +SHA512 (corelibs-xctest.tar.gz) = 7ac1bcd5011d5bd05e83feb4b544ea78d7aac972d55e812cc39d00f22af02b0b178a94a4992bbe14168141b0a3abf659e4f37f1a9ea4c11f5a1949895b9bbdcb +SHA512 (llbuild.tar.gz) = 00098d834269d18c761fed7690f5b45d0b6710a79a28bbf9f38157e2e037db161da932add24b9e34d88a2281597044a66b7bf29f79573820decb0e0686e3f7ca +SHA512 (lldb.tar.gz) = 3fa20dfc15ceec545f2b909c07175274a437100ef7edc698d675ccb128654e6f77a89e25ffd5be004af1c044c52529bc60f1e9a18a1030b523ca597680f51073 +SHA512 (llvm.tar.gz) = 4d4220a8203f4fa6ebe6e6152774df30cfaa1cb8eac2cf1ea6ee24828da93b33528ba8a06a37aff11dc5db707af1c42fcb975f3a046b5b542a03dc3c82424ce4 +SHA512 (package-manager.tar.gz) = 7c7edd7d19f50ff579ad7a6b515cbd0ce64dee7f006f6211702f4d37cc126f77f721b35dc4b5d282991cd72dc6e0f4f6cba4fcc80f5d66fd2abcb9fdf9d4ccf7 +SHA512 (swift-compiler-rt.tar.gz) = 212cbb82ce8266dca85285900bd97e1f79357af61528f4c2e4fe7c033b472e27b437d021146da199bc3580e01b866276360857f3f1d303d1128f3cc9dd38bf3d +SHA512 (swift-integration-tests.tar.gz) = 00423a146b9475932f4dbf7ab5086000453344a3053b1cb4605fa96de0843f790b4639083321fc6d2e8eec2bbb87a97823dbd4156e5fc8c02ee56c3c1a801355 +SHA512 (swift-xcode-playground-support.tar.gz) = fdc6c40b985737a9b35e8a5a6a13867332b7030a526ff3676c94bdd3171b5fbb73389ff956d1c625acb0c17af2969978767f9633fc3b1502ada75ad18e828762 +SHA512 (swift.tar.gz) = 1e555a06f5edce8783e85da12114135221b906319a95cb233c020c9d1794d7a8b79b20c85056cc758c57bd2f36fecda42234d7907091eb0b8cec7e6c9a8d0e73 diff --git a/swift-lang-4.2-change-lldb-location.patch b/swift-lang-4.2-change-lldb-location.patch new file mode 100644 index 0000000..7a13cb1 --- /dev/null +++ b/swift-lang-4.2-change-lldb-location.patch @@ -0,0 +1,23 @@ +--- 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-runtime.conf b/swift-lang-runtime.conf new file mode 100644 index 0000000..d19930a --- /dev/null +++ b/swift-lang-runtime.conf @@ -0,0 +1 @@ +/usr/lib/swift/linux diff --git a/swift-lang.conf b/swift-lang.conf new file mode 100644 index 0000000..ce1b5b2 --- /dev/null +++ b/swift-lang.conf @@ -0,0 +1 @@ +/usr/lib/swift-lldb diff --git a/swift-lang.spec b/swift-lang.spec new file mode 100644 index 0000000..edcea69 --- /dev/null +++ b/swift-lang.spec @@ -0,0 +1,268 @@ +%global debug_package %{nil} +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a +%global swiftgithash 1e2dc99 +%global swiftgitdate 20180705 +%global swiftbuild swift-source +%global __provides_exclude_from ^/usr/lib/swift-lldb/.*\\.so.* +Name: swift-lang +Version: 4.2 +Release: 0.29.%{swiftgitdate}git%{swiftgithash}%{?dist} +Summary: Apple's Swift programming language +License: ASL 2.0 +URL: https://swift.org +Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-compiler-rt/archive/swift-%{swifttag}.tar.gz#/swift-compiler-rt.tar.gz +Source2: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz +Source3: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz +Source4: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz +Source5: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz +Source6: https://github.com/apple/swift-clang/archive/swift-%{swifttag}.tar.gz#/clang.tar.gz +Source7: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz +Source8: https://github.com/apple/swift-lldb/archive/swift-%{swifttag}.tar.gz#/lldb.tar.gz +Source9: https://github.com/apple/swift-llvm/archive/swift-%{swifttag}.tar.gz#/llvm.tar.gz +Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz +Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz +Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz +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: time-struct-redefined.patch + + +BuildRequires: clang +BuildRequires: cmake +BuildRequires: swig +BuildRequires: pkgconfig +BuildRequires: perl-podlators +BuildRequires: rsync +BuildRequires: python2-devel +BuildRequires: libbsd-devel +BuildRequires: libxml2-devel +BuildRequires: libsqlite3x-devel +BuildRequires: libblocksruntime-static +BuildRequires: libatomic-static +BuildRequires: libcurl-devel +BuildRequires: libuuid-devel +BuildRequires: libedit-devel +BuildRequires: libicu-devel +BuildRequires: python2-sphinx +BuildRequires: ninja-build + +Requires: glibc-devel +Requires: clang +Requires: %{name}-runtime = %{version}-%{release} + +ExcludeArch: s390x i686 armv7hl ppc64le aarch64 ppc64 + + +%description +Swift is a general-purpose programming language built using +a modern approach to safety, performance, and software design +patterns. + +The goal of the Swift project is to create the best available +language for uses ranging from systems programming, to mobile +and desktop apps, scaling up to cloud services. Most +importantly, Swift is designed to make writing and maintaining +correct programs easier for the developer. + + +%package runtime +Summary: Runtime files for Swift + +%description runtime +Runtime libraries for Swift programs + + +%prep +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 + +# The Swift build script requires directories to be named +# in a specific way so renaming the source directories is +# necessary +mv swift-clang-swift-%{swifttag} clang +mv swift-cmark-swift-%{swifttag} cmark +mv swift-compiler-rt-swift-%{swifttag} compiler-rt +mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest +mv swift-integration-tests-swift-%{swifttag} swift-integration-tests +mv swift-llbuild-swift-%{swifttag} llbuild +mv swift-lldb-swift-%{swifttag} lldb +mv swift-llvm-swift-%{swifttag} llvm +mv swift-package-manager-swift-%{swifttag} swiftpm +mv swift-swift-%{swifttag} swift +mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support + +# This patch tells the Swift executable to look for its Swift-specific +# lldb executable in /usr/libexec/swift-lldb, not in the same directory +# 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 + +# Fixes an error in compiler-rt where the timespec struct is redefined +%patch3 -p0 + + +%build +export VERBOSE=1 +export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 +swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz + + +%install +export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 +mkdir -p %{buildroot}%{_libexecdir}/swift-lldb +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}/usr/lib +install -m 0755 %{_builddir}/usr/bin/swift %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-build %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-build-tool %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-demangle %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-package %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-run %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-test %{buildroot}%{_bindir} +ln -fs swift %{buildroot}/usr/bin/swift-autolink-extract +ln -fs swift %{buildroot}/usr/bin/swiftc +ln -fs swift %{buildroot}/usr/bin/swift-format + +install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb +install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb + +# Why /usr/lib instead of %{_libdir}? +# The Swift toolchain is *extermely* sensitive to locations of its files +# (for example, the need for the patch above in the prep section) and +# has "lib" hardcoded in many, many places throughout all the projects that +# 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/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 +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 + +mkdir -p %{buildroot}/usr/lib/swift_static +cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/usr/lib/swift_static + +mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ +install -m 0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang.conf +install -m 0644 %{SOURCE14} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf + +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1 + + +%files +%license swift/LICENSE.txt +%{_bindir}/swift* +%{_mandir}/man1/* +/usr/lib/swift-lldb/ +/usr/lib/swift/Block/ +/usr/lib/swift/CoreFoundation/ +/usr/lib/swift/clang/ +/usr/lib/swift/dispatch/ +/usr/lib/swift/migrator/ +/usr/lib/swift/os/ +/usr/lib/swift/pm/ +/usr/lib/swift/shims/ +/usr/lib/swift/linux/x86_64/ +/usr/lib/swift_static/ +%{_libexecdir}/swift-lldb/ +%{_sysconfdir}/ld.so.conf.d/swift-lang.conf + + +%files runtime +/usr/lib/swift/linux/ +%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + +%changelog +* Thu Jul 05 2018 Ron Olson 4.2-0.29.20180705git1e2dc99 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a +* Thu Jul 05 2018 Ron Olson 4.2-0.28.20180704gitf56a941 +- Removed explicit requirement on libatomic and libbsd, modifed files section + of the runtime package so it can own the directory +* Thu Jul 05 2018 Ron Olson 4.2-0.27.20180704gitf56a941 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-04-a +* Mon Jul 03 2018 Ron Olson 4.2-0.26.20180703git107e307 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a, added a + filter for excluding lldb libraries from public view, and broke out the + runtime libraries into their own -runtime package. +* Mon Jul 02 2018 Ron Olson 4.2-0.25.20180702gitc2e1567 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-02-a +* Mon Jul 02 2018 Ron Olson 4.2-0.24.20180701git6079032 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-01-a, removed unnecessary + lldb headers +* Sat Jun 30 2018 Ron Olson 4.2-0.23.20180630gitb3408e8 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-30-a +* Fri Jun 29 2018 Ron Olson 4.2-0.22.20180629gitdab0d8e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-29-a, removed unnecessary + files and links +* Fri Jun 29 2018 Ron Olson 4.2-0.21.20180628git9f8f2a1 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-28-a +* Thu Jun 28 2018 Ron Olson 4.2-0.20.20180626gitbe3b9a7 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-26-a +* Wed Jun 13 2018 Ron Olson 4.2-0.19.20180612gitbb9532c +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-12-a and removed + gcc-c++ as a build requirement +* Tue Jun 12 2018 Ron Olson 4.2-0.18.20180611gitd99cd32 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a and removed + separate ninja build (will now use the repo-based one) +* Mon Jun 11 2018 Ron Olson 4.2-0.17.20180610git7a35ad0 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a +* Fri Jun 08 2018 Ron Olson 4.2-0.16.20180607git78e9497 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-07-a +* Thu Jun 07 2018 Ron Olson 4.2-0.15.20180606git4e2064e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-06-a +* Tue Jun 05 2018 Ron Olson 4.2-0.14.20180604git9e274fc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a +* Sun Jun 03 2018 Ron Olson 4.2-0.13.20180602gitadad0f5 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-02-a +* Wed May 30 2018 Ron Olson 4.2-0.12.20180529git4160301 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-29-a +* Wed May 23 2018 Ron Olson 4.2-0.11.20180522git58f7399 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-22-a +* Mon May 21 2018 Ron Olson 4.2-0.10.20180520gitbb77484 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-20-a and added + patch for removing sys/ustat.h references +* Tue May 15 2018 Ron Olson 4.2-0.9.20180514gitf58f528 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-14-a +* Wed May 09 2018 Ron Olson 4.2-0.8.20180508git0e6d867 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-08-a +* Wed May 02 2018 Ron Olson 4.2-0.7.20180502gitb08fb12 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-02-a +* Mon Apr 23 2018 Ron Olson 4.2-0.6.20180422git5030d38 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-22-a +* Thu Apr 19 2018 Ron Olson 4.2-0.5.20180418gitac06163 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-18-a +* Mon Apr 16 2018 Ron Olson 4.2-0.4.20180415git22530b9 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-15-a +* Thu Apr 12 2018 Ron Olson 4.2-0.3.20180411git537a846 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-11-a +* Wed Feb 28 2018 Ron Olson 4.1-0.2.20180227git5f2f440 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-02-27-a +* Wed Feb 14 2018 Ron Olson 4.1-0.1.20180214git5a1a34b +- Initial package for Fedora diff --git a/time-struct-redefined.patch b/time-struct-redefined.patch new file mode 100644 index 0000000..7c34def --- /dev/null +++ b/time-struct-redefined.patch @@ -0,0 +1,10 @@ +--- ./compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc.orig 2018-06-13 13:38:58.569034787 -0500 ++++ ./compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc 2018-06-13 13:39:14.866033724 -0500 +@@ -30,6 +30,7 @@ + // fine with newer headers, too. + #include + #if defined(__x86_64__) || defined(__mips__) ++#define _STRUCT_TIMESPEC + #include + #else + #define ino_t __kernel_ino_t From bd097a5f1e382e6a29269f0bd03894ee96495ba3 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 11 Jul 2018 13:44:17 -0500 Subject: [PATCH 002/152] Updated to support changes to Rawhide regarding default Python version --- sources | 26 +++++++++++++------------- swift-lang.spec | 27 +++++++++++++++++---------- time-struct-redefined.patch | 10 ---------- 3 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 time-struct-redefined.patch diff --git a/sources b/sources index 9654ac3..98f652d 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 8976b546dc6e8cd6815aee1bdbf3126e21624bdb97a231be528b5e959e151f20c4d62198ab1d18e0517f01850cbbad147943879df494692b08a14d8abf8b7e04 -SHA512 (cmark.tar.gz) = 64527b4297968d188e09a7e6d8108d430755e3f761250e5e30febe443da5d2d41c96ba521edfe4c846a6875c642cbb7696ca49fa9bba2077376c75cfab170cf2 -SHA512 (corelibs-foundation.tar.gz) = 793206df3fe6e7c0ef6b4eeea1a56fd14bf6cf0e86d527e5b284fa42ee68be0758127e43590409614873f0160af10e64a61218fce798e09e6599820b35c59a74 -SHA512 (corelibs-libdispatch.tar.gz) = ca1ebaadfb51ed8083d08e6df88ec132d4ccb39d7f73f756a3882b10448c939e0b93ff3f0c96d030ca3be8bb412ac306e7e051b2eb1085538eaba7522652360d -SHA512 (corelibs-xctest.tar.gz) = 7ac1bcd5011d5bd05e83feb4b544ea78d7aac972d55e812cc39d00f22af02b0b178a94a4992bbe14168141b0a3abf659e4f37f1a9ea4c11f5a1949895b9bbdcb -SHA512 (llbuild.tar.gz) = 00098d834269d18c761fed7690f5b45d0b6710a79a28bbf9f38157e2e037db161da932add24b9e34d88a2281597044a66b7bf29f79573820decb0e0686e3f7ca -SHA512 (lldb.tar.gz) = 3fa20dfc15ceec545f2b909c07175274a437100ef7edc698d675ccb128654e6f77a89e25ffd5be004af1c044c52529bc60f1e9a18a1030b523ca597680f51073 -SHA512 (llvm.tar.gz) = 4d4220a8203f4fa6ebe6e6152774df30cfaa1cb8eac2cf1ea6ee24828da93b33528ba8a06a37aff11dc5db707af1c42fcb975f3a046b5b542a03dc3c82424ce4 -SHA512 (package-manager.tar.gz) = 7c7edd7d19f50ff579ad7a6b515cbd0ce64dee7f006f6211702f4d37cc126f77f721b35dc4b5d282991cd72dc6e0f4f6cba4fcc80f5d66fd2abcb9fdf9d4ccf7 -SHA512 (swift-compiler-rt.tar.gz) = 212cbb82ce8266dca85285900bd97e1f79357af61528f4c2e4fe7c033b472e27b437d021146da199bc3580e01b866276360857f3f1d303d1128f3cc9dd38bf3d -SHA512 (swift-integration-tests.tar.gz) = 00423a146b9475932f4dbf7ab5086000453344a3053b1cb4605fa96de0843f790b4639083321fc6d2e8eec2bbb87a97823dbd4156e5fc8c02ee56c3c1a801355 -SHA512 (swift-xcode-playground-support.tar.gz) = fdc6c40b985737a9b35e8a5a6a13867332b7030a526ff3676c94bdd3171b5fbb73389ff956d1c625acb0c17af2969978767f9633fc3b1502ada75ad18e828762 -SHA512 (swift.tar.gz) = 1e555a06f5edce8783e85da12114135221b906319a95cb233c020c9d1794d7a8b79b20c85056cc758c57bd2f36fecda42234d7907091eb0b8cec7e6c9a8d0e73 +SHA512 (clang.tar.gz) = 2c70dca091af18e03162a4e2e1e8f5cc931128bcb79a15fee0483e165ff3a83f59f41045298460744eb690f90fb0144a9d8930abee71119212189f6985082ace +SHA512 (cmark.tar.gz) = 81863b683b2bc549f9923d7aa03cde5817e5e458c4c482e4e1cdfcc4c091d3fa9b8f7b6748987f684a1418b6a254b3ecfe8fa02a977c0e6760978ec326f8af9d +SHA512 (corelibs-foundation.tar.gz) = 57ce59d2d05c766dafff10b993cf2bedbee0f352984ceaa7b80c33a9b2fcf6b2784a53b4ea5ea630231c87185ae5c2b7cb535fc6a0bad94d42a5a9f64cc33ee2 +SHA512 (corelibs-libdispatch.tar.gz) = 9e3bb7f2a31a54588f8dfa8d8640021f83b9c32abca1493ac68c7b485c41843e894b68cf41c2106c8b9281b304e97955848523974f47e868d7b997a7004fe051 +SHA512 (corelibs-xctest.tar.gz) = 86c64a0e16865e1d620aa5b538ccdb0b56203ac9a45e5703a9411aa140a87cce57621c9df554c12490458f875ce2fc36b103e7f9d044705f55f130db6eabfab8 +SHA512 (llbuild.tar.gz) = 3ed9e890b7a851ac188bcb5d1f821f0805a5baa9bee6ed8f3df881e1a5e2f40948695414705412dd31deeeb882c0b6f071fa0b1cc64890a128e46d55a6ddcf52 +SHA512 (lldb.tar.gz) = 8dccca4d4a114ab950ddd8f4787d04b431ef6c82fbeca6a6376b47924b3f2e83bdc6d35237d029cda197219a6d698b9ebeffa9a2a862656d310e4d30e201186c +SHA512 (llvm.tar.gz) = 5421f786756eed6aba4c0444ae0e3378292fe447daf8d7f42ce5fefc8e6d3956b01ac9dc710732400215736de91d5839721e59983ee6b078f1be2b22ab028dd8 +SHA512 (package-manager.tar.gz) = b0c46a9fbf736f43f56585d9cc62dd6f1bbaf6aeb1fa26cd5eaf915c772d2bdb4f9f57d637c0354984293fdf447d19e3a75075e8a09b870972f6f4b93bc5d185 +SHA512 (swift-compiler-rt.tar.gz) = 632df48236205a46ec9bdfbb1c1287b44c805f46b950bd5d2ad2118848841263d5eef51ea0f4fce0f9de635e9fe8e015c3fe898189e01d5bb7c411a3f20f8c73 +SHA512 (swift-integration-tests.tar.gz) = 6253e17ff57437980ca22c11bb44974dac9886060c4968a149d537abf15afae23a846f3c4a20464b667e8082f6958fdca2d118926142e377ea885fc09683c193 +SHA512 (swift-xcode-playground-support.tar.gz) = adf3758f65bfbca9f3e3344cf6c4190c2f74b42b700dee0982ca27f556b02b0dbf6a980084972a7300af6ad37fd19bad7d283d410cf536a11d846e8ac92bd2ad +SHA512 (swift.tar.gz) = 8dfbe068eb33bfa44cd2f60f21550ce6aac442c5c986a4267fda02a3ccc5df25944dd88eb459a30ff30cdcb1b1733dc001ff38f38be2fd92d99d06903765175d diff --git a/swift-lang.spec b/swift-lang.spec index edcea69..459a6a3 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a -%global swiftgithash 1e2dc99 -%global swiftgitdate 20180705 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-09-a +%global swiftgithash d9561d9 +%global swiftgitdate 20180709 %global swiftbuild swift-source %global __provides_exclude_from ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -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 @@ -29,7 +29,6 @@ Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch -Patch3: time-struct-redefined.patch BuildRequires: clang @@ -38,6 +37,10 @@ BuildRequires: swig BuildRequires: pkgconfig BuildRequires: perl-podlators BuildRequires: rsync +%if 0%{?fedora} > 28 +BuildRequires: python-unversioned-command +%endif +BuildRequires: python2 BuildRequires: python2-devel BuildRequires: libbsd-devel BuildRequires: libxml2-devel @@ -55,7 +58,7 @@ Requires: glibc-devel Requires: clang Requires: %{name}-runtime = %{version}-%{release} -ExcludeArch: s390x i686 armv7hl ppc64le aarch64 ppc64 +ExclusiveArch: x86_64 %description @@ -110,9 +113,6 @@ 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 -# Fixes an error in compiler-rt where the timespec struct is redefined -%patch3 -p0 - %build export VERBOSE=1 @@ -200,6 +200,13 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Jul 11 2018 Ron Olson 4.2-0.30.20180709gitd9561d9 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-09-a and added a check to + include python-unversioned-command for verisons greated than 28 while + working on making patches/pull requests upstream to be explicit about + which version of Python to use. Also removed patch for time struct issue + as the fix has been handled upstream. Also switched to ExclusiveArch + instead of ExcludeArch per suggestion from Dan Horák. * Thu Jul 05 2018 Ron Olson 4.2-0.29.20180705git1e2dc99 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a * Thu Jul 05 2018 Ron Olson 4.2-0.28.20180704gitf56a941 @@ -207,7 +214,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m of the runtime package so it can own the directory * Thu Jul 05 2018 Ron Olson 4.2-0.27.20180704gitf56a941 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-04-a -* Mon Jul 03 2018 Ron Olson 4.2-0.26.20180703git107e307 +* Tue Jul 03 2018 Ron Olson 4.2-0.26.20180703git107e307 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a, added a filter for excluding lldb libraries from public view, and broke out the runtime libraries into their own -runtime package. diff --git a/time-struct-redefined.patch b/time-struct-redefined.patch deleted file mode 100644 index 7c34def..0000000 --- a/time-struct-redefined.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc.orig 2018-06-13 13:38:58.569034787 -0500 -+++ ./compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc 2018-06-13 13:39:14.866033724 -0500 -@@ -30,6 +30,7 @@ - // fine with newer headers, too. - #include - #if defined(__x86_64__) || defined(__mips__) -+#define _STRUCT_TIMESPEC - #include - #else - #define ino_t __kernel_ino_t From ff9c3baac355d83f1ebadb0ab017c597b3656b81 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 12 Jul 2018 18:53:12 -0500 Subject: [PATCH 003/152] Reverted back to the 2018-07-03 build due to library import issues upstream after that date --- sources | 26 +++++++++++++------------- swift-lang.spec | 16 ++++++++++++---- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/sources b/sources index 98f652d..3874660 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 2c70dca091af18e03162a4e2e1e8f5cc931128bcb79a15fee0483e165ff3a83f59f41045298460744eb690f90fb0144a9d8930abee71119212189f6985082ace -SHA512 (cmark.tar.gz) = 81863b683b2bc549f9923d7aa03cde5817e5e458c4c482e4e1cdfcc4c091d3fa9b8f7b6748987f684a1418b6a254b3ecfe8fa02a977c0e6760978ec326f8af9d -SHA512 (corelibs-foundation.tar.gz) = 57ce59d2d05c766dafff10b993cf2bedbee0f352984ceaa7b80c33a9b2fcf6b2784a53b4ea5ea630231c87185ae5c2b7cb535fc6a0bad94d42a5a9f64cc33ee2 -SHA512 (corelibs-libdispatch.tar.gz) = 9e3bb7f2a31a54588f8dfa8d8640021f83b9c32abca1493ac68c7b485c41843e894b68cf41c2106c8b9281b304e97955848523974f47e868d7b997a7004fe051 -SHA512 (corelibs-xctest.tar.gz) = 86c64a0e16865e1d620aa5b538ccdb0b56203ac9a45e5703a9411aa140a87cce57621c9df554c12490458f875ce2fc36b103e7f9d044705f55f130db6eabfab8 -SHA512 (llbuild.tar.gz) = 3ed9e890b7a851ac188bcb5d1f821f0805a5baa9bee6ed8f3df881e1a5e2f40948695414705412dd31deeeb882c0b6f071fa0b1cc64890a128e46d55a6ddcf52 -SHA512 (lldb.tar.gz) = 8dccca4d4a114ab950ddd8f4787d04b431ef6c82fbeca6a6376b47924b3f2e83bdc6d35237d029cda197219a6d698b9ebeffa9a2a862656d310e4d30e201186c -SHA512 (llvm.tar.gz) = 5421f786756eed6aba4c0444ae0e3378292fe447daf8d7f42ce5fefc8e6d3956b01ac9dc710732400215736de91d5839721e59983ee6b078f1be2b22ab028dd8 -SHA512 (package-manager.tar.gz) = b0c46a9fbf736f43f56585d9cc62dd6f1bbaf6aeb1fa26cd5eaf915c772d2bdb4f9f57d637c0354984293fdf447d19e3a75075e8a09b870972f6f4b93bc5d185 -SHA512 (swift-compiler-rt.tar.gz) = 632df48236205a46ec9bdfbb1c1287b44c805f46b950bd5d2ad2118848841263d5eef51ea0f4fce0f9de635e9fe8e015c3fe898189e01d5bb7c411a3f20f8c73 -SHA512 (swift-integration-tests.tar.gz) = 6253e17ff57437980ca22c11bb44974dac9886060c4968a149d537abf15afae23a846f3c4a20464b667e8082f6958fdca2d118926142e377ea885fc09683c193 -SHA512 (swift-xcode-playground-support.tar.gz) = adf3758f65bfbca9f3e3344cf6c4190c2f74b42b700dee0982ca27f556b02b0dbf6a980084972a7300af6ad37fd19bad7d283d410cf536a11d846e8ac92bd2ad -SHA512 (swift.tar.gz) = 8dfbe068eb33bfa44cd2f60f21550ce6aac442c5c986a4267fda02a3ccc5df25944dd88eb459a30ff30cdcb1b1733dc001ff38f38be2fd92d99d06903765175d +SHA512 (clang.tar.gz) = b394da9863f7c16bff4a2dede415ca685e7571713f97a7a22e1090d717d8a5a4aa83b6550e542f78c89894c1d21808d4a6f5398aeb8235c220ee5c2c2e196a07 +SHA512 (cmark.tar.gz) = 838a68db53677fec31470b6a0a203b1befb4f24f8a6641c928a37bcb27018bc545fe15743064f25f6b7d6aa11e64b46f7359de2186615b4754bc24e3a3bf6635 +SHA512 (corelibs-foundation.tar.gz) = 769f7554eda3518e234549772564ac146b47b1aa68d6c05a0bb6c81adc3b27b2820acacc001ae629a6909b8e41b3b7790f6399da6d38bf12bb2367c5043ae0d0 +SHA512 (corelibs-libdispatch.tar.gz) = 3f1fdd65544b5ae8a6e132bf765155dcca584e873ae13474eff503f680216b0aeabd7a775161e5b50c82910418c52d4f89ca33ab886dfa40208e9dec94f41a4c +SHA512 (corelibs-xctest.tar.gz) = 315c7e40e1257257520a144ec6e6ee810895f3bddc4ce97ac510e8d85ef69ece1421cc44a0c1e4f256735c4467c52478a286b8e24050e4a26d508e94f277f168 +SHA512 (llbuild.tar.gz) = 202d2a782b2a9487d16f1ea6e6c5d4bdd54e7fe0b327283539ceb7650dca7cf56aa498ac84bef681a0b54d45d8e8b35fa9c78b39fab861ca80c3633f84ca8550 +SHA512 (lldb.tar.gz) = 94ae10518f1cf4ae02840229e58fbd39d8984bc8f3eed51e46389a4aa96d6f65c2efd358095909f928af55b88ae00eccac5a7a59d3039f372331bbdf37aebe71 +SHA512 (llvm.tar.gz) = 5fef96bf78545f22f09fddfd5d9ae4fa214af0504cad08af67b2892077a37ca31ef2843bfbfb553a2f099d9e0758100d0cf2a6dd648f825c50c8c69ae8d29e5f +SHA512 (package-manager.tar.gz) = c7de73a9d521469f27d295dc2f9ba458526cd200553691efd96a59c26c98afb01452a6b0342c39a1f56fab4e45f1669cd0ec8219aca0ef1b64d1409cad573a07 +SHA512 (swift-compiler-rt.tar.gz) = 23e7cf3c89f3df23d65370642dd745bd5fa9c4ed54769515482a40a71aa06b02552f1e4a5d654837deef08e9b68ceae79b0282e116e9feb3492875970aa2f6fc +SHA512 (swift-integration-tests.tar.gz) = 0f6d88223e8f499add2b07ecc170aa7eb176c1d99653826aec5e7747e69df28285fadb2fb1a9eb01b824af5b1a7d505f6d11f727c5db3ff3ddea1d43942dcd7f +SHA512 (swift-xcode-playground-support.tar.gz) = 18253ebd2c2953f2678971e5d267bb107b09ff8e63aa0d8450ef1afa3dccef27e99edf43cb46b856bfdaeb678602aa4c183e1b366debc49ceb5adec2269995ca +SHA512 (swift.tar.gz) = 743f0ba5e5143157e16edd28328cc8c968d0d6d2945aa04aa4be45c5deba55561aafa10e745fdf11e8a651ea731b604d253e2fa5ed98cf182c0a1a99426c2a7f diff --git a/swift-lang.spec b/swift-lang.spec index 459a6a3..820e46c 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-09-a -%global swiftgithash d9561d9 -%global swiftgitdate 20180709 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a +%global swiftgithash 107e307 +%global swiftgitdate 20180703 %global swiftbuild swift-source %global __provides_exclude_from ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.30.%{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 @@ -175,6 +175,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %license swift/LICENSE.txt %{_bindir}/swift* %{_mandir}/man1/* +/usr/lib/swift/ /usr/lib/swift-lldb/ /usr/lib/swift/Block/ /usr/lib/swift/CoreFoundation/ @@ -191,6 +192,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %files runtime +/usr/lib/swift/ /usr/lib/swift/linux/ %{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf @@ -200,6 +202,12 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Jul 12 2018 Ron Olson 4.2-0.32.20180703git107e307 +- Reverted to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a as loading modules + in the REPL seems to have been broken as of the 2018-07-04 builds. + 2018-07-03 is currently the best version until the issue is resolved. +* Thu Jul 12 2018 Ron Olson 4.2-0.31.20180711git104c96a +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-11-a * Wed Jul 11 2018 Ron Olson 4.2-0.30.20180709gitd9561d9 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-09-a and added a check to include python-unversioned-command for verisons greated than 28 while From 5690e3821e7f9e07c44ef320d7b4fc46a11081c7 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 17 Jul 2018 15:43:12 -0500 Subject: [PATCH 004/152] Updated to 2018-07-16 source of Swift --- sources | 26 +++++++++++++------------- swift-lang.spec | 17 +++++++++++------ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/sources b/sources index 3874660..fc93e50 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = b394da9863f7c16bff4a2dede415ca685e7571713f97a7a22e1090d717d8a5a4aa83b6550e542f78c89894c1d21808d4a6f5398aeb8235c220ee5c2c2e196a07 -SHA512 (cmark.tar.gz) = 838a68db53677fec31470b6a0a203b1befb4f24f8a6641c928a37bcb27018bc545fe15743064f25f6b7d6aa11e64b46f7359de2186615b4754bc24e3a3bf6635 -SHA512 (corelibs-foundation.tar.gz) = 769f7554eda3518e234549772564ac146b47b1aa68d6c05a0bb6c81adc3b27b2820acacc001ae629a6909b8e41b3b7790f6399da6d38bf12bb2367c5043ae0d0 -SHA512 (corelibs-libdispatch.tar.gz) = 3f1fdd65544b5ae8a6e132bf765155dcca584e873ae13474eff503f680216b0aeabd7a775161e5b50c82910418c52d4f89ca33ab886dfa40208e9dec94f41a4c -SHA512 (corelibs-xctest.tar.gz) = 315c7e40e1257257520a144ec6e6ee810895f3bddc4ce97ac510e8d85ef69ece1421cc44a0c1e4f256735c4467c52478a286b8e24050e4a26d508e94f277f168 -SHA512 (llbuild.tar.gz) = 202d2a782b2a9487d16f1ea6e6c5d4bdd54e7fe0b327283539ceb7650dca7cf56aa498ac84bef681a0b54d45d8e8b35fa9c78b39fab861ca80c3633f84ca8550 -SHA512 (lldb.tar.gz) = 94ae10518f1cf4ae02840229e58fbd39d8984bc8f3eed51e46389a4aa96d6f65c2efd358095909f928af55b88ae00eccac5a7a59d3039f372331bbdf37aebe71 -SHA512 (llvm.tar.gz) = 5fef96bf78545f22f09fddfd5d9ae4fa214af0504cad08af67b2892077a37ca31ef2843bfbfb553a2f099d9e0758100d0cf2a6dd648f825c50c8c69ae8d29e5f -SHA512 (package-manager.tar.gz) = c7de73a9d521469f27d295dc2f9ba458526cd200553691efd96a59c26c98afb01452a6b0342c39a1f56fab4e45f1669cd0ec8219aca0ef1b64d1409cad573a07 -SHA512 (swift-compiler-rt.tar.gz) = 23e7cf3c89f3df23d65370642dd745bd5fa9c4ed54769515482a40a71aa06b02552f1e4a5d654837deef08e9b68ceae79b0282e116e9feb3492875970aa2f6fc -SHA512 (swift-integration-tests.tar.gz) = 0f6d88223e8f499add2b07ecc170aa7eb176c1d99653826aec5e7747e69df28285fadb2fb1a9eb01b824af5b1a7d505f6d11f727c5db3ff3ddea1d43942dcd7f -SHA512 (swift-xcode-playground-support.tar.gz) = 18253ebd2c2953f2678971e5d267bb107b09ff8e63aa0d8450ef1afa3dccef27e99edf43cb46b856bfdaeb678602aa4c183e1b366debc49ceb5adec2269995ca -SHA512 (swift.tar.gz) = 743f0ba5e5143157e16edd28328cc8c968d0d6d2945aa04aa4be45c5deba55561aafa10e745fdf11e8a651ea731b604d253e2fa5ed98cf182c0a1a99426c2a7f +SHA512 (clang.tar.gz) = b402093382992e0fb7743e6a05a391b79163fc012d80df856d8be07380f88fb14e0072c88a7a97de3a56ab16ee2461c52225c073b7bd812a8051e6c6a97a72da +SHA512 (cmark.tar.gz) = 6eea2a8d71a045040049a076065546336b8f32fcc44d4601ecc76f6e0e1f70278e1888f9572df2887ba6ee80047b0a9ada9421188bd0e208a69d4fe90e2c5886 +SHA512 (corelibs-foundation.tar.gz) = 338901f3fb172b20aac4988b6bb5f6521bc5458c130e8b7cff86969eecdb00a703140bd9b162835a3b28168c04bda6e611c546502b75cc1355043218f00c5121 +SHA512 (corelibs-libdispatch.tar.gz) = cc464bde2a2d23ca5d3ca86bf3be30cbaf69c6801323bf9f2eeccd72b8f2f64ee1151d3161b2db1faa05e84ed099afb2a418affca01afcf16b42541384ffc820 +SHA512 (corelibs-xctest.tar.gz) = 4b284939d7417f365ba8c76ebadf1d5d9b988c28681dd0605e6a8c0eea6ae69d42ad9c10ca156da99186ac1e5f2087b2b6e3a95c07b5596918aafbe7eaf48f91 +SHA512 (llbuild.tar.gz) = 218c831ceacddfc2ce23ae82e5878a46f133039d9f8cfa4fa52a29d2b0e0ea3876842307b98947187f40674962b1bc9b4b40161c1045cddb72242afb81005f38 +SHA512 (lldb.tar.gz) = 5b577f4a54646df76fc2c36d573d35173c79b9de0167b65dd233f4b6233f682604ed261f39ab21aa83a24be15c774ba11fcd9f344d0c2fee2a255baa623eb171 +SHA512 (llvm.tar.gz) = e957ef15edce03518305699902934d553fdaa407e2adf37ed0926409755fa02ebaa6160aae13a54cea5c5c6d61c08a2a9c22e6fdceaccc01b4adca3c3e17379a +SHA512 (package-manager.tar.gz) = fb74709f84e1c18c291c67f87a75065c572984f402502974e002871bcb50fa5a0ca381b9860bb4e5b81a531f80963702c630cca5c97e5eca043163e188fa15db +SHA512 (swift-compiler-rt.tar.gz) = 30fbfdfc23340746b614fd3fd00ba581fb391327abb1fa3e3936b2428ec2c0d69826608bb7b56402c01c48d8e987af6d8e5a0a326f69134e7f1f2735d34f9d65 +SHA512 (swift-integration-tests.tar.gz) = 481b7fbf0365720d57dc4db403724762094a47aa1251c936f993d8f3b491716309680282b6e5dccc7a15af0cefdef62764603c2c9af73f0db1679d20fc403866 +SHA512 (swift-xcode-playground-support.tar.gz) = f7fdd5bdcab11f2c9cb51ab1c7ffea52125605f7593b49d1dbb4486b36f944daf21bd48f168d5ff3291cf333afc0a5576c4449a4ffa8f5c4da1730a4256a98f5 +SHA512 (swift.tar.gz) = a65b2ea300ffa1d084f444aa8c86ac93d1e2fc1d786f656aa9fbc5f373c9cad62e678fe1932712d3109760c85ea7fe9d741f70c67f93d7781f9255a918b8505d diff --git a/swift-lang.spec b/swift-lang.spec index 820e46c..1cb9adb 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a -%global swiftgithash 107e307 -%global swiftgitdate 20180703 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-16-a +%global swiftgithash aaf545a +%global swiftgitdate 20180716 %global swiftbuild swift-source -%global __provides_exclude_from ^/usr/lib/swift-lldb/.*\\.so.* +%global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.32.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.34.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -202,9 +202,14 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Tue Jul 17 2018 Ron Olson 4.2-0.34.20180716gitaaf545a +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-16-a +* Sun Jul 15 2018 Ron Olson 4.2-0.33.20180703git107e307 +- Switched from __provides_exclude_from to __provides_exclude to inhibit + lldb being included as a dependency * Thu Jul 12 2018 Ron Olson 4.2-0.32.20180703git107e307 - Reverted to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a as loading modules - in the REPL seems to have been broken as of the 2018-07-04 builds. + in the REPL seems to have been broken as of the 2018-07-04 builds. 2018-07-03 is currently the best version until the issue is resolved. * Thu Jul 12 2018 Ron Olson 4.2-0.31.20180711git104c96a - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-11-a From 3aded7078779c71f10c27d22b8fd3a1c84f9b59c Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 22 Jul 2018 09:03:33 -0500 Subject: [PATCH 005/152] Updated to 2018-07-20 build with patches to handle relative path handling issues that were introduced after the 2018-07-03 build --- lldb-paths-1.patch | 14 ++++++++++++++ lldb-paths-2.patch | 11 +++++++++++ sources | 26 +++++++++++++------------- swift-lang.spec | 23 ++++++++++++++++++----- 4 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 lldb-paths-1.patch create mode 100644 lldb-paths-2.patch diff --git a/lldb-paths-1.patch b/lldb-paths-1.patch new file mode 100644 index 0000000..e19dd76 --- /dev/null +++ b/lldb-paths-1.patch @@ -0,0 +1,14 @@ +--- lldb/source/Symbol/SwiftASTContext.cpp.orig 2018-07-21 08:27:02.154653886 -0500 ++++ lldb/source/Symbol/SwiftASTContext.cpp 2018-07-21 08:28:42.573828204 -0500 +@@ -3413,9 +3413,8 @@ + GetLibrarySearchPaths(std::vector &paths, + const swift::SearchPathOptions &search_path_opts) { + paths.clear(); +- paths.resize(search_path_opts.LibrarySearchPaths.size() + 1); +- std::copy(search_path_opts.LibrarySearchPaths.begin(), +- search_path_opts.LibrarySearchPaths.end(), paths.begin()); ++ paths.assign(search_path_opts.LibrarySearchPaths.begin(), ++ search_path_opts.LibrarySearchPaths.end()); + paths.push_back(search_path_opts.RuntimeLibraryPath); + } + diff --git a/lldb-paths-2.patch b/lldb-paths-2.patch new file mode 100644 index 0000000..2a59da5 --- /dev/null +++ b/lldb-paths-2.patch @@ -0,0 +1,11 @@ +--- lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp.orig 2018-07-21 08:25:15.280211230 -0500 ++++ lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp 2018-07-21 08:26:11.440545754 -0500 +@@ -1164,6 +1164,8 @@ + size_t buffer_size = 0; + std::string path_array; + for (auto path : *paths) { ++ if (path.empty()) ++ continue; + size_t path_size = path.size(); + path_array.append(path); + path_array.push_back('\0'); diff --git a/sources b/sources index fc93e50..36c3a0c 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = b402093382992e0fb7743e6a05a391b79163fc012d80df856d8be07380f88fb14e0072c88a7a97de3a56ab16ee2461c52225c073b7bd812a8051e6c6a97a72da -SHA512 (cmark.tar.gz) = 6eea2a8d71a045040049a076065546336b8f32fcc44d4601ecc76f6e0e1f70278e1888f9572df2887ba6ee80047b0a9ada9421188bd0e208a69d4fe90e2c5886 -SHA512 (corelibs-foundation.tar.gz) = 338901f3fb172b20aac4988b6bb5f6521bc5458c130e8b7cff86969eecdb00a703140bd9b162835a3b28168c04bda6e611c546502b75cc1355043218f00c5121 -SHA512 (corelibs-libdispatch.tar.gz) = cc464bde2a2d23ca5d3ca86bf3be30cbaf69c6801323bf9f2eeccd72b8f2f64ee1151d3161b2db1faa05e84ed099afb2a418affca01afcf16b42541384ffc820 -SHA512 (corelibs-xctest.tar.gz) = 4b284939d7417f365ba8c76ebadf1d5d9b988c28681dd0605e6a8c0eea6ae69d42ad9c10ca156da99186ac1e5f2087b2b6e3a95c07b5596918aafbe7eaf48f91 -SHA512 (llbuild.tar.gz) = 218c831ceacddfc2ce23ae82e5878a46f133039d9f8cfa4fa52a29d2b0e0ea3876842307b98947187f40674962b1bc9b4b40161c1045cddb72242afb81005f38 -SHA512 (lldb.tar.gz) = 5b577f4a54646df76fc2c36d573d35173c79b9de0167b65dd233f4b6233f682604ed261f39ab21aa83a24be15c774ba11fcd9f344d0c2fee2a255baa623eb171 -SHA512 (llvm.tar.gz) = e957ef15edce03518305699902934d553fdaa407e2adf37ed0926409755fa02ebaa6160aae13a54cea5c5c6d61c08a2a9c22e6fdceaccc01b4adca3c3e17379a -SHA512 (package-manager.tar.gz) = fb74709f84e1c18c291c67f87a75065c572984f402502974e002871bcb50fa5a0ca381b9860bb4e5b81a531f80963702c630cca5c97e5eca043163e188fa15db -SHA512 (swift-compiler-rt.tar.gz) = 30fbfdfc23340746b614fd3fd00ba581fb391327abb1fa3e3936b2428ec2c0d69826608bb7b56402c01c48d8e987af6d8e5a0a326f69134e7f1f2735d34f9d65 -SHA512 (swift-integration-tests.tar.gz) = 481b7fbf0365720d57dc4db403724762094a47aa1251c936f993d8f3b491716309680282b6e5dccc7a15af0cefdef62764603c2c9af73f0db1679d20fc403866 -SHA512 (swift-xcode-playground-support.tar.gz) = f7fdd5bdcab11f2c9cb51ab1c7ffea52125605f7593b49d1dbb4486b36f944daf21bd48f168d5ff3291cf333afc0a5576c4449a4ffa8f5c4da1730a4256a98f5 -SHA512 (swift.tar.gz) = a65b2ea300ffa1d084f444aa8c86ac93d1e2fc1d786f656aa9fbc5f373c9cad62e678fe1932712d3109760c85ea7fe9d741f70c67f93d7781f9255a918b8505d +SHA512 (clang.tar.gz) = faba6861b2d43d9b3e433c3fa09947d2adc4259b892bf63d8d0ce5e8c13a5fea93916d67d278e2d490a4fc3ef233e97b8f4c368b36666aaa95f6fbac64f57aca +SHA512 (cmark.tar.gz) = 1aaa41b5a20bde8804fa8563b4ca64b1a5a8d6402bc5ed6899043eb1d408e5523a0a570cf9f0ce1d5452c3a983b66c583b5b3870a66b62854dd25264d804de7b +SHA512 (corelibs-foundation.tar.gz) = c3534eaaa7e0d82c6b169af1707427443266624b352e4bd9236d578e4428bffd41f5c5b243b308437e622280f4729053647e0da38f7bc3a4f998c86b9962b3e0 +SHA512 (corelibs-libdispatch.tar.gz) = d8cc0562b72de33a9bd4e159561e85e45b5821b903e4659cb7442a285eee2b5f6e4404bb60084abbb63d7b4a4839c22b25d85eab9fc43a2560ae228698550f5d +SHA512 (corelibs-xctest.tar.gz) = d0b6f3ced7e12c63f92df2d9271b50da84dfc281539ce273610a135476686b229c2a2c6e39fe335438a220d3a91394a3bc175e14c975a3e57713de935ad7eac9 +SHA512 (llbuild.tar.gz) = 5e493f1ee8112c2c4ceada8b0f069248dd791097440263f512a554ff87d004d9dfd51c4a19ff6ca581a40094d8a1cef0b6897e2058f3930bea76fdf250594d39 +SHA512 (lldb.tar.gz) = f47e984ebe4bcf079fc1f223506f1baa62182e7956484ff36e5e0712dd8e011ee64f5c696d490e6d4dd3493446b283faa12c5db903e7359a50d2bc6c4f4870b1 +SHA512 (llvm.tar.gz) = 91176bef739fbed1ed58b8d899dd88b4ec53b21f8eac22da918c2ff6542c12de526ca73dd35bfa5abbc36fac69d28fe64572817215614a5a990d3782a3c35b1d +SHA512 (package-manager.tar.gz) = 4378627851f5cb304425be6cd8171c8463eca0e999e501703565efdb66d2bd7e6b3ac25115a78d3faa73c1cb57ed8c09a1aa479f3154ca2d7d8656d2530ab1d6 +SHA512 (swift-compiler-rt.tar.gz) = a83730df02e3c754240206162ca188fa1812272a784a01618a88edbe8f8432633fe6291a54ae111c178f1fff3eb542282df423c79531ddcf6f701a7e85c84de7 +SHA512 (swift-integration-tests.tar.gz) = 1c2e372658fc41f05ddc3ee43bef50238de15cbc5520c0874e83f3b66479a805ea69799687cea1fb0b9482499e5fcf9515f9d07f5acb1615aafacb6aedb4e666 +SHA512 (swift-xcode-playground-support.tar.gz) = 2b47e5f8e4c73b5bcb2675cd4e319664733b7d55944878bf016370bed8b599e80a603d2e101b4bc815cbd124f03b0ab154193f48431639ad18ad7e4972779a27 +SHA512 (swift.tar.gz) = 60685c40d55c1a101f9056d38521142c936a65ea9582aad35168b2d72b858bea23192a242545c66ee20ebadf5d9aaa539cb27d13257af00df2ecbf84934a91e6 diff --git a/swift-lang.spec b/swift-lang.spec index 1cb9adb..899773d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-16-a -%global swiftgithash aaf545a -%global swiftgitdate 20180716 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-20-a +%global swiftgithash 18650bc +%global swiftgitdate 20180720 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.34.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.37.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -29,7 +29,8 @@ Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch - +Patch3: lldb-paths-1.patch +Patch4: lldb-paths-2.patch BuildRequires: clang BuildRequires: cmake @@ -113,6 +114,9 @@ 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 +# Per https://forums.swift.org/t/swift-force-load-swiftglibc-error-since-2018-07-03-build/14418 +%patch3 -p0 +%patch4 -p0 %build export VERBOSE=1 @@ -202,6 +206,15 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc +- Added patches for lldb to fix relative path issue (see URL by patches) until + it's merged into the 4.2 branch +* Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-20-a +* Fri Jul 20 2018 Ron Olson 4.2-0.36.20180719git9277281 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-19-a +* Thu Jul 19 2018 Ron Olson 4.2-0.35.20180718gite325e32 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-18-a * Tue Jul 17 2018 Ron Olson 4.2-0.34.20180716gitaaf545a - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-16-a * Sun Jul 15 2018 Ron Olson 4.2-0.33.20180703git107e307 From 90de563b713b08bade41a0357042e61688620e51 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 1 Aug 2018 13:43:47 -0500 Subject: [PATCH 006/152] Updated to 4.2-DEVELOPMENT-SNAPSHOT-2018-07-31-a snapshot. Removed lldb-path patches as they are no longer necessary as the code was merged upstream. --- lldb-paths-1.patch | 14 -------------- lldb-paths-2.patch | 11 ----------- sources | 26 +++++++++++++------------- swift-lang.spec | 30 +++++++++++++++++++++--------- 4 files changed, 34 insertions(+), 47 deletions(-) delete mode 100644 lldb-paths-1.patch delete mode 100644 lldb-paths-2.patch diff --git a/lldb-paths-1.patch b/lldb-paths-1.patch deleted file mode 100644 index e19dd76..0000000 --- a/lldb-paths-1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lldb/source/Symbol/SwiftASTContext.cpp.orig 2018-07-21 08:27:02.154653886 -0500 -+++ lldb/source/Symbol/SwiftASTContext.cpp 2018-07-21 08:28:42.573828204 -0500 -@@ -3413,9 +3413,8 @@ - GetLibrarySearchPaths(std::vector &paths, - const swift::SearchPathOptions &search_path_opts) { - paths.clear(); -- paths.resize(search_path_opts.LibrarySearchPaths.size() + 1); -- std::copy(search_path_opts.LibrarySearchPaths.begin(), -- search_path_opts.LibrarySearchPaths.end(), paths.begin()); -+ paths.assign(search_path_opts.LibrarySearchPaths.begin(), -+ search_path_opts.LibrarySearchPaths.end()); - paths.push_back(search_path_opts.RuntimeLibraryPath); - } - diff --git a/lldb-paths-2.patch b/lldb-paths-2.patch deleted file mode 100644 index 2a59da5..0000000 --- a/lldb-paths-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp.orig 2018-07-21 08:25:15.280211230 -0500 -+++ lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp 2018-07-21 08:26:11.440545754 -0500 -@@ -1164,6 +1164,8 @@ - size_t buffer_size = 0; - std::string path_array; - for (auto path : *paths) { -+ if (path.empty()) -+ continue; - size_t path_size = path.size(); - path_array.append(path); - path_array.push_back('\0'); diff --git a/sources b/sources index 36c3a0c..9fa81ef 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = faba6861b2d43d9b3e433c3fa09947d2adc4259b892bf63d8d0ce5e8c13a5fea93916d67d278e2d490a4fc3ef233e97b8f4c368b36666aaa95f6fbac64f57aca -SHA512 (cmark.tar.gz) = 1aaa41b5a20bde8804fa8563b4ca64b1a5a8d6402bc5ed6899043eb1d408e5523a0a570cf9f0ce1d5452c3a983b66c583b5b3870a66b62854dd25264d804de7b -SHA512 (corelibs-foundation.tar.gz) = c3534eaaa7e0d82c6b169af1707427443266624b352e4bd9236d578e4428bffd41f5c5b243b308437e622280f4729053647e0da38f7bc3a4f998c86b9962b3e0 -SHA512 (corelibs-libdispatch.tar.gz) = d8cc0562b72de33a9bd4e159561e85e45b5821b903e4659cb7442a285eee2b5f6e4404bb60084abbb63d7b4a4839c22b25d85eab9fc43a2560ae228698550f5d -SHA512 (corelibs-xctest.tar.gz) = d0b6f3ced7e12c63f92df2d9271b50da84dfc281539ce273610a135476686b229c2a2c6e39fe335438a220d3a91394a3bc175e14c975a3e57713de935ad7eac9 -SHA512 (llbuild.tar.gz) = 5e493f1ee8112c2c4ceada8b0f069248dd791097440263f512a554ff87d004d9dfd51c4a19ff6ca581a40094d8a1cef0b6897e2058f3930bea76fdf250594d39 -SHA512 (lldb.tar.gz) = f47e984ebe4bcf079fc1f223506f1baa62182e7956484ff36e5e0712dd8e011ee64f5c696d490e6d4dd3493446b283faa12c5db903e7359a50d2bc6c4f4870b1 -SHA512 (llvm.tar.gz) = 91176bef739fbed1ed58b8d899dd88b4ec53b21f8eac22da918c2ff6542c12de526ca73dd35bfa5abbc36fac69d28fe64572817215614a5a990d3782a3c35b1d -SHA512 (package-manager.tar.gz) = 4378627851f5cb304425be6cd8171c8463eca0e999e501703565efdb66d2bd7e6b3ac25115a78d3faa73c1cb57ed8c09a1aa479f3154ca2d7d8656d2530ab1d6 -SHA512 (swift-compiler-rt.tar.gz) = a83730df02e3c754240206162ca188fa1812272a784a01618a88edbe8f8432633fe6291a54ae111c178f1fff3eb542282df423c79531ddcf6f701a7e85c84de7 -SHA512 (swift-integration-tests.tar.gz) = 1c2e372658fc41f05ddc3ee43bef50238de15cbc5520c0874e83f3b66479a805ea69799687cea1fb0b9482499e5fcf9515f9d07f5acb1615aafacb6aedb4e666 -SHA512 (swift-xcode-playground-support.tar.gz) = 2b47e5f8e4c73b5bcb2675cd4e319664733b7d55944878bf016370bed8b599e80a603d2e101b4bc815cbd124f03b0ab154193f48431639ad18ad7e4972779a27 -SHA512 (swift.tar.gz) = 60685c40d55c1a101f9056d38521142c936a65ea9582aad35168b2d72b858bea23192a242545c66ee20ebadf5d9aaa539cb27d13257af00df2ecbf84934a91e6 +SHA512 (clang.tar.gz) = 2016997f3483b74a0e09cc50eb21d448c08c0e392312945e57748bdcbd707be0d3dc8bd78e39208ce0b890635ab7c2dc3d4cd61d9ebc0b6a1d9ef9752bdceaf5 +SHA512 (cmark.tar.gz) = c2540d3c646c05408f8ee09f8104c7538e7c472f77d7b8a948ea3c408d16c1552530cb676a08591bd2b475c9764eae2ad104e9ee78644989f9533fc863760a3f +SHA512 (corelibs-foundation.tar.gz) = b66d3056c2ac808c99e892deebf7b25b22552d2dbddfb4ca90c3867d82e23ef933ec00ac079f7b6de610848c7b1a5c4b3973e145ea8955187043865739fe81fc +SHA512 (corelibs-libdispatch.tar.gz) = 04c0b2442fe5f41b2f0dd8e0e7f87af58e08a4aa779b034083ddd3ab897d9083091f2f93a43399c7944d64856a9a39f5f8b2f7a10c5cd829af2c28a5d1e7d591 +SHA512 (corelibs-xctest.tar.gz) = c707586b2b67a382bad332e5c79b3e52bc028d046382123ed64b86ead2f024b7f2caf30e80680a1224fa2c4a7262f46d57d63928f785311feb3c8eba48c5ba42 +SHA512 (llbuild.tar.gz) = e3ac650377e6ca1563c0b214c9585d53b62446a106f0c2a74ff993e2d1a8ac93a3515dfd2795a7f92a11fbaec9c06e970ada1cd24885d38ece336c987d88720e +SHA512 (lldb.tar.gz) = 0441ed0bcabeafbef3979f44f4bd00fde415bd276dc03b1e688ce3859c0f449cc445d310afa72eb7cc50315d5b3d75ee7ff7af08a67c2d9985512d477be7242e +SHA512 (llvm.tar.gz) = 8ae3ff47da9733cf1e7f6d642b71bf7f5dd416e15fae17626deed3a18d2330d0c7e957be7156aabc91e53262e274944d3bc9b808543263196b6631a4958a9e8e +SHA512 (package-manager.tar.gz) = c8578e4ccf065e0dc0ff893b6fa75317a16b004997039f1ec3974f5217a21551155dd7517c9e67482e882ac282ef8d4d358345396e850401f6378792711071b9 +SHA512 (swift-compiler-rt.tar.gz) = 7d673b36d306f71c99875858db0e6fdf9172de70e74006086bb1c2e8fe88ca63962185fcaa51304a22000357d2852f8fb2dbe435885803bef2fc3e0d6e4cd230 +SHA512 (swift-integration-tests.tar.gz) = 45b2becc1a070af9607d147c092bf8d5713952f99b58c7291e37c72f02667e446589fdada8e101277feabd49d6e2f3a45571e2dfedb73ba900535f9a6cc943de +SHA512 (swift-xcode-playground-support.tar.gz) = 7177175a27528031e3ea465e877102f1a9366f0676435285882c5bb2f8f2fc57fa8eaf888f862136524e49fa30c3ac7418fbf67e556a2ab57198a098dbd49191 +SHA512 (swift.tar.gz) = e8e0e01e39263637ed0b243a7026a8326fb34650e86eb37b0ebcbb54f3fad5d93674b4fbaae5f178e00ce29b986d6f6668986dbef6ec82bda0e2d9fc8fd64508 diff --git a/swift-lang.spec b/swift-lang.spec index 899773d..941c888 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-20-a -%global swiftgithash 18650bc -%global swiftgitdate 20180720 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-31-a +%global swiftgithash 00acd41 +%global swiftgitdate 20180731 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.37.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.45.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -29,8 +29,6 @@ Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch -Patch3: lldb-paths-1.patch -Patch4: lldb-paths-2.patch BuildRequires: clang BuildRequires: cmake @@ -114,9 +112,6 @@ 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 -# Per https://forums.swift.org/t/swift-force-load-swiftglibc-error-since-2018-07-03-build/14418 -%patch3 -p0 -%patch4 -p0 %build export VERBOSE=1 @@ -206,6 +201,23 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Aug 01 2018 Ron Olson 4.2-0.45.20180731git00acd41 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-31-a +* Tue Jul 31 2018 Ron Olson 4.2-0.44.20180730gitfe1f442 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-30-a +* Sun Jul 29 2018 Ron Olson 4.2-0.43.20180728gitfe1f442 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-28-a +* Sat Jul 28 2018 Ron Olson 4.2-0.42.20180727git9d01b59 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-27-a +* Wed Jul 25 2018 Ron Olson 4.2-0.41.20180724git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a and removed + lldb patches as they were merged upstream into the 4.2 branch +* Tue Jul 24 2018 Ron Olson 4.2-0.40.20180723git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-23-a +* Mon Jul 23 2018 Ron Olson 4.2-0.39.20180722git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-22-a +* Sun Jul 22 2018 Ron Olson 4.2-0.38.20180721git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-21-a * Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc - Added patches for lldb to fix relative path issue (see URL by patches) until it's merged into the 4.2 branch From bef96337ab2de879e6e84a5d7780f5a58ba3050e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 9 Aug 2018 13:33:24 -0500 Subject: [PATCH 007/152] Removed old patches --- lldb-paths-1.patch | 14 -------------- lldb-paths-2.patch | 11 ----------- swift-lang.spec | 42 +++++++++++++++++++++++++++++++++--------- 3 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 lldb-paths-1.patch delete mode 100644 lldb-paths-2.patch diff --git a/lldb-paths-1.patch b/lldb-paths-1.patch deleted file mode 100644 index e19dd76..0000000 --- a/lldb-paths-1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lldb/source/Symbol/SwiftASTContext.cpp.orig 2018-07-21 08:27:02.154653886 -0500 -+++ lldb/source/Symbol/SwiftASTContext.cpp 2018-07-21 08:28:42.573828204 -0500 -@@ -3413,9 +3413,8 @@ - GetLibrarySearchPaths(std::vector &paths, - const swift::SearchPathOptions &search_path_opts) { - paths.clear(); -- paths.resize(search_path_opts.LibrarySearchPaths.size() + 1); -- std::copy(search_path_opts.LibrarySearchPaths.begin(), -- search_path_opts.LibrarySearchPaths.end(), paths.begin()); -+ paths.assign(search_path_opts.LibrarySearchPaths.begin(), -+ search_path_opts.LibrarySearchPaths.end()); - paths.push_back(search_path_opts.RuntimeLibraryPath); - } - diff --git a/lldb-paths-2.patch b/lldb-paths-2.patch deleted file mode 100644 index 2a59da5..0000000 --- a/lldb-paths-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp.orig 2018-07-21 08:25:15.280211230 -0500 -+++ lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp 2018-07-21 08:26:11.440545754 -0500 -@@ -1164,6 +1164,8 @@ - size_t buffer_size = 0; - std::string path_array; - for (auto path : *paths) { -+ if (path.empty()) -+ continue; - size_t path_size = path.size(); - path_array.append(path); - path_array.push_back('\0'); diff --git a/swift-lang.spec b/swift-lang.spec index 899773d..f78c1eb 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-20-a -%global swiftgithash 18650bc -%global swiftgitdate 20180720 +%global swifttag 4.2-CONVERGENCE +%global swiftgithash 1c8f885 +%global swiftgitdate 20180808 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.37.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.51.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -29,8 +29,6 @@ Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch -Patch3: lldb-paths-1.patch -Patch4: lldb-paths-2.patch BuildRequires: clang BuildRequires: cmake @@ -114,9 +112,6 @@ 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 -# Per https://forums.swift.org/t/swift-force-load-swiftglibc-error-since-2018-07-03-build/14418 -%patch3 -p0 -%patch4 -p0 %build export VERBOSE=1 @@ -206,6 +201,35 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Aug 09 2018 Ron Olson 4.2-0.51.20180808git1c8f885 +- Updated to swift-4.2-CONVERGENCE +* Wed Aug 08 2018 Ron Olson 4.2-0.50.20180807gitab5ce2e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-07-a +* Tue Aug 07 2018 Ron Olson 4.2-0.49.20180806gitab5ce2e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-06-a +* Sat Aug 04 2018 Ron Olson 4.2-0.48.20180803git68f32fc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-03-a +* Fri Aug 03 2018 Ron Olson 4.2-0.47.20180802git44a88d4 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-02-a +* Thu Aug 02 2018 Ron Olson 4.2-0.46.20180801git3f7d681 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-01-a +* Wed Aug 01 2018 Ron Olson 4.2-0.45.20180731git00acd41 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-31-a +* Tue Jul 31 2018 Ron Olson 4.2-0.44.20180730gitfe1f442 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-30-a +* Sun Jul 29 2018 Ron Olson 4.2-0.43.20180728gitfe1f442 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-28-a +* Sat Jul 28 2018 Ron Olson 4.2-0.42.20180727git9d01b59 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-27-a +* Wed Jul 25 2018 Ron Olson 4.2-0.41.20180724git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a and removed + lldb patches as they were merged upstream into the 4.2 branch +* Tue Jul 24 2018 Ron Olson 4.2-0.40.20180723git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-23-a +* Mon Jul 23 2018 Ron Olson 4.2-0.39.20180722git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-22-a +* Sun Jul 22 2018 Ron Olson 4.2-0.38.20180721git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-21-a * Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc - Added patches for lldb to fix relative path issue (see URL by patches) until it's merged into the 4.2 branch From 2b753c4f6ef83a882cb2a9ef704213dc7e423b2f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 9 Aug 2018 13:35:24 -0500 Subject: [PATCH 008/152] Updated to swift-4.2-CONVERGENCE build --- sources | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sources b/sources index 36c3a0c..c8e7544 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = faba6861b2d43d9b3e433c3fa09947d2adc4259b892bf63d8d0ce5e8c13a5fea93916d67d278e2d490a4fc3ef233e97b8f4c368b36666aaa95f6fbac64f57aca -SHA512 (cmark.tar.gz) = 1aaa41b5a20bde8804fa8563b4ca64b1a5a8d6402bc5ed6899043eb1d408e5523a0a570cf9f0ce1d5452c3a983b66c583b5b3870a66b62854dd25264d804de7b -SHA512 (corelibs-foundation.tar.gz) = c3534eaaa7e0d82c6b169af1707427443266624b352e4bd9236d578e4428bffd41f5c5b243b308437e622280f4729053647e0da38f7bc3a4f998c86b9962b3e0 -SHA512 (corelibs-libdispatch.tar.gz) = d8cc0562b72de33a9bd4e159561e85e45b5821b903e4659cb7442a285eee2b5f6e4404bb60084abbb63d7b4a4839c22b25d85eab9fc43a2560ae228698550f5d -SHA512 (corelibs-xctest.tar.gz) = d0b6f3ced7e12c63f92df2d9271b50da84dfc281539ce273610a135476686b229c2a2c6e39fe335438a220d3a91394a3bc175e14c975a3e57713de935ad7eac9 -SHA512 (llbuild.tar.gz) = 5e493f1ee8112c2c4ceada8b0f069248dd791097440263f512a554ff87d004d9dfd51c4a19ff6ca581a40094d8a1cef0b6897e2058f3930bea76fdf250594d39 -SHA512 (lldb.tar.gz) = f47e984ebe4bcf079fc1f223506f1baa62182e7956484ff36e5e0712dd8e011ee64f5c696d490e6d4dd3493446b283faa12c5db903e7359a50d2bc6c4f4870b1 -SHA512 (llvm.tar.gz) = 91176bef739fbed1ed58b8d899dd88b4ec53b21f8eac22da918c2ff6542c12de526ca73dd35bfa5abbc36fac69d28fe64572817215614a5a990d3782a3c35b1d -SHA512 (package-manager.tar.gz) = 4378627851f5cb304425be6cd8171c8463eca0e999e501703565efdb66d2bd7e6b3ac25115a78d3faa73c1cb57ed8c09a1aa479f3154ca2d7d8656d2530ab1d6 -SHA512 (swift-compiler-rt.tar.gz) = a83730df02e3c754240206162ca188fa1812272a784a01618a88edbe8f8432633fe6291a54ae111c178f1fff3eb542282df423c79531ddcf6f701a7e85c84de7 -SHA512 (swift-integration-tests.tar.gz) = 1c2e372658fc41f05ddc3ee43bef50238de15cbc5520c0874e83f3b66479a805ea69799687cea1fb0b9482499e5fcf9515f9d07f5acb1615aafacb6aedb4e666 -SHA512 (swift-xcode-playground-support.tar.gz) = 2b47e5f8e4c73b5bcb2675cd4e319664733b7d55944878bf016370bed8b599e80a603d2e101b4bc815cbd124f03b0ab154193f48431639ad18ad7e4972779a27 -SHA512 (swift.tar.gz) = 60685c40d55c1a101f9056d38521142c936a65ea9582aad35168b2d72b858bea23192a242545c66ee20ebadf5d9aaa539cb27d13257af00df2ecbf84934a91e6 +SHA512 (clang.tar.gz) = 157f72b67fc332cf049d03cc69f413b926630600adbb35f8b665f6f33634503b678a05c05a2a0d2e45170cd06054cdcfff19984ec8a5cb650e212bb0514a5dba +SHA512 (cmark.tar.gz) = 834e1d7553ffdd5e5d491173b6bc7abc6f5bd8a40b19ffe1e8b5ed2690f1ebfeb4e8f8832fd79ed91a0cef2c73c10f4b2bb41779d19523db078d7d020efe876f +SHA512 (corelibs-foundation.tar.gz) = 072f0100eaffcec48f8e57cce81533c079c1c021a57baff88f5ab8d00e45afe5e6a17a589151ea79ea5ccc5a27b46e5a93d20c356fe951920153a448faf07f6a +SHA512 (corelibs-libdispatch.tar.gz) = b62c37023d17dc11d55667c04e37f91d7175687cb068b07befa89d2c72e807b9cd0410acdca73f3c694a0ceb0317c5cfd26c83dee76086db6475736fa767e65c +SHA512 (corelibs-xctest.tar.gz) = 10a59d6e379ee2fd424e89b2027182a86f7f93fc2f8c79ece0ed1f15a7dcf7f5a8df1bda442410b1134a7d256e6439c47bcbb85a2188e79c71981ccc21a8e19b +SHA512 (llbuild.tar.gz) = d907e13bd26964e37c4966a45f156c268459a1fc32cf88d4978a45928a2e70d0b780d1502ac93ebab0f0fa33c7269f481a01473fb323312f516e71b86174a982 +SHA512 (lldb.tar.gz) = d67ebbd5e5997937039ad22deb6adeb04b9241a7fa1415edd1d0dcb0aa68c133511fc0c73a9cae952c1d7c22b408f2556cdc079760a5becc10ac26f4d47b6531 +SHA512 (llvm.tar.gz) = 812a8d59c9890a242f714b8078addcd356b7c3901941e819a781ac4308665683e1aec76a1cecec0e61d33c9380c58be2297b720207ca41f8d361498c194f6cf9 +SHA512 (package-manager.tar.gz) = d60cc47a5a80a7d7f096b4f82b96c9808596f01bbbfc7f7ba8157199365cfd0bdf19bf69dd7012f701e00b91fdfbbc3471b6511e3e3bb074945bd46a91df066c +SHA512 (swift-compiler-rt.tar.gz) = c02068bd8a1b60ba177e193dda812ee626bbd0d523625946c6607c282129fad4f3bfab8f467b9a583bbe257a65b31370aa7dd2dbdb729ef7d2c3af54fe0f522d +SHA512 (swift-integration-tests.tar.gz) = a61e4986f00d9f6a40970dc270d10ad81623f5f64a8fde5eb7a9d1e5b6520c886325396b419cfe23185852ecf90812f4f8b94edeb07d560a51690b28ba08014d +SHA512 (swift-xcode-playground-support.tar.gz) = 8574779be2905ba8fb6e6ac6c39a2a10ebe0bae1b1e69837846aa6e2e5dbf70c073d693d63a7e39c7889ff19aa8f773a87295740823460b835cdb2d4e090e6b8 +SHA512 (swift.tar.gz) = e197eafed35207c5dc9bb19332a43fecd4c6c4d7b75b6e5f5c826ac23d0a3197d14de8b63150eeb1ebe6970d46923cb91b73fd3058f6dbd556908b40b14d6572 From 4237734f517ebb5069fbcf4be919590e554c7eac Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 13 Sep 2018 15:53:55 -0500 Subject: [PATCH 009/152] Updated to swift-4.2-RELEASE --- reflection-template.patch | 18 +++++++++++++ sources | 26 +++++++++---------- swift-lang.spec | 53 +++++++++++++++++++++++++++++++++------ 3 files changed, 76 insertions(+), 21 deletions(-) create mode 100644 reflection-template.patch 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(__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/sources b/sources index c8e7544..3e5205c 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 157f72b67fc332cf049d03cc69f413b926630600adbb35f8b665f6f33634503b678a05c05a2a0d2e45170cd06054cdcfff19984ec8a5cb650e212bb0514a5dba -SHA512 (cmark.tar.gz) = 834e1d7553ffdd5e5d491173b6bc7abc6f5bd8a40b19ffe1e8b5ed2690f1ebfeb4e8f8832fd79ed91a0cef2c73c10f4b2bb41779d19523db078d7d020efe876f -SHA512 (corelibs-foundation.tar.gz) = 072f0100eaffcec48f8e57cce81533c079c1c021a57baff88f5ab8d00e45afe5e6a17a589151ea79ea5ccc5a27b46e5a93d20c356fe951920153a448faf07f6a -SHA512 (corelibs-libdispatch.tar.gz) = b62c37023d17dc11d55667c04e37f91d7175687cb068b07befa89d2c72e807b9cd0410acdca73f3c694a0ceb0317c5cfd26c83dee76086db6475736fa767e65c -SHA512 (corelibs-xctest.tar.gz) = 10a59d6e379ee2fd424e89b2027182a86f7f93fc2f8c79ece0ed1f15a7dcf7f5a8df1bda442410b1134a7d256e6439c47bcbb85a2188e79c71981ccc21a8e19b -SHA512 (llbuild.tar.gz) = d907e13bd26964e37c4966a45f156c268459a1fc32cf88d4978a45928a2e70d0b780d1502ac93ebab0f0fa33c7269f481a01473fb323312f516e71b86174a982 -SHA512 (lldb.tar.gz) = d67ebbd5e5997937039ad22deb6adeb04b9241a7fa1415edd1d0dcb0aa68c133511fc0c73a9cae952c1d7c22b408f2556cdc079760a5becc10ac26f4d47b6531 -SHA512 (llvm.tar.gz) = 812a8d59c9890a242f714b8078addcd356b7c3901941e819a781ac4308665683e1aec76a1cecec0e61d33c9380c58be2297b720207ca41f8d361498c194f6cf9 -SHA512 (package-manager.tar.gz) = d60cc47a5a80a7d7f096b4f82b96c9808596f01bbbfc7f7ba8157199365cfd0bdf19bf69dd7012f701e00b91fdfbbc3471b6511e3e3bb074945bd46a91df066c -SHA512 (swift-compiler-rt.tar.gz) = c02068bd8a1b60ba177e193dda812ee626bbd0d523625946c6607c282129fad4f3bfab8f467b9a583bbe257a65b31370aa7dd2dbdb729ef7d2c3af54fe0f522d -SHA512 (swift-integration-tests.tar.gz) = a61e4986f00d9f6a40970dc270d10ad81623f5f64a8fde5eb7a9d1e5b6520c886325396b419cfe23185852ecf90812f4f8b94edeb07d560a51690b28ba08014d -SHA512 (swift-xcode-playground-support.tar.gz) = 8574779be2905ba8fb6e6ac6c39a2a10ebe0bae1b1e69837846aa6e2e5dbf70c073d693d63a7e39c7889ff19aa8f773a87295740823460b835cdb2d4e090e6b8 -SHA512 (swift.tar.gz) = e197eafed35207c5dc9bb19332a43fecd4c6c4d7b75b6e5f5c826ac23d0a3197d14de8b63150eeb1ebe6970d46923cb91b73fd3058f6dbd556908b40b14d6572 +SHA512 (clang.tar.gz) = 90877da1a76a54a3377c728c14fe260187e354df0084737512ad4d7444c19b36f9978ff9fad3104331590dba5daf8cde84d283b44187073db1e1af2d90ec27f1 +SHA512 (cmark.tar.gz) = 029f8a221f3234e601405c56259950cb8ac629863492d085bacade0cf2486c450f0b7ca256ca44ccd64345859d57e64d94a31fcf2d71dfc78027cf9e7521980e +SHA512 (corelibs-foundation.tar.gz) = 1e31f6c4c8a9fdf2ce899195b150623890c075323dab726b80d00dc93c8b9fa67884a10399cd950d5814711a818ba851989d3bdddd5040e2f375affc766fdf3e +SHA512 (corelibs-libdispatch.tar.gz) = ad885afc5e84185cf23f85994e97e01ab2365d178562b1f161537f0b55b85f6cc60d75973b69d6fed467f2c0158c625f05a79597f9ce44119ef7c19e6105b079 +SHA512 (corelibs-xctest.tar.gz) = 7c5b4d7b54b39e8a3a98852737070a10e91dd9738ffb4f64213ada6ae047f9117e47d7df1fe6792124dd64c0ad1e5d419c071361cada6d1c8899b9c38bf838cb +SHA512 (llbuild.tar.gz) = e447ee54ace855f6a10f1ca17b46d9b02d89c608126d41dbe1805393f4fefd1e8670e095c03f97adac50411b8361d577ec5a3cc9144808b8f5370dffd8953a4c +SHA512 (lldb.tar.gz) = 46f7e6324e8ab04accc8f3e2a86453d76265c9649da2fbdc16bf2abd3f3f8e807e86e124449741de05639ecef8864fc8468c517e0b36136f8fbf1d2b6f93c13b +SHA512 (llvm.tar.gz) = 66794e5c2e7cc1d0f80b807792c40570eecffea0a2a55040fd6877926e926b9cd7ab0dedc010a011fba8cc010c905caec4b216a6b16e584f20b6fafadf75145f +SHA512 (package-manager.tar.gz) = 39bf747ed879b79ea179c891ba6b342f5d6e25eaac42d0089e5ef338ff1ea4216df38f7a6a854fe616cc767ca40ea8a4cfc2339338f998bf030a53aa0b467839 +SHA512 (swift-compiler-rt.tar.gz) = dfde667d46d2e7b0fa486e588adba12145af626deca3e7156fd94297876d51d8eb6b8c1e1c676c2a887db220b8284a26452d597190ab773f8cacd3fc1f71fa91 +SHA512 (swift-integration-tests.tar.gz) = 3220f0ea617359355bb2b965315a61660534d6e725972c0116226cdc7ffb0b090fd4fa54e1b70756db76c4f27c5c6b2c0c3d1becb058e3419cdc62e231c67426 +SHA512 (swift-xcode-playground-support.tar.gz) = 438859bc3d6e15ed52d29bb3c71484babe313c62608ba330d85cd648633a46bcbc57ef721dcc59e6a6c050decc3ea51cf1d547837096ff45ba3e9af36a25bc2f +SHA512 (swift.tar.gz) = 90660be6bd8fc0b81a012f7662c8a92f7c2416c80dbedd697bcb6457d1769670fdf63acd153842f08ada74218677fc46e7e07e415029b973b7810a1995fb9c1d diff --git a/swift-lang.spec b/swift-lang.spec index 3da165f..ee305a9 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-CONVERGENCE -%global swiftgithash 1c8f885 -%global swiftgitdate 20180808 +%global swifttag 4.2-RELEASE +%global swiftgithash 2c6399a +%global swiftgitdate 20180912 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* -Name: swift-lang +Name: swift-lang Version: 4.2 -Release: 0.51.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.68.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -24,11 +24,12 @@ Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag} Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz Source13: swift-lang.conf -Source14: swift-lang-runtime.conf +Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch -Patch1: compiler-rt-no-ustat.patch -Patch2: no-ninja-build.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,40 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Sep 13 2018 Ron Olson 4.2-0.68.20180912git2c6399a +- Updated to swift-4.2-RELEASE +* Wed Sep 12 2018 Ron Olson 4.2-0.67.20180911gitbe88499 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-11-a +* Sun Sep 09 2018 Ron Olson 4.2-0.66.20180908gitbe88499 +- Added patch for clang 7.0 +* Sun Sep 09 2018 Ron Olson 4.2-0.65.20180908gitbe88499 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-08-a +* Sat Sep 08 2018 Ron Olson 4.2-0.64.20180907gitc922f68 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-07-a +* Sun Aug 26 2018 Ron Olson 4.2-0.63.20180825git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-25-a +* Sat Aug 25 2018 Ron Olson 4.2-0.62.20180824git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-24-a +* Fri Aug 24 2018 Ron Olson 4.2-0.61.20180823git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-23-a +* Thu Aug 23 2018 Ron Olson 4.2-0.60.20180822git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-22-a +* Wed Aug 22 2018 Ron Olson 4.2-0.59.20180821git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-21-a +* Tue Aug 21 2018 Ron Olson 4.2-0.58.20180820gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a +* Sun Aug 19 2018 Ron Olson 4.2-0.57.20180818gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-18-a +* Sat Aug 18 2018 Ron Olson 4.2-0.56.20180817gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-17-a +* Fri Aug 17 2018 Ron Olson 4.2-0.55.20180816gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-16-a +* Thu Aug 16 2018 Ron Olson 4.2-0.54.20180815gitefbe78e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-15-a +* Wed Aug 15 2018 Ron Olson 4.2-0.53.20180814git3146921 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-14-a +* Sat Aug 11 2018 Ron Olson 4.2-0.52.20180810gita710c2f +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-10-a * Thu Aug 09 2018 Ron Olson 4.2-0.51.20180808git1c8f885 - Updated to swift-4.2-CONVERGENCE * Wed Aug 08 2018 Ron Olson 4.2-0.50.20180807gitab5ce2e From edd8458eeeb807a8f130ed45b667be45833d4d94 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 31 Oct 2018 13:32:12 -0500 Subject: [PATCH 010/152] Updated to swift-4.2.1-RELEASE --- sources | 26 +++---- ...wift-lang-4.2.1-change-lldb-location.patch | 0 swift-lang.spec | 76 +++++++++++++++++-- 3 files changed, 84 insertions(+), 18 deletions(-) rename swift-lang-4.2-change-lldb-location.patch => swift-lang-4.2.1-change-lldb-location.patch (100%) diff --git a/sources b/sources index 3e5205c..8f30428 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 90877da1a76a54a3377c728c14fe260187e354df0084737512ad4d7444c19b36f9978ff9fad3104331590dba5daf8cde84d283b44187073db1e1af2d90ec27f1 -SHA512 (cmark.tar.gz) = 029f8a221f3234e601405c56259950cb8ac629863492d085bacade0cf2486c450f0b7ca256ca44ccd64345859d57e64d94a31fcf2d71dfc78027cf9e7521980e -SHA512 (corelibs-foundation.tar.gz) = 1e31f6c4c8a9fdf2ce899195b150623890c075323dab726b80d00dc93c8b9fa67884a10399cd950d5814711a818ba851989d3bdddd5040e2f375affc766fdf3e -SHA512 (corelibs-libdispatch.tar.gz) = ad885afc5e84185cf23f85994e97e01ab2365d178562b1f161537f0b55b85f6cc60d75973b69d6fed467f2c0158c625f05a79597f9ce44119ef7c19e6105b079 -SHA512 (corelibs-xctest.tar.gz) = 7c5b4d7b54b39e8a3a98852737070a10e91dd9738ffb4f64213ada6ae047f9117e47d7df1fe6792124dd64c0ad1e5d419c071361cada6d1c8899b9c38bf838cb -SHA512 (llbuild.tar.gz) = e447ee54ace855f6a10f1ca17b46d9b02d89c608126d41dbe1805393f4fefd1e8670e095c03f97adac50411b8361d577ec5a3cc9144808b8f5370dffd8953a4c -SHA512 (lldb.tar.gz) = 46f7e6324e8ab04accc8f3e2a86453d76265c9649da2fbdc16bf2abd3f3f8e807e86e124449741de05639ecef8864fc8468c517e0b36136f8fbf1d2b6f93c13b -SHA512 (llvm.tar.gz) = 66794e5c2e7cc1d0f80b807792c40570eecffea0a2a55040fd6877926e926b9cd7ab0dedc010a011fba8cc010c905caec4b216a6b16e584f20b6fafadf75145f -SHA512 (package-manager.tar.gz) = 39bf747ed879b79ea179c891ba6b342f5d6e25eaac42d0089e5ef338ff1ea4216df38f7a6a854fe616cc767ca40ea8a4cfc2339338f998bf030a53aa0b467839 -SHA512 (swift-compiler-rt.tar.gz) = dfde667d46d2e7b0fa486e588adba12145af626deca3e7156fd94297876d51d8eb6b8c1e1c676c2a887db220b8284a26452d597190ab773f8cacd3fc1f71fa91 -SHA512 (swift-integration-tests.tar.gz) = 3220f0ea617359355bb2b965315a61660534d6e725972c0116226cdc7ffb0b090fd4fa54e1b70756db76c4f27c5c6b2c0c3d1becb058e3419cdc62e231c67426 -SHA512 (swift-xcode-playground-support.tar.gz) = 438859bc3d6e15ed52d29bb3c71484babe313c62608ba330d85cd648633a46bcbc57ef721dcc59e6a6c050decc3ea51cf1d547837096ff45ba3e9af36a25bc2f -SHA512 (swift.tar.gz) = 90660be6bd8fc0b81a012f7662c8a92f7c2416c80dbedd697bcb6457d1769670fdf63acd153842f08ada74218677fc46e7e07e415029b973b7810a1995fb9c1d +SHA512 (clang.tar.gz) = 3bb02633721b9659155cca08bb8a75c0cbde17653795126bdb218194abade874c807b8d79ab959203c0934232b944ddfed4750932a68b93584585fc5e9553554 +SHA512 (cmark.tar.gz) = 4cc63d17f7111a1b6fc829784a71cece3932f87f0f8830837368f812e6024431a629cfecf29bdc9c4d54a049faa1385e6d11044a412f0aea601d5ebc305cce3b +SHA512 (corelibs-foundation.tar.gz) = 8f0a7f8b2a8692edf2bd268db2459e2e58a8046d1ab99c0ab48ec247c0cb8d8ccdaa902c3a4da8081c4c528527dcdd664b1f1539e6c06d872b490f9cbf7f6cd3 +SHA512 (corelibs-libdispatch.tar.gz) = 77189baaaf2dade91d24f23777dcc19c5b0e9de9cb0a43674ee068e3ba63f3a27732656d794f9490ccb2a54adae3f1640a0ecb1917f668529755222966da92ab +SHA512 (corelibs-xctest.tar.gz) = a31a65012356191ed7f7fa9a34bd8a25777c814b59a700598fb57493f9972ef7858a4923f4df066c9474ecad273d50f71c74e670e6a8d52d4b7939a8330498c4 +SHA512 (llbuild.tar.gz) = b6c9615a1fc665782745e5abb2dd1f046d0c2d676f80419c5ab9e89c9f298b29f2e560f52194491bc616fd01b13372bac605a80a233981c77f921188e39f956d +SHA512 (lldb.tar.gz) = 5e5cde8a43f157ca691fb1cd7223fb775af172f58b1ab4d27a37c85cefe90d00d6e77100f6eae622460eefaea770a2fa27cb05e68d77a530760894995b4541ce +SHA512 (llvm.tar.gz) = 5fa2a9ffb30f3b9349bcf3c40cdf79f440c6f51fea1d6f55d4ce22ba99e53b1edd60e1bcb1171ec5fea35dcb0bbb1ce85be93acba4559d3dd2272278c22ef567 +SHA512 (package-manager.tar.gz) = aed14c0f7283b53d13ab9c10d9a5c17cbe11d15108694e464c1dc4ce7e4cd4069df8f90990a8fe3f6e669b0c1222041ab687c8176f3f4cddc1f1d28950761912 +SHA512 (swift-compiler-rt.tar.gz) = 0384af3432241d1d686d5831d7a1d94e3a4e587d5703fddf1350bcc8aa98ad3d3f85becbdfc81f7091a5e7a8788f7048985395b7a4759e3601bb6e9a1e9b41a7 +SHA512 (swift-integration-tests.tar.gz) = 875b2862019be5fb781ba3c0a59805e95362575429403d52efaf1f6507c4abced5294e1ccc8f2ca03d3d0f1befdf5f191789148ab4f14f85383f8d3fb56a325a +SHA512 (swift-xcode-playground-support.tar.gz) = 09342c0eedd35c423e74421f4d35ac5e9345ff8a721edae60d31ab104b4a3781cfd80e3f507f035b2629b7959d2fa89d86a394a7151d843a9e3c4955de102879 +SHA512 (swift.tar.gz) = c8a4e6594f07e457d2ca999fe1fc55b02af5dd3b9684536902d1fb28ff417fb19a9d90bb7f0d0d02b9d7cc2abbe175be2cd26b9cc9092735f9cacaad41d1837a diff --git a/swift-lang-4.2-change-lldb-location.patch b/swift-lang-4.2.1-change-lldb-location.patch similarity index 100% rename from swift-lang-4.2-change-lldb-location.patch rename to swift-lang-4.2.1-change-lldb-location.patch diff --git a/swift-lang.spec b/swift-lang.spec index ee305a9..e6acf86 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-RELEASE -%global swiftgithash 2c6399a -%global swiftgitdate 20180912 +%global swifttag 4.2.1-RELEASE +%global swiftgithash 02a6ca9 +%global swiftgitdate 20181030 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 4.2 -Release: 0.68.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 4.2.1 +Release: 0.101.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -204,6 +204,72 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* 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 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-29-a +* Sat Oct 27 2018 Ron Olson 4.2-0.99.20181026gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-26-a +* Fri Oct 26 2018 Ron Olson 4.2-0.98.20181025gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-25-a +* Wed Oct 24 2018 Ron Olson 4.2-0.97.20181023gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-23-a +* Tue Oct 23 2018 Ron Olson 4.2-0.96.20181022gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-22-a +* Mon Oct 22 2018 Ron Olson 4.2-0.95.20181021gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-21-a +* Sun Oct 21 2018 Ron Olson 4.2-0.94.20181020gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-20-a +* Fri Oct 19 2018 Ron Olson 4.2-0.93.20181018gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-18-a +* Thu Oct 18 2018 Ron Olson 4.2-0.92.20181017gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-17-a +* Wed Oct 17 2018 Ron Olson 4.2-0.91.20181016gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-16-a +* Tue Oct 16 2018 Ron Olson 4.2-0.90.20181015gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-15-a +* Mon Oct 15 2018 Ron Olson 4.2-0.89.20181014gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-14-a +* Sun Oct 14 2018 Ron Olson 4.2-0.88.20181013gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-13-a +* Sat Oct 13 2018 Ron Olson 4.2-0.87.20181012gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-12-a +* Fri Oct 12 2018 Ron Olson 4.2-0.86.20181011gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-11-a +* Thu Oct 11 2018 Ron Olson 4.2-0.85.20181010gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-10-a +* Wed Oct 10 2018 Ron Olson 4.2-0.84.20181009gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-09-a +* Tue Oct 09 2018 Ron Olson 4.2-0.83.20181008gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-08-a +* Mon Oct 08 2018 Ron Olson 4.2-0.82.20181007gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-07-a +* Sun Oct 07 2018 Ron Olson 4.2-0.81.20181006gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-06-a +* Sat Oct 06 2018 Ron Olson 4.2-0.80.20181005gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-05-a +* Thu Oct 04 2018 Ron Olson 4.2-0.79.20181003gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-03-a +* Wed Oct 03 2018 Ron Olson 4.2-0.78.20181002gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-02-a +* Tue Oct 02 2018 Ron Olson 4.2-0.77.20181001gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-01-a +* Sat Sep 29 2018 Ron Olson 4.2-0.76.20180928gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-28-a +* Fri Sep 28 2018 Ron Olson 4.2-0.75.20180927gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-27-a +* Thu Sep 27 2018 Ron Olson 4.2-0.74.20180926gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-26-a +* Wed Sep 26 2018 Ron Olson 4.2-0.73.20180925gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-25-a +* Tue Sep 25 2018 Ron Olson 4.2-0.72.20180924git01644d5 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-24-a +* Mon Sep 24 2018 Ron Olson 4.2-0.71.20180922gitac7c511 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-22-a +* Sat Sep 15 2018 Ron Olson 4.2-0.70.20180914git2dfdbf2 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-14-a +* Fri Sep 14 2018 Ron Olson 4.2-0.69.20180913git2dfdbf2 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-13-a * Thu Sep 13 2018 Ron Olson 4.2-0.68.20180912git2c6399a - Updated to swift-4.2-RELEASE * Wed Sep 12 2018 Ron Olson 4.2-0.67.20180911gitbe88499 From eb1ee4889e9fbe09ce16cb66ae8b56d810d9203b Mon Sep 17 00:00:00 2001 From: Egor Zhdan Date: Wed, 5 Dec 2018 15:18:49 +0000 Subject: [PATCH 011/152] Include dependencies to ncurser which are required by SourceKit and included in Apple installation guide --- swift-lang.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/swift-lang.spec b/swift-lang.spec index e6acf86..4d6ee00 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,8 @@ 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 From be48ebf892341b8a47b166bf492e8a1db120b140 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 5 Dec 2018 09:52:31 -0600 Subject: [PATCH 012/152] Reformatted Egor's comment in the changelog --- swift-lang.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 4d6ee00..52e55ca 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -207,7 +207,8 @@ 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 +- 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 From 7054ff7d8504aeadb3deaed81a243ad1b977b284 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 16 Dec 2018 10:56:00 -0600 Subject: [PATCH 013/152] Swift 5.0-Dev with aarch64 support --- aarch64-new-master-VarArgs.patch | 219 ++++++++++++++++++ ...cation.patch => change-lldb-location.patch | 15 +- compiler-rt-no-ustat.patch | 49 ---- no-ninja-build.patch | 10 +- reflection-template.patch | 18 -- sources | 26 +-- swift-lang.spec | 102 +++++--- 7 files changed, 320 insertions(+), 119 deletions(-) create mode 100644 aarch64-new-master-VarArgs.patch rename swift-lang-4.2.1-change-lldb-location.patch => change-lldb-location.patch (54%) delete mode 100644 compiler-rt-no-ustat.patch delete mode 100644 reflection-template.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-4.2.1-change-lldb-location.patch b/change-lldb-location.patch similarity index 54% rename from swift-lang-4.2.1-change-lldb-location.patch rename to change-lldb-location.patch index 7a13cb1..3d324e7 100644 --- a/swift-lang-4.2.1-change-lldb-location.patch +++ b/change-lldb-location.patch @@ -1,18 +1,15 @@ ---- 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; +--- 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::RequireLLDB: -- useLLDB = true; -- break; case REPLJobAction::Mode::PreferLLDB: - useLLDB = !findProgramRelativeToSwift("lldb").empty(); + useLLDB = true; break; } -@@ -872,7 +870,7 @@ +@@ -909,7 +909,7 @@ ArgStringList Arguments; Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg))); @@ -20,4 +17,4 @@ + return {"/usr/libexec/swift-lldb/lldb", Arguments}; } - + ToolChain::InvocationInfo diff --git a/compiler-rt-no-ustat.patch b/compiler-rt-no-ustat.patch deleted file mode 100644 index 2499d66..0000000 --- a/compiler-rt-no-ustat.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- compiler-rt-orig/lib/sanitizer_common/sanitizer_common_syscalls.inc 2018-05-21 10:41:12.089534263 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc 2018-05-21 10:47:21.172510188 -0500 -@@ -923,16 +923,6 @@ - } - } - --#if !SANITIZER_ANDROID --PRE_SYSCALL(ustat)(long dev, void *ubuf) {} -- --POST_SYSCALL(ustat)(long res, long dev, void *ubuf) { -- if (res >= 0) { -- if (ubuf) POST_WRITE(ubuf, struct_ustat_sz); -- } --} --#endif // !SANITIZER_ANDROID -- - PRE_SYSCALL(stat64)(const void *filename, void *statbuf) { - if (filename) - PRE_READ(filename, -diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ---- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-05-21 10:41:12.080534263 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-05-21 10:45:29.503517472 -0500 -@@ -159,7 +159,6 @@ - # include - #endif - #include --#include - #include - #include - #include -@@ -253,7 +252,6 @@ - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned struct_ustat_sz = sizeof(struct ustat); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID -diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ---- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2018-05-21 10:41:12.081534263 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2018-05-21 10:44:28.392521458 -0500 -@@ -197,7 +197,6 @@ - int v[10]; - }; - -- extern unsigned struct_ustat_sz; - extern unsigned struct_rlimit64_sz; - extern unsigned struct_statvfs64_sz; - 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/sources b/sources index 8f30428..1bdb7a1 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 3bb02633721b9659155cca08bb8a75c0cbde17653795126bdb218194abade874c807b8d79ab959203c0934232b944ddfed4750932a68b93584585fc5e9553554 -SHA512 (cmark.tar.gz) = 4cc63d17f7111a1b6fc829784a71cece3932f87f0f8830837368f812e6024431a629cfecf29bdc9c4d54a049faa1385e6d11044a412f0aea601d5ebc305cce3b -SHA512 (corelibs-foundation.tar.gz) = 8f0a7f8b2a8692edf2bd268db2459e2e58a8046d1ab99c0ab48ec247c0cb8d8ccdaa902c3a4da8081c4c528527dcdd664b1f1539e6c06d872b490f9cbf7f6cd3 -SHA512 (corelibs-libdispatch.tar.gz) = 77189baaaf2dade91d24f23777dcc19c5b0e9de9cb0a43674ee068e3ba63f3a27732656d794f9490ccb2a54adae3f1640a0ecb1917f668529755222966da92ab -SHA512 (corelibs-xctest.tar.gz) = a31a65012356191ed7f7fa9a34bd8a25777c814b59a700598fb57493f9972ef7858a4923f4df066c9474ecad273d50f71c74e670e6a8d52d4b7939a8330498c4 -SHA512 (llbuild.tar.gz) = b6c9615a1fc665782745e5abb2dd1f046d0c2d676f80419c5ab9e89c9f298b29f2e560f52194491bc616fd01b13372bac605a80a233981c77f921188e39f956d -SHA512 (lldb.tar.gz) = 5e5cde8a43f157ca691fb1cd7223fb775af172f58b1ab4d27a37c85cefe90d00d6e77100f6eae622460eefaea770a2fa27cb05e68d77a530760894995b4541ce -SHA512 (llvm.tar.gz) = 5fa2a9ffb30f3b9349bcf3c40cdf79f440c6f51fea1d6f55d4ce22ba99e53b1edd60e1bcb1171ec5fea35dcb0bbb1ce85be93acba4559d3dd2272278c22ef567 -SHA512 (package-manager.tar.gz) = aed14c0f7283b53d13ab9c10d9a5c17cbe11d15108694e464c1dc4ce7e4cd4069df8f90990a8fe3f6e669b0c1222041ab687c8176f3f4cddc1f1d28950761912 -SHA512 (swift-compiler-rt.tar.gz) = 0384af3432241d1d686d5831d7a1d94e3a4e587d5703fddf1350bcc8aa98ad3d3f85becbdfc81f7091a5e7a8788f7048985395b7a4759e3601bb6e9a1e9b41a7 -SHA512 (swift-integration-tests.tar.gz) = 875b2862019be5fb781ba3c0a59805e95362575429403d52efaf1f6507c4abced5294e1ccc8f2ca03d3d0f1befdf5f191789148ab4f14f85383f8d3fb56a325a -SHA512 (swift-xcode-playground-support.tar.gz) = 09342c0eedd35c423e74421f4d35ac5e9345ff8a721edae60d31ab104b4a3781cfd80e3f507f035b2629b7959d2fa89d86a394a7151d843a9e3c4955de102879 -SHA512 (swift.tar.gz) = c8a4e6594f07e457d2ca999fe1fc55b02af5dd3b9684536902d1fb28ff417fb19a9d90bb7f0d0d02b9d7cc2abbe175be2cd26b9cc9092735f9cacaad41d1837a +SHA512 (clang.tar.gz) = 6154c2a86502e80190fafb03c0fbde7c93b3c68bc09a36e4c9d291152bd4a67d7d0b4f6acd25c67366c5aa75ccb3c47b48991625f8c3df641b6e743ce69615fc +SHA512 (cmark.tar.gz) = 2e2f4ebd66a70dc3be64d7d2008e0cedf7cc3eb3b5cb34fa605fdbeae41ef0067240373623eb4f2515f0673552b8423c3027e3cc163b847529cb8d5193e1e096 +SHA512 (corelibs-foundation.tar.gz) = d17fe595c70990aa1c1bc1cfd219d0aa29b69e845c58468380f4006c1422ecc4f513ca76e0b8551df7905a6ae34659080fd19354aa3150e505840599d8ce3780 +SHA512 (corelibs-libdispatch.tar.gz) = 299cf698fe06db712e187227516756e8158d1a91e2fd88cb12851112ebadccfb27fd2c472bfa55f768c4151e13b81c584852575d32f541bc9315731a651ffba4 +SHA512 (corelibs-xctest.tar.gz) = 309bb67cc39fbde3f9642bb5a261f5da3cc96eae953adddd319a7e915b7c3d35bb2018e12535dcbc917564aaecbcce248468c1b0fa6e1e2b6d9cc67f5792e2ae +SHA512 (llbuild.tar.gz) = bafad69d506ea670c3bc484874e5486570c7976ee037ba577a46d6c2df9fe609005a2882f0633ffbb86212b4d5fa48d02fcf5a14e13235e62cbc166ec7d87b4a +SHA512 (lldb.tar.gz) = 5155d4c21f13020f0c935823dbbc2422008f2d1523f881229f6e0aa15f836894a9c550e8d133c7a2353edc8a3a6d4edfae30f66f93ea45276de29969244fa428 +SHA512 (llvm.tar.gz) = 15b43a51855160841fbc505b426b8fbb84fd1bec920b7b07f176592a092cd69ea012a80f17912702b86446f9d61958f07f3aa4132597cabf121d1f19fa913fa9 +SHA512 (package-manager.tar.gz) = 3aadcc334e71bca73945e9f919dd6535ec2e83a0c1d79433a07ae4ab2c52092232e7d2876c7a0f61cc6ae255ccd8c2fb2d4e4fca2850006055d79a055f300aba +SHA512 (swift-compiler-rt.tar.gz) = c9ac21612a64f0d836ecf3eac20b5b1f579dd14b4e23a871ced857bb2b3feaabb7cf01f00c972ac69144cdc17780353e4dfdc65e66365c3c5eb0cdb71ca230e6 +SHA512 (swift-integration-tests.tar.gz) = 4dbc29814b5ccb2aea2720ba908594026b615c908be24630516bebaac22a66392eed785ccde16ce00564b98cc120669fee2d41bd782e78a025a0495055d51b47 +SHA512 (swift-xcode-playground-support.tar.gz) = f4212ae56bcbbbe80ee1c7533d03d25c4d46371c5895e96b86b6b9b46d9fef03de94a8ef197e93ae7de468f8797f5f05096229d465fd3115a86b6362cb207922 +SHA512 (swift.tar.gz) = 7a8cd38987789304fe0a24ee88950dec68efba710da202d30a406ae534099fde23ec1ccf1a0e206762d325cd526cf563db6ddee2fff59bce45ed4241cf5f98bc diff --git a/swift-lang.spec b/swift-lang.spec index 52e55ca..1287264 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 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: 4.2.1 -Release: 0.101.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.0 +Release: 0.30.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -26,10 +26,9 @@ 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 +Patch2: aarch64-new-master-VarArgs.patch BuildRequires: clang BuildRequires: cmake @@ -56,11 +55,11 @@ BuildRequires: ninja-build Requires: glibc-devel Requires: clang -Requires: ncurses-devel -Requires: ncurses-compat-libs +Requires: ncurses-devel +Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 aarch64 %description @@ -107,16 +106,14 @@ 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. +# Since we require ninja for building, there's no sense to rebuild it just for Swift %patch1 -p0 -# Since we require ninja for building, there's no sense to rebuild it just for Swift +# Specific patch for VarArg handling for Swift on ARM +%ifarch aarch64 %patch2 -p0 +%endif -# Template issue with clang 7.0 -%patch3 -p0 %build export VERBOSE=1 @@ -150,19 +147,23 @@ 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 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 @@ -189,15 +190,18 @@ 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 %files runtime -/usr/lib/swift/ -/usr/lib/swift/linux/ +/usr/lib/swift/linux/* %{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf @@ -206,9 +210,53 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Wed Dec 05 2018 Egor Zhdan +* 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 +* 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 +- 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 +- 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 +* 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 +- 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 +- 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 +- 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 +- 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 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-16-a +* Fri Nov 16 2018 Ron Olson 5.0-0.10.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 From 0d8af59a18abd09f20d3ea691190207b8d327b4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 09:06:54 +0000 Subject: [PATCH 014/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 1287264..e76fc18 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: 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,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 5.0-0.31.20181214gitee39236 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * 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 From a18680bab42708f7aa8dea212d2cc1470450fde1 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 11 Feb 2019 21:48:30 -0600 Subject: [PATCH 015/152] Cleaning up patches --- aarch64-new-master-VarArgs.patch | 219 ------------------------------- clangloc.patch | 11 ++ swift-lang.spec | 30 ++--- 3 files changed, 26 insertions(+), 234 deletions(-) delete mode 100644 aarch64-new-master-VarArgs.patch create mode 100644 clangloc.patch diff --git a/aarch64-new-master-VarArgs.patch b/aarch64-new-master-VarArgs.patch deleted file mode 100644 index c07cef0..0000000 --- a/aarch64-new-master-VarArgs.patch +++ /dev/null @@ -1,219 +0,0 @@ -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/clangloc.patch b/clangloc.patch new file mode 100644 index 0000000..5892519 --- /dev/null +++ b/clangloc.patch @@ -0,0 +1,11 @@ +--- lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp.orig 2019-02-08 20:24:10.121192411 -0600 ++++ lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp 2019-02-08 22:20:36.347687737 -0600 +@@ -34,7 +34,7 @@ + #else + static bool DefaultComputeClangDirectory(FileSpec &file_spec) { + return HostInfoPosix::ComputePathRelativeToLibrary( +- file_spec, "/lib/lldb/clang/"); ++ file_spec, "/swift/clang/"); + return HostInfoPosix::ComputePathRelativeToLibrary( + file_spec, (llvm::Twine("/lib") + CLANG_LIBDIR_SUFFIX + "/clang/" + + CLANG_VERSION_STRING) diff --git a/swift-lang.spec b/swift-lang.spec index e76fc18..c733d63 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-2019-02-06-a +%global swiftgithash d07c25a +%global swiftgitdate 20190206 %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 @@ -24,11 +24,11 @@ Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag} Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz Source13: swift-lang.conf -Source14: swift-lang-runtime.conf +Source14: swift-lang-runtime.conf Patch0: change-lldb-location.patch -Patch1: no-ninja-build.patch -Patch2: aarch64-new-master-VarArgs.patch +Patch1: no-ninja-build.patch +Patch2: clangloc.patch BuildRequires: clang BuildRequires: cmake @@ -55,9 +55,9 @@ BuildRequires: ninja-build Requires: glibc-devel Requires: clang -Requires: ncurses-devel -Requires: ncurses-compat-libs -Requires: %{name}-runtime = %{version}-%{release} +Requires: ncurses-devel +Requires: ncurses-compat-libs +Requires: %{name}-runtime = %{version}-%{release} ExclusiveArch: x86_64 aarch64 @@ -109,10 +109,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 %patch1 -p0 -# Specific patch for VarArg handling for Swift on ARM -%ifarch aarch64 +# This changes the location of where the headers and libs are to keep lldb happy %patch2 -p0 -%endif %build @@ -210,9 +208,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Feb 08 2019 Ron Olson 5.0-0.32.20190206gitd07c25a +- Added patch to allow the Swift REPL to work properly, also removed patch + for aarch64 because the changes were merged upstream * Sun Feb 03 2019 Fedora Release Engineering - 5.0-0.31.20181214gitee39236 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * 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 @@ -234,7 +234,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m * 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 +- Include dependencies to ncurses which are required by SourceKit and included in Apple installation guide * Wed Dec 05 2018 Ron Olson 5.0-0.21.20181204gitfacaad1 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-12-04-a From cafa36380b435cdc3e9d8056c0d932fd62eabd81 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 11 Feb 2019 21:52:13 -0600 Subject: [PATCH 016/152] Updated sources --- sources | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sources b/sources index 1bdb7a1..886776c 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 6154c2a86502e80190fafb03c0fbde7c93b3c68bc09a36e4c9d291152bd4a67d7d0b4f6acd25c67366c5aa75ccb3c47b48991625f8c3df641b6e743ce69615fc -SHA512 (cmark.tar.gz) = 2e2f4ebd66a70dc3be64d7d2008e0cedf7cc3eb3b5cb34fa605fdbeae41ef0067240373623eb4f2515f0673552b8423c3027e3cc163b847529cb8d5193e1e096 -SHA512 (corelibs-foundation.tar.gz) = d17fe595c70990aa1c1bc1cfd219d0aa29b69e845c58468380f4006c1422ecc4f513ca76e0b8551df7905a6ae34659080fd19354aa3150e505840599d8ce3780 -SHA512 (corelibs-libdispatch.tar.gz) = 299cf698fe06db712e187227516756e8158d1a91e2fd88cb12851112ebadccfb27fd2c472bfa55f768c4151e13b81c584852575d32f541bc9315731a651ffba4 -SHA512 (corelibs-xctest.tar.gz) = 309bb67cc39fbde3f9642bb5a261f5da3cc96eae953adddd319a7e915b7c3d35bb2018e12535dcbc917564aaecbcce248468c1b0fa6e1e2b6d9cc67f5792e2ae -SHA512 (llbuild.tar.gz) = bafad69d506ea670c3bc484874e5486570c7976ee037ba577a46d6c2df9fe609005a2882f0633ffbb86212b4d5fa48d02fcf5a14e13235e62cbc166ec7d87b4a -SHA512 (lldb.tar.gz) = 5155d4c21f13020f0c935823dbbc2422008f2d1523f881229f6e0aa15f836894a9c550e8d133c7a2353edc8a3a6d4edfae30f66f93ea45276de29969244fa428 -SHA512 (llvm.tar.gz) = 15b43a51855160841fbc505b426b8fbb84fd1bec920b7b07f176592a092cd69ea012a80f17912702b86446f9d61958f07f3aa4132597cabf121d1f19fa913fa9 -SHA512 (package-manager.tar.gz) = 3aadcc334e71bca73945e9f919dd6535ec2e83a0c1d79433a07ae4ab2c52092232e7d2876c7a0f61cc6ae255ccd8c2fb2d4e4fca2850006055d79a055f300aba -SHA512 (swift-compiler-rt.tar.gz) = c9ac21612a64f0d836ecf3eac20b5b1f579dd14b4e23a871ced857bb2b3feaabb7cf01f00c972ac69144cdc17780353e4dfdc65e66365c3c5eb0cdb71ca230e6 -SHA512 (swift-integration-tests.tar.gz) = 4dbc29814b5ccb2aea2720ba908594026b615c908be24630516bebaac22a66392eed785ccde16ce00564b98cc120669fee2d41bd782e78a025a0495055d51b47 -SHA512 (swift-xcode-playground-support.tar.gz) = f4212ae56bcbbbe80ee1c7533d03d25c4d46371c5895e96b86b6b9b46d9fef03de94a8ef197e93ae7de468f8797f5f05096229d465fd3115a86b6362cb207922 -SHA512 (swift.tar.gz) = 7a8cd38987789304fe0a24ee88950dec68efba710da202d30a406ae534099fde23ec1ccf1a0e206762d325cd526cf563db6ddee2fff59bce45ed4241cf5f98bc +SHA512 (clang.tar.gz) = aa5b6f027cb911ae32e13e217556d9a7912db3a40b5c35cb5d252188c18369f0f137930e9110600f20e517819c98577c6fd660cf5c80d1b708d2fe2d924efea9 +SHA512 (cmark.tar.gz) = 7c807392ff17303ea9ef8dd48284c83859afda4368e4fb0e3829b71c62720280cb1591b2c803890d5166dafc7bc6108c02b972820bcb5fd561cc0bfd34481233 +SHA512 (corelibs-foundation.tar.gz) = 2f22e849cd628ce18cf65944ee997a32883106a1d254ef9ae56f22ee13b1f61bac8f432327043dcbb58c45dbbeef1455808ea27fd6ebc15a5a41cba478346340 +SHA512 (corelibs-libdispatch.tar.gz) = 57bd80088df91f82025654e3bf14cb990941c582ab049527f6bfd37d5f94486fffa176d83128689a18aedf7d3f90c3727f911cfbfddcbadd2df87c82bb1e346f +SHA512 (corelibs-xctest.tar.gz) = c00d40a8a1d607546b9a7d6be6f03ece76d632b9cad4e7eaf78a73b5fe0582af95cf35f0b5147cdc24428986b0e7fa60babaaaa5b31d8cfb3c1a9921e1cf53b5 +SHA512 (llbuild.tar.gz) = d7d0eb91b1c7528f1bac6fcb412a653ac59f3efaf812d8f383c09aa38a3c38da451b5b75b73808bbc1e7e777d39849f48e97f7b02265f2412a1db8e54e60c5d5 +SHA512 (lldb.tar.gz) = 21f67b8e5a2642561543c92480a097f15d8e871132532a27b6929653a399023a548756a37354a2f679ca7ceab8a7f9d752cc7535c9404c19f075204ecd149268 +SHA512 (llvm.tar.gz) = 3603616a71091359a15105224f0a8f4cff229c93c907eba2f013aeff1f025b96c4e376433fcc9664ffaca0a1b13591af9a2dc1018bdf40b1a52ff416f2cce675 +SHA512 (package-manager.tar.gz) = ff35745f4eb0f4f6fc63c42f1b4e78221047f271c0a9e4295c54fc762008829f8357214a95ec54e15e4feaac32970eccd323e8e3fe060a601b3155c7fbb6f9f5 +SHA512 (swift-compiler-rt.tar.gz) = 9d5dc54725b239bea68e6103d3e17eb292beb200e59c32bee9253d8e40cacbff508173fe8b848f31742b321dfb8cef993aa67df7a15b06127d1de7004c3beca2 +SHA512 (swift-integration-tests.tar.gz) = 9347361ba463082767fabd3513be2f82cb4f81ae1a551c2e251e8d03281a0f648c46b23ed5435d1eacc433379562243f838bfae5b2760f587211332851085622 +SHA512 (swift-xcode-playground-support.tar.gz) = ae5770aa5d0a5121489e45f34602e9c895a203eefe887acf6d9b657bc140a15f96ee6b93d8724ca29107698e35b0c3ded35de39f2da726588737f54b44115eb5 +SHA512 (swift.tar.gz) = 8723f955efdb34048879911e1c6bf90ab1c01af4bc4f2d9d73ce3dcf88f3173edfee219e130b8a0e74b0bb0a67269a2cc493171bf194490c737d881d26274212 From e51499bdc916048983f948755c2ee6accc14cd3b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 13 Feb 2019 21:17:19 -0600 Subject: [PATCH 017/152] Addd patch for compiler-rt to handle adding std::thread to a vector --- compiler-rt-fuzzer.patch | 23 +++++++++++++++++++++++ swift-lang.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 compiler-rt-fuzzer.patch diff --git a/compiler-rt-fuzzer.patch b/compiler-rt-fuzzer.patch new file mode 100644 index 0000000..b0e779a --- /dev/null +++ b/compiler-rt-fuzzer.patch @@ -0,0 +1,23 @@ +--- compiler-rt/lib/fuzzer/FuzzerDriver.cpp.orig 2019-02-13 14:24:24.239239031 -0600 ++++ compiler-rt/lib/fuzzer/FuzzerDriver.cpp 2019-02-13 14:28:18.525530281 -0600 +@@ -248,13 +248,16 @@ + Command Cmd(Args); + Cmd.removeFlag("jobs"); + Cmd.removeFlag("workers"); +- Vector V; ++ Vector> V; + std::thread Pulse(PulseThread); + Pulse.detach(); +- for (unsigned i = 0; i < NumWorkers; i++) +- V.push_back(std::thread(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors)); ++ for (unsigned i = 0; i < NumWorkers; i++) { ++ std::shared_ptr wt(new std::thread(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors)); ++ V.push_back(wt); ++ } + for (auto &T : V) +- T.join(); ++ T->join(); ++ Vector>().swap(V); + return HasErrors ? 1 : 0; + } + diff --git a/swift-lang.spec b/swift-lang.spec index c733d63..909f426 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: 5.0 -Release: 0.32.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.33.%{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: change-lldb-location.patch Patch1: no-ninja-build.patch Patch2: clangloc.patch +Patch3: compiler-rt-fuzzer.patch BuildRequires: clang BuildRequires: cmake @@ -112,6 +113,8 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # This changes the location of where the headers and libs are to keep lldb happy %patch2 -p0 +# Fixes an issue with using std::thread in a vector in compiler-rt +%patch3 -p0 %build export VERBOSE=1 @@ -208,6 +211,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Feb 13 2019 Ron Olson 5.0-0.33.20190206gitd07c25a +- Added patch to fix an issue with compiler-rt using std::thread in a vector * Fri Feb 08 2019 Ron Olson 5.0-0.32.20190206gitd07c25a - Added patch to allow the Swift REPL to work properly, also removed patch for aarch64 because the changes were merged upstream From 184216b01466be4bc5877af8bbfeaf8973b2d887 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 20 Feb 2019 09:32:21 -0600 Subject: [PATCH 018/152] Updated to 2019-02-19 version of Swift 5 --- sources | 26 +++++++++++++------------- swift-lang.spec | 23 +++++++++++++++++------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/sources b/sources index 886776c..3173f23 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = aa5b6f027cb911ae32e13e217556d9a7912db3a40b5c35cb5d252188c18369f0f137930e9110600f20e517819c98577c6fd660cf5c80d1b708d2fe2d924efea9 -SHA512 (cmark.tar.gz) = 7c807392ff17303ea9ef8dd48284c83859afda4368e4fb0e3829b71c62720280cb1591b2c803890d5166dafc7bc6108c02b972820bcb5fd561cc0bfd34481233 -SHA512 (corelibs-foundation.tar.gz) = 2f22e849cd628ce18cf65944ee997a32883106a1d254ef9ae56f22ee13b1f61bac8f432327043dcbb58c45dbbeef1455808ea27fd6ebc15a5a41cba478346340 -SHA512 (corelibs-libdispatch.tar.gz) = 57bd80088df91f82025654e3bf14cb990941c582ab049527f6bfd37d5f94486fffa176d83128689a18aedf7d3f90c3727f911cfbfddcbadd2df87c82bb1e346f -SHA512 (corelibs-xctest.tar.gz) = c00d40a8a1d607546b9a7d6be6f03ece76d632b9cad4e7eaf78a73b5fe0582af95cf35f0b5147cdc24428986b0e7fa60babaaaa5b31d8cfb3c1a9921e1cf53b5 -SHA512 (llbuild.tar.gz) = d7d0eb91b1c7528f1bac6fcb412a653ac59f3efaf812d8f383c09aa38a3c38da451b5b75b73808bbc1e7e777d39849f48e97f7b02265f2412a1db8e54e60c5d5 -SHA512 (lldb.tar.gz) = 21f67b8e5a2642561543c92480a097f15d8e871132532a27b6929653a399023a548756a37354a2f679ca7ceab8a7f9d752cc7535c9404c19f075204ecd149268 -SHA512 (llvm.tar.gz) = 3603616a71091359a15105224f0a8f4cff229c93c907eba2f013aeff1f025b96c4e376433fcc9664ffaca0a1b13591af9a2dc1018bdf40b1a52ff416f2cce675 -SHA512 (package-manager.tar.gz) = ff35745f4eb0f4f6fc63c42f1b4e78221047f271c0a9e4295c54fc762008829f8357214a95ec54e15e4feaac32970eccd323e8e3fe060a601b3155c7fbb6f9f5 -SHA512 (swift-compiler-rt.tar.gz) = 9d5dc54725b239bea68e6103d3e17eb292beb200e59c32bee9253d8e40cacbff508173fe8b848f31742b321dfb8cef993aa67df7a15b06127d1de7004c3beca2 -SHA512 (swift-integration-tests.tar.gz) = 9347361ba463082767fabd3513be2f82cb4f81ae1a551c2e251e8d03281a0f648c46b23ed5435d1eacc433379562243f838bfae5b2760f587211332851085622 -SHA512 (swift-xcode-playground-support.tar.gz) = ae5770aa5d0a5121489e45f34602e9c895a203eefe887acf6d9b657bc140a15f96ee6b93d8724ca29107698e35b0c3ded35de39f2da726588737f54b44115eb5 -SHA512 (swift.tar.gz) = 8723f955efdb34048879911e1c6bf90ab1c01af4bc4f2d9d73ce3dcf88f3173edfee219e130b8a0e74b0bb0a67269a2cc493171bf194490c737d881d26274212 +SHA512 (clang.tar.gz) = 2d1b42cdc2b09bf9a574f72c7c0135b9b7e1823878f63f7b013aca007e3eb96c1c7b4f74548e7ed7235fd4e1e9ebfb22879e1a0f05774d11ef028b973243f676 +SHA512 (cmark.tar.gz) = 359b6ab8ffdea9622ca8c307f00712d3d1853f58bc5369f4e424869dbfa79c26b02f14fde5ece0710e5471f605db66732498cd86c240927429e75dfd1ae73033 +SHA512 (corelibs-foundation.tar.gz) = 8bda0c1222dab49d0e219ba72a2e23fdf05fa1a178a11444bf7076f21c3e1f6e98df3bc271acfc82716c3867049076d7ec756c099a9c442e3d4cac92605b0cc0 +SHA512 (corelibs-libdispatch.tar.gz) = b439559620cacf8cf6bd8b79c7c5f57a1dcbaf597fe550709a8eba712e80473cc1b7587d5db99e18a6be330502215a9bc66e38329d987668fe0ec8951d5999fa +SHA512 (corelibs-xctest.tar.gz) = 09a5fcfd97e9fda2cbe4802afa1f69274451e058210b05aa26dd50d132fa614ff06155864c27ec7259313048050ade90afb229b9afc2546fc1b4b06cf41e1401 +SHA512 (llbuild.tar.gz) = 96ca43d8923e1aa634b71d272331f1f800da09adca11a7c7615b252bd23df6c6e05e221356cdc643ae98fa03838e195c8eda12c3fc1b4e3c9ba1cdedf8550f1c +SHA512 (lldb.tar.gz) = f279f22e6a4defabaa85c329ad96dbbba13c1ff56c9fc233628f3bb36c2a818d6f5d313ee8899acb1b39dcf9d28f8dd8346b9f7b5078a3923de1fe636642e690 +SHA512 (llvm.tar.gz) = febecff64ca52c52ecd03004298bae175740c56dbecbe5bd95a232191657d0f83126efdb9aaaab84cf6ad1ade67191f8efbc8614a4174cc70cda183c8e6e5151 +SHA512 (package-manager.tar.gz) = 730faa57e91cfb2a3fa790dc1deb191015ef12c928e2b21435e26f2b2a508f1e54fcc9702bf3e1a153308310083e39457287df77a22edb7a0a17d82f169a882a +SHA512 (swift-compiler-rt.tar.gz) = 1f98fa753d34bb7207f0688e553e3b4e5a639e35a3cfa2d748ed5d8fa2889c244668b7753491605f215dda9e48dad91e91b42db4e07501ada23571fa2e7b83ab +SHA512 (swift-integration-tests.tar.gz) = 00bb1d31542fb18e438c2f245bcbedf02a87f8e3d008ba47884dfc9cdcccafb20d80c073c31953164f6141a3bae6e2127d250715eba34ba039468c6ab1914417 +SHA512 (swift-xcode-playground-support.tar.gz) = c025017f166b864c56bbda39de2dbc7300a7b4029b019445d42f99f794e3bf1d051c32ba0dd0390e59b335aa8aa0ff03df328d0dfdf294bfbf85d0539ac62128 +SHA512 (swift.tar.gz) = 853211f597bdaf3df26ca88acf8a66e4b26e13b23cb582f7ed0c55b97e8fbe8174691aa7730ec8cc4f7ca5b807dee51383bd9f9924f6500825f106622dda463f diff --git a/swift-lang.spec b/swift-lang.spec index 909f426..5fb7a30 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-02-06-a -%global swiftgithash d07c25a -%global swiftgitdate 20190206 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-02-19-a +%global swiftgithash 817dff3 +%global swiftgitdate 20190219 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.33.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.38.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -76,7 +76,7 @@ correct programs easier for the developer. %package runtime -Summary: Runtime files for Swift +Summary: Runtime files for Swift programs %description runtime Runtime libraries for Swift programs @@ -114,7 +114,8 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo %patch2 -p0 # Fixes an issue with using std::thread in a vector in compiler-rt -%patch3 -p0 +%patch3 -p0 + %build export VERBOSE=1 @@ -211,6 +212,16 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Feb 20 2019 Ron Olson 5.0-0.38.20190219git817dff3 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-19-a +* Mon Feb 18 2019 Ron Olson 5.0-0.37.20190217git15be364 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-17-a +* Sun Feb 17 2019 Ron Olson 5.0-0.36.20190216git15be364 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-16-a +* Sat Feb 16 2019 Ron Olson 5.0-0.35.20190215git15be364 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-15-a +* Fri Feb 15 2019 Ron Olson 5.0-0.34.20190214git8d88441 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-14-a * Wed Feb 13 2019 Ron Olson 5.0-0.33.20190206gitd07c25a - Added patch to fix an issue with compiler-rt using std::thread in a vector * Fri Feb 08 2019 Ron Olson 5.0-0.32.20190206gitd07c25a From f4d027aab4e3bece14c7a201517cada2a81cefbb Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 5 Mar 2019 13:10:17 -0600 Subject: [PATCH 019/152] Updated to 2019-03-04 snapshot of Swift 5 --- sources | 26 +++++++++++++------------- swift-lang.spec | 26 ++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/sources b/sources index 3173f23..36cb662 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 2d1b42cdc2b09bf9a574f72c7c0135b9b7e1823878f63f7b013aca007e3eb96c1c7b4f74548e7ed7235fd4e1e9ebfb22879e1a0f05774d11ef028b973243f676 -SHA512 (cmark.tar.gz) = 359b6ab8ffdea9622ca8c307f00712d3d1853f58bc5369f4e424869dbfa79c26b02f14fde5ece0710e5471f605db66732498cd86c240927429e75dfd1ae73033 -SHA512 (corelibs-foundation.tar.gz) = 8bda0c1222dab49d0e219ba72a2e23fdf05fa1a178a11444bf7076f21c3e1f6e98df3bc271acfc82716c3867049076d7ec756c099a9c442e3d4cac92605b0cc0 -SHA512 (corelibs-libdispatch.tar.gz) = b439559620cacf8cf6bd8b79c7c5f57a1dcbaf597fe550709a8eba712e80473cc1b7587d5db99e18a6be330502215a9bc66e38329d987668fe0ec8951d5999fa -SHA512 (corelibs-xctest.tar.gz) = 09a5fcfd97e9fda2cbe4802afa1f69274451e058210b05aa26dd50d132fa614ff06155864c27ec7259313048050ade90afb229b9afc2546fc1b4b06cf41e1401 -SHA512 (llbuild.tar.gz) = 96ca43d8923e1aa634b71d272331f1f800da09adca11a7c7615b252bd23df6c6e05e221356cdc643ae98fa03838e195c8eda12c3fc1b4e3c9ba1cdedf8550f1c -SHA512 (lldb.tar.gz) = f279f22e6a4defabaa85c329ad96dbbba13c1ff56c9fc233628f3bb36c2a818d6f5d313ee8899acb1b39dcf9d28f8dd8346b9f7b5078a3923de1fe636642e690 -SHA512 (llvm.tar.gz) = febecff64ca52c52ecd03004298bae175740c56dbecbe5bd95a232191657d0f83126efdb9aaaab84cf6ad1ade67191f8efbc8614a4174cc70cda183c8e6e5151 -SHA512 (package-manager.tar.gz) = 730faa57e91cfb2a3fa790dc1deb191015ef12c928e2b21435e26f2b2a508f1e54fcc9702bf3e1a153308310083e39457287df77a22edb7a0a17d82f169a882a -SHA512 (swift-compiler-rt.tar.gz) = 1f98fa753d34bb7207f0688e553e3b4e5a639e35a3cfa2d748ed5d8fa2889c244668b7753491605f215dda9e48dad91e91b42db4e07501ada23571fa2e7b83ab -SHA512 (swift-integration-tests.tar.gz) = 00bb1d31542fb18e438c2f245bcbedf02a87f8e3d008ba47884dfc9cdcccafb20d80c073c31953164f6141a3bae6e2127d250715eba34ba039468c6ab1914417 -SHA512 (swift-xcode-playground-support.tar.gz) = c025017f166b864c56bbda39de2dbc7300a7b4029b019445d42f99f794e3bf1d051c32ba0dd0390e59b335aa8aa0ff03df328d0dfdf294bfbf85d0539ac62128 -SHA512 (swift.tar.gz) = 853211f597bdaf3df26ca88acf8a66e4b26e13b23cb582f7ed0c55b97e8fbe8174691aa7730ec8cc4f7ca5b807dee51383bd9f9924f6500825f106622dda463f +SHA512 (clang.tar.gz) = 94d276bdde16cdde7ffd31441341e9a5c1d00f7dcc1018a1a9a2a3b7ad953364c9159d8d008c4d6ca6d76dc596f9676f20ecd3761cc2e95320822c08d0382902 +SHA512 (cmark.tar.gz) = acae29fac433d44d39fbae1085293adb40db196e7aba60c0ec3b15f2278b9c56d18355b64afe4c7e8e67ce81d646f61a9b504af136373fc0ae7dca36a405fb37 +SHA512 (corelibs-foundation.tar.gz) = fe209ce135ec9320f27fdc4056644346fc1afd1056b1a9b24f5cc413719471613617c0ee12fea8f92d00e5ce40534cbce8588629cb9e690f7fec3c9939cd55f1 +SHA512 (corelibs-libdispatch.tar.gz) = 0eb8139ff02ebf1a13e03a596e54cfde315cc09a2fcb3cd12bb834e79f1801d48e05de53db79e5376627bebfe6b9393cc6b096c3fed7c0218f47e7806777499d +SHA512 (corelibs-xctest.tar.gz) = 7e496079609e10987ba4e8e40b736180450b62b60abc6bc8d904086057585f822fa2a35daf76d6ac3a0a62772af8c1e1a7ef5545ff1d38f917badff5fb33301b +SHA512 (llbuild.tar.gz) = 971c8b3a128857b417aaaa383a1856c8cba8cc635c322a84d4127b3c363d8edc3bec23edec9dd1df3e5cabfb75dc7a4d7033ef4ea693a5148ecb329e35904df0 +SHA512 (lldb.tar.gz) = f7ed021b8aa0cc28496ed715457e8a1facfd692eac8d3bf6795602d8ff23dc1ab0641541ca8f13fd010269a8012fc32c76a469b68700cdee1a3215c3255ebc5c +SHA512 (llvm.tar.gz) = 73f932cde4dac1191f634eddfd2c706245404df57c8a8173bf9ff6cb1ce2eddb3af9d7673c44b5b0ce09f67d785bcf5f8b873448a6b38f9e364bd4e48802b655 +SHA512 (package-manager.tar.gz) = db08fa34eeba82bce7b4cb1f6966d4902819eb24d22649e893b0319cbd44a36ec5b10525f25af83ec5ac6e1500c153ed8c17949fbc832fc7bea5b94b0e9e5d94 +SHA512 (swift-compiler-rt.tar.gz) = 1ad3689280a4a1efaa385095d7c514c21b5c1b46fd67ab0897c7ba6a883a619f5906bc2552f3f354afadeb450719349f8b6796ad6886cf94a5d27a00e948d45e +SHA512 (swift-integration-tests.tar.gz) = cb59e3529f977a563db59c43791fd65f0351118a1b7f94381eabaf38e241c70dc571ec48ba9707d8563285abf511aabfaba5db397c1593055954cf9e173c6f96 +SHA512 (swift-xcode-playground-support.tar.gz) = 101c76b63fd313538b3578f9e45193385eb8909c5e8925da46e4d3a6d2c3307d0e4fed6a64d0ab8b2044fdfe3d5732f990d7f642170a388e692fd815794c7bdd +SHA512 (swift.tar.gz) = 334252dbf80736fb1e72f8a5e4eb093b2f96335b5c7864947cf3433dca65df85507024a71a4ec31ba9cd8cc721dd1c2b4285ffb07f2b23980a96b6871f262e63 diff --git a/swift-lang.spec b/swift-lang.spec index 5fb7a30..4c62ea6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-02-19-a -%global swiftgithash 817dff3 -%global swiftgitdate 20190219 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-03-04-a +%global swiftgithash ad10379 +%global swiftgitdate 20190304 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.38.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.47.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -212,6 +212,24 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Tue Mar 05 2019 Ron Olson 5.0-0.47.20190304gitad10379 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-04-a +* Fri Mar 01 2019 Ron Olson 5.0-0.46.20190228gitfeacc3f +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a +* Wed Feb 27 2019 Ron Olson 5.0-0.45.20190226gitfa5d493 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-26-a +* Tue Feb 26 2019 Ron Olson 5.0-0.44.20190225gita8126fb +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-25-a +* Mon Feb 25 2019 Ron Olson 5.0-0.43.20190224gita8126fb +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-24-a +* Sun Feb 24 2019 Ron Olson 5.0-0.42.20190223gita8126fb +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-23-a +* Sat Feb 23 2019 Ron Olson 5.0-0.41.20190222gita24adaf +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-22-a +* Fri Feb 22 2019 Ron Olson 5.0-0.40.20190221git86a39df +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-21-a +* Thu Feb 21 2019 Ron Olson 5.0-0.39.20190220git817dff3 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-20-a * Wed Feb 20 2019 Ron Olson 5.0-0.38.20190219git817dff3 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-19-a * Mon Feb 18 2019 Ron Olson 5.0-0.37.20190217git15be364 From 49a09ac5224572b30ca16a068752bef6c71d9f8a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 15 Mar 2019 21:29:35 -0500 Subject: [PATCH 020/152] Working version of the 03-10-2019 version of Swift 5 --- gettid.patch | 20 ++++++++++++++++ no-ninja-build.patch | 7 +++--- sources | 26 ++++++++++----------- swift-lang.spec | 54 +++++++++++++++++++++++++++++++++++-------- swift-unwrapped.patch | 20 ++++++++++++++++ 5 files changed, 101 insertions(+), 26 deletions(-) create mode 100644 gettid.patch create mode 100644 swift-unwrapped.patch diff --git a/gettid.patch b/gettid.patch new file mode 100644 index 0000000..5be918b --- /dev/null +++ b/gettid.patch @@ -0,0 +1,20 @@ +--- swift-corelibs-libdispatch/src/queue.c.orig 2019-03-09 16:58:51.182875053 -0600 ++++ swift-corelibs-libdispatch/src/queue.c 2019-03-10 08:29:51.377391396 -0500 +@@ -926,7 +926,7 @@ + #ifdef SYS_gettid + DISPATCH_ALWAYS_INLINE + static inline pid_t +-gettid(void) ++__gettid(void) + { + return (pid_t)syscall(SYS_gettid); + } +@@ -1054,7 +1054,7 @@ + #else + pthread_setspecific(__dispatch_tsd_key, &__dispatch_tsd); + #endif /* defined(_WIN32) */ +- __dispatch_tsd.tid = gettid(); ++ __dispatch_tsd.tid = __gettid(); + } + #endif + diff --git a/no-ninja-build.patch b/no-ninja-build.patch index a6bfdb9..1aeb7a4 100644 --- a/no-ninja-build.patch +++ b/no-ninja-build.patch @@ -1,10 +1,11 @@ ---- 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 @@ +--- swift/utils/build-presets.ini.orig 2019-03-11 08:44:39.664264614 -0500 ++++ swift/utils/build-presets.ini 2019-03-11 08:52:18.038295456 -0500 +@@ -716,12 +716,9 @@ llbuild swiftpm xctest -libicu +-libcxx dash-dash diff --git a/sources b/sources index 36cb662..b49a19e 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 94d276bdde16cdde7ffd31441341e9a5c1d00f7dcc1018a1a9a2a3b7ad953364c9159d8d008c4d6ca6d76dc596f9676f20ecd3761cc2e95320822c08d0382902 -SHA512 (cmark.tar.gz) = acae29fac433d44d39fbae1085293adb40db196e7aba60c0ec3b15f2278b9c56d18355b64afe4c7e8e67ce81d646f61a9b504af136373fc0ae7dca36a405fb37 -SHA512 (corelibs-foundation.tar.gz) = fe209ce135ec9320f27fdc4056644346fc1afd1056b1a9b24f5cc413719471613617c0ee12fea8f92d00e5ce40534cbce8588629cb9e690f7fec3c9939cd55f1 -SHA512 (corelibs-libdispatch.tar.gz) = 0eb8139ff02ebf1a13e03a596e54cfde315cc09a2fcb3cd12bb834e79f1801d48e05de53db79e5376627bebfe6b9393cc6b096c3fed7c0218f47e7806777499d -SHA512 (corelibs-xctest.tar.gz) = 7e496079609e10987ba4e8e40b736180450b62b60abc6bc8d904086057585f822fa2a35daf76d6ac3a0a62772af8c1e1a7ef5545ff1d38f917badff5fb33301b -SHA512 (llbuild.tar.gz) = 971c8b3a128857b417aaaa383a1856c8cba8cc635c322a84d4127b3c363d8edc3bec23edec9dd1df3e5cabfb75dc7a4d7033ef4ea693a5148ecb329e35904df0 -SHA512 (lldb.tar.gz) = f7ed021b8aa0cc28496ed715457e8a1facfd692eac8d3bf6795602d8ff23dc1ab0641541ca8f13fd010269a8012fc32c76a469b68700cdee1a3215c3255ebc5c -SHA512 (llvm.tar.gz) = 73f932cde4dac1191f634eddfd2c706245404df57c8a8173bf9ff6cb1ce2eddb3af9d7673c44b5b0ce09f67d785bcf5f8b873448a6b38f9e364bd4e48802b655 -SHA512 (package-manager.tar.gz) = db08fa34eeba82bce7b4cb1f6966d4902819eb24d22649e893b0319cbd44a36ec5b10525f25af83ec5ac6e1500c153ed8c17949fbc832fc7bea5b94b0e9e5d94 -SHA512 (swift-compiler-rt.tar.gz) = 1ad3689280a4a1efaa385095d7c514c21b5c1b46fd67ab0897c7ba6a883a619f5906bc2552f3f354afadeb450719349f8b6796ad6886cf94a5d27a00e948d45e -SHA512 (swift-integration-tests.tar.gz) = cb59e3529f977a563db59c43791fd65f0351118a1b7f94381eabaf38e241c70dc571ec48ba9707d8563285abf511aabfaba5db397c1593055954cf9e173c6f96 -SHA512 (swift-xcode-playground-support.tar.gz) = 101c76b63fd313538b3578f9e45193385eb8909c5e8925da46e4d3a6d2c3307d0e4fed6a64d0ab8b2044fdfe3d5732f990d7f642170a388e692fd815794c7bdd -SHA512 (swift.tar.gz) = 334252dbf80736fb1e72f8a5e4eb093b2f96335b5c7864947cf3433dca65df85507024a71a4ec31ba9cd8cc721dd1c2b4285ffb07f2b23980a96b6871f262e63 +SHA512 (clang.tar.gz) = 8da85279aa0748162409053a56cba941da011c20bdb33ceca4f15e965f827c57b694b87bd6973a263891f7cc994896d1f116ddc44f7768fcdcdd98cf46910f8b +SHA512 (cmark.tar.gz) = b766f59b1e775799919e2e489fd48b18eb8a279a4de80a894749393893779c48ec160901460270370b92a6363be189679938990ae2e9a109c273ba62cb8040d9 +SHA512 (corelibs-foundation.tar.gz) = f37bca9da90f96cff0fad6c629db69008a2108f64810901dcdcaaeae6f176865386d938310a1e445b4ad442813443a29bad49a362515ae8473aac844e7f52a99 +SHA512 (corelibs-libdispatch.tar.gz) = fb384b2e7e12c9952849d0e4f209d10df6dc8b8d43c3468bad34edb37b02a0e84e9668292078d8ff44a4a2bf65b7ee4944be37124c072888acc336433f8f9a15 +SHA512 (corelibs-xctest.tar.gz) = 3ed9506e6551b7dbe2a502698b723a3f77584c9096bfe8a3bf98f864aa378ebb52ff3dd7b76d338dba47566beb04246e881ebdea48fffc1c00ac727986743d44 +SHA512 (llbuild.tar.gz) = bc6fa293af18cbdd5ccadc1da702bf2a73060289c0b06b4f4e34fb542b76f8954ac2b313d739451771d1effb7b3e38e22976a2a605105a8f07bdb4a546f9e4f5 +SHA512 (lldb.tar.gz) = abe27d07655809415c5649951f0818be8f15350001e6b54174aebb004e3d33e20c25f67d9611fa8dc3e7d16d4a578c0f29388db5070cca4c8d61db3be42217a8 +SHA512 (llvm.tar.gz) = ac4a5983af1623b4ff10819dfa34978ed92235bfe39ea67e6fcf4cd63801fc49ff045d3f09a5b2bfc3a285d7bedbc22d40924182e432105e9568522a631228f2 +SHA512 (package-manager.tar.gz) = f78de7b96f6e3ca88c966e03adbf19df25de2c3a2c58bc4b0dc55475ab5cdeb7e83839f24a0aa4a7b8a493c45575df4b11f3de7ee1cbf865b5d3809cf34bb885 +SHA512 (swift-compiler-rt.tar.gz) = dae2ef89b156a410043c1be9001c8d39fc37cff4f265868bdd10570b8a92d99c19e682e1a12ed2026a3b8cadfeee2d322b86dd5b8846cc4ea92ae989d35943e8 +SHA512 (swift-integration-tests.tar.gz) = 8f243f218563d28c59aff5f372ab75191d675112c9c91b192a0cc7cc395db4530119e906ded24e7f69cb0f8fa4d58cff63cc369b11596d6f7f2027c77728ff57 +SHA512 (swift-xcode-playground-support.tar.gz) = 6fe16398dbd102fbdb65be86d75ad49b66fccbdf645dc8eaa05c145c179dc0456f6299416a66ff3c11acaa51c2378e7a289842fc02a1641ab68c7bbb8f9c08c8 +SHA512 (swift.tar.gz) = 522a2cb2ad9911aa307c61719ccb51c4787df2788b3c4411788c4b5fd2c905ac508227ce1a008b317a5891cbd96ff7b075247f39a38a102ac7b06313b0e9d547 diff --git a/swift-lang.spec b/swift-lang.spec index 4c62ea6..1ba511e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-03-04-a -%global swiftgithash ad10379 -%global swiftgitdate 20190304 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a +%global swiftgithash 4d6e741 +%global swiftgitdate 20190310 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.47.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.50.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -24,12 +24,14 @@ Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag} Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz Source13: swift-lang.conf -Source14: swift-lang-runtime.conf +Source14: swift-lang-runtime.conf Patch0: change-lldb-location.patch -Patch1: no-ninja-build.patch -Patch2: clangloc.patch +Patch1: no-ninja-build.patch +Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch +Patch4: gettid.patch +Patch5: swift-unwrapped.patch BuildRequires: clang BuildRequires: cmake @@ -51,14 +53,19 @@ BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel +# python2-sphinx was removed after f30 +%if 0%{?fedora} > 30 +BuildRequires: python3-sphinx +%else BuildRequires: python2-sphinx +%endif BuildRequires: ninja-build Requires: glibc-devel Requires: clang -Requires: ncurses-devel -Requires: ncurses-compat-libs -Requires: %{name}-runtime = %{version}-%{release} +Requires: ncurses-devel +Requires: ncurses-compat-libs +Requires: %{name}-runtime = %{version}-%{release} ExclusiveArch: x86_64 aarch64 @@ -116,6 +123,14 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Fixes an issue with using std::thread in a vector in compiler-rt %patch3 -p0 +# Fixes issue with local, static copy of gettid() function colliding with +# the glibc version +%patch4 -p0 + +# Patch for handling optional issue with pthreads functions in Swift file +# in the package mananger +%patch5 -p0 + %build export VERBOSE=1 @@ -160,6 +175,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 +rm %{buildroot}/usr/lib/swift/clang +cp -r %{_builddir}/usr/lib/clang %{buildroot}/usr/lib/swift +ln -fs /usr/lib/swift/clang/7.0.0/include %{buildroot}/usr/lib/swift/clang/include +ln -fs /usr/lib/swift/clang/7.0.0/lib %{buildroot}/usr/lib/swift/clang/lib +ln -fs /usr/lib/swift/clang/7.0.0/share %{buildroot}/usr/lib/swift/clang/share 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 @@ -212,6 +232,20 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- Modules did not work properly in the REPL due to additional lib path; + fixed with symlinks to the lower directory structures +* Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- python2-sphinx was removed from Fedora after 30 so it will use the python3 + version +* Thu Mar 14 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- Fixed issues introduced by upstream changes +* Mon Mar 11 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a +* Thu Mar 07 2019 Ron Olson 5.0-0.49.20190306git5834830 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-06-a +* Wed Mar 06 2019 Ron Olson 5.0-0.48.20190305git5834830 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-05-a * Tue Mar 05 2019 Ron Olson 5.0-0.47.20190304gitad10379 - Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-04-a * Fri Mar 01 2019 Ron Olson 5.0-0.46.20190228gitfeacc3f diff --git a/swift-unwrapped.patch b/swift-unwrapped.patch new file mode 100644 index 0000000..0f88eb0 --- /dev/null +++ b/swift-unwrapped.patch @@ -0,0 +1,20 @@ +--- swiftpm/Sources/Basic/Process.swift.orig 2019-03-13 14:27:25.426760197 -0500 ++++ swiftpm/Sources/Basic/Process.swift 2019-03-13 14:28:45.656837626 -0500 +@@ -327,7 +327,7 @@ + let devNull = strdup("/dev/null") + defer { free(devNull) } + // Open /dev/null as stdin. +- posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0) ++ posix_spawn_file_actions_addopen(&fileActions, 0, devNull!, O_RDONLY, 0) + + var outputPipe: [Int32] = [0, 0] + var stderrPipe: [Int32] = [0, 0] +@@ -350,7 +350,7 @@ + + let argv = CStringArray(arguments) + let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" })) +- let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray) ++ let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray) + + guard rv == 0 else { + throw SystemError.posix_spawn(rv, arguments) From 2f4b2bb4da48376f224dd1f75f7d865ae7f38a24 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 23 Mar 2019 14:13:49 -0500 Subject: [PATCH 021/152] Added patch to work around CMake 3.14 issue --- no-inplace-copy.patch | 15 +++++++++++++++ swift-lang.spec | 10 ++++++++++ 2 files changed, 25 insertions(+) create mode 100644 no-inplace-copy.patch diff --git a/no-inplace-copy.patch b/no-inplace-copy.patch new file mode 100644 index 0000000..585293b --- /dev/null +++ b/no-inplace-copy.patch @@ -0,0 +1,15 @@ +--- swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake.orig 2019-03-22 13:10:16.930540857 -0500 ++++ swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake 2019-03-22 15:48:46.960621151 -0500 +@@ -139,12 +139,6 @@ + ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources + COMMAND + ${CMAKE_COMMAND} -E copy ${AST_RESOURCES} ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources) +- else() +- add_custom_command(TARGET +- ${target} +- POST_BUILD +- COMMAND +- ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}) + endif() + endfunction() + diff --git a/swift-lang.spec b/swift-lang.spec index 1ba511e..d906443 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -32,6 +32,7 @@ Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: gettid.patch Patch5: swift-unwrapped.patch +Patch6: no-inplace-copy.patch BuildRequires: clang BuildRequires: cmake @@ -131,6 +132,10 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # in the package mananger %patch5 -p0 +# Patch to handle library being copied to same directory; CMake 3.14 zeros +# out the file +%patch6 -p0 + %build export VERBOSE=1 @@ -232,6 +237,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Mar 22 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- The swift-corelibs-xctest library was being zeroed out due to issue with + CMake 3.14 where it was being copied into the same directory. A bug + report has been filed with CMake but until it's resolved, the cmake file + has been patched to not perform the copy. * Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 - Modules did not work properly in the REPL due to additional lib path; fixed with symlinks to the lower directory structures From f5775c938270129d432408fff4c349780f30ff2f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 25 Mar 2019 21:11:21 -0500 Subject: [PATCH 022/152] Updated to Swift 5.0-RELEASE --- gettid.patch | 20 -------------------- sources | 26 +++++++++++++------------- swift-lang.spec | 26 +++++++++++++------------- 3 files changed, 26 insertions(+), 46 deletions(-) delete mode 100644 gettid.patch diff --git a/gettid.patch b/gettid.patch deleted file mode 100644 index 5be918b..0000000 --- a/gettid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- swift-corelibs-libdispatch/src/queue.c.orig 2019-03-09 16:58:51.182875053 -0600 -+++ swift-corelibs-libdispatch/src/queue.c 2019-03-10 08:29:51.377391396 -0500 -@@ -926,7 +926,7 @@ - #ifdef SYS_gettid - DISPATCH_ALWAYS_INLINE - static inline pid_t --gettid(void) -+__gettid(void) - { - return (pid_t)syscall(SYS_gettid); - } -@@ -1054,7 +1054,7 @@ - #else - pthread_setspecific(__dispatch_tsd_key, &__dispatch_tsd); - #endif /* defined(_WIN32) */ -- __dispatch_tsd.tid = gettid(); -+ __dispatch_tsd.tid = __gettid(); - } - #endif - diff --git a/sources b/sources index b49a19e..43904bb 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 8da85279aa0748162409053a56cba941da011c20bdb33ceca4f15e965f827c57b694b87bd6973a263891f7cc994896d1f116ddc44f7768fcdcdd98cf46910f8b -SHA512 (cmark.tar.gz) = b766f59b1e775799919e2e489fd48b18eb8a279a4de80a894749393893779c48ec160901460270370b92a6363be189679938990ae2e9a109c273ba62cb8040d9 -SHA512 (corelibs-foundation.tar.gz) = f37bca9da90f96cff0fad6c629db69008a2108f64810901dcdcaaeae6f176865386d938310a1e445b4ad442813443a29bad49a362515ae8473aac844e7f52a99 -SHA512 (corelibs-libdispatch.tar.gz) = fb384b2e7e12c9952849d0e4f209d10df6dc8b8d43c3468bad34edb37b02a0e84e9668292078d8ff44a4a2bf65b7ee4944be37124c072888acc336433f8f9a15 -SHA512 (corelibs-xctest.tar.gz) = 3ed9506e6551b7dbe2a502698b723a3f77584c9096bfe8a3bf98f864aa378ebb52ff3dd7b76d338dba47566beb04246e881ebdea48fffc1c00ac727986743d44 -SHA512 (llbuild.tar.gz) = bc6fa293af18cbdd5ccadc1da702bf2a73060289c0b06b4f4e34fb542b76f8954ac2b313d739451771d1effb7b3e38e22976a2a605105a8f07bdb4a546f9e4f5 -SHA512 (lldb.tar.gz) = abe27d07655809415c5649951f0818be8f15350001e6b54174aebb004e3d33e20c25f67d9611fa8dc3e7d16d4a578c0f29388db5070cca4c8d61db3be42217a8 -SHA512 (llvm.tar.gz) = ac4a5983af1623b4ff10819dfa34978ed92235bfe39ea67e6fcf4cd63801fc49ff045d3f09a5b2bfc3a285d7bedbc22d40924182e432105e9568522a631228f2 -SHA512 (package-manager.tar.gz) = f78de7b96f6e3ca88c966e03adbf19df25de2c3a2c58bc4b0dc55475ab5cdeb7e83839f24a0aa4a7b8a493c45575df4b11f3de7ee1cbf865b5d3809cf34bb885 -SHA512 (swift-compiler-rt.tar.gz) = dae2ef89b156a410043c1be9001c8d39fc37cff4f265868bdd10570b8a92d99c19e682e1a12ed2026a3b8cadfeee2d322b86dd5b8846cc4ea92ae989d35943e8 -SHA512 (swift-integration-tests.tar.gz) = 8f243f218563d28c59aff5f372ab75191d675112c9c91b192a0cc7cc395db4530119e906ded24e7f69cb0f8fa4d58cff63cc369b11596d6f7f2027c77728ff57 -SHA512 (swift-xcode-playground-support.tar.gz) = 6fe16398dbd102fbdb65be86d75ad49b66fccbdf645dc8eaa05c145c179dc0456f6299416a66ff3c11acaa51c2378e7a289842fc02a1641ab68c7bbb8f9c08c8 -SHA512 (swift.tar.gz) = 522a2cb2ad9911aa307c61719ccb51c4787df2788b3c4411788c4b5fd2c905ac508227ce1a008b317a5891cbd96ff7b075247f39a38a102ac7b06313b0e9d547 +SHA512 (clang.tar.gz) = 16ed0702dfa15d51b6e33aced2ced3cc56fe2068bcaecf5a81de610f2131dbe78487b5fbbbb048a9b37a74e824bb8f6bb0f6cc37fdfe0659a6f810f248825399 +SHA512 (cmark.tar.gz) = d2ce237e9d151cca310028d35845392508656311a063debdd1e46b4b854a110f4b764e37ad3385bd45a4e723477146c8e19238542bfe1c766a82cc5292d08405 +SHA512 (corelibs-foundation.tar.gz) = 255c7e026265334d98e9d62e3e51e4d4fecd55e8cc15610811db1c5353e2acde62fcc2a3f5932c73d2e8cd139e88a567e02ff77fd05a31ab48270f12de6c2980 +SHA512 (corelibs-libdispatch.tar.gz) = b36e1fd5904f1e499005bcfd6aa1fd2761e0734df29ec1a989484fc0e15d65d8986d076d2be612c352789928148b28ffd6450c9629a6fb1a6a1af986e7062d82 +SHA512 (corelibs-xctest.tar.gz) = 8632367a6123627d4019169984322e4ee5c35feca75cca48ee27368a5534181388baa935255d931f3f3cb71f381535b2d2c172ddec26a8a31e7c20ae783a05d4 +SHA512 (llbuild.tar.gz) = d6f43fbcb1cc3db08124bc1640ff50616ca9aa15828abae7c2be9a92085ed74796bc4b00920120a1828c414d56a114b201fc15ea5f044aa586bb7144502e2747 +SHA512 (lldb.tar.gz) = d65b2cada8097522d2666363d4b29212bec15c77c8eaef973f98c24de6b11809f10af1422ee6a4b4b96d95cbf48ade23435e945dcaa83bde7bebc1593ee0aa48 +SHA512 (llvm.tar.gz) = 8a87d9f0d517f410509a48c5fb2311558f3eeca2b2e09a32328fc9cbc1328cf04672590dbfe2eb3bb7039d531d30ddfbcc3952d637ea35d25b9874df03aae33e +SHA512 (package-manager.tar.gz) = 57d7c150ef5883bfbac98719fe288d42cd103c4e8ab9e82fd598a4060479414c48c1886494376eaa3995c47fd3be36e4b904bbea6fec60ab1e062c0e2d169f6e +SHA512 (swift-compiler-rt.tar.gz) = 82c0031b0edf1749b2a7e6d4757cd41942afb1aec02568a88d003161a19edb223244a12e5bf5cd71b9c5fd4bf39db855fb263bdee932f2236048aed3f1aba70b +SHA512 (swift-integration-tests.tar.gz) = 31ec972e3a4724673705d76d5afe17d527f3dfa914ccaedb289cbee9846a8cf118d376f06b0c2188afc9fe531e8aaccf5ba3baff2f3ae6c66721645699d36491 +SHA512 (swift-xcode-playground-support.tar.gz) = 43e0c2e2ba41361fb5067dd07467dd6727b6e3d071df49020452f446badd2dc37462612818d48227d684ebf0141f74a3583821fe86d6168404a51cc88b29ff48 +SHA512 (swift.tar.gz) = 5beb6827ed62349a46df05eef37e33ea8cc0fd1345af60086392873d593c78a5e1e45c7a8e374f01db835b663f7a7aa9ce935ce68486bc9940c0a4f5d19115f7 diff --git a/swift-lang.spec b/swift-lang.spec index d906443..787a9a5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a -%global swiftgithash 4d6e741 -%global swiftgitdate 20190310 +%global swifttag 5.0-RELEASE +%global swiftgithash ba33f9e +%global swiftgitdate 20190325 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.50.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.52.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -30,9 +30,8 @@ Patch0: change-lldb-location.patch Patch1: no-ninja-build.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch -Patch4: gettid.patch -Patch5: swift-unwrapped.patch -Patch6: no-inplace-copy.patch +Patch4: swift-unwrapped.patch +Patch5: no-inplace-copy.patch BuildRequires: clang BuildRequires: cmake @@ -124,17 +123,13 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Fixes an issue with using std::thread in a vector in compiler-rt %patch3 -p0 -# Fixes issue with local, static copy of gettid() function colliding with -# the glibc version -%patch4 -p0 - # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger -%patch5 -p0 +%patch4 -p0 # Patch to handle library being copied to same directory; CMake 3.14 zeros # out the file -%patch6 -p0 +%patch5 -p0 %build @@ -237,6 +232,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Mar 25 2019 Ron Olson 5.0-0.52.20190325gitba33f9e +- Updated to swift-5.0-RELEASE +* Mon Mar 25 2019 Ron Olson 5.0-0.51.20190324git130a414 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-24-a, removed _gettid + patch as the changed were merged upstream * Fri Mar 22 2019 Ron Olson 5.0-0.50.20190310git4d6e741 - The swift-corelibs-xctest library was being zeroed out due to issue with CMake 3.14 where it was being copied into the same directory. A bug From 731fbf864063143fa073348de4a041abc02a282a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 3 Apr 2019 09:41:35 -0500 Subject: [PATCH 023/152] Updated spec file to handle upgrade from 4.2 to 5.0 --- swift-lang.spec | 63 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 787a9a5..ecbf9ce 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -4,9 +4,10 @@ %global swiftgitdate 20190325 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* + Name: swift-lang Version: 5.0 -Release: 0.52.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.53.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -67,6 +68,11 @@ Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name}-runtime < %{version}-%{release} + ExclusiveArch: x86_64 aarch64 @@ -85,6 +91,12 @@ correct programs easier for the developer. %package runtime Summary: Runtime files for Swift programs +Provides: %{name}-runtime = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name}-runtime < %{version}-%{release} + + %description runtime Runtime libraries for Swift programs @@ -198,11 +210,39 @@ mkdir -p %{buildroot}%{_mandir}/man1 install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1 +# This is necessary because in Swift 4 the directories +# under clang were actual directories. In 5 Apple added +# an additional layer of indirection, to the compiler +# version, with the previous directories relocated there. +# Apparently there is an issue with rpm being able to +# replace directories with something else (in this case, +# symlinks), thus making this pre-installation step +# necessary when upgrading from 4.x to 5. +%pretrans -p +path = "/usr/lib/swift/clang" +subdirs = {"include", "lib"} +for _, dir in ipairs(subdirs) do + fullDir = path .. "/" .. dir + st = posix.stat(fullDir) + if st and st.type == "directory" then + status = os.rename(fullDir, fullDir .. ".rpmmoved") + if not status then + suffix = 0 + while not status do + suffix = suffix + 1 + status = os.rename(fullDir .. ".rpmmoved", fullDir .. ".rpmmoved." .. suffix) + end + os.rename(fullDir, fullDir .. ".rpmmoved") + end + end +end + %files %license swift/LICENSE.txt %{_bindir}/swift* %{_mandir}/man1/* -/usr/lib/swift/ +%ghost /usr/lib/swift/clang/include.rpmmoved +%ghost /usr/lib/swift/clang/lib.rpmmoved /usr/lib/swift-lldb/ /usr/lib/swift/Block/ /usr/lib/swift/CoreFoundation/ @@ -212,18 +252,21 @@ 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 %files runtime -/usr/lib/swift/linux/* +%ghost /usr/lib/swift/clang/include.rpmmoved +%ghost /usr/lib/swift/clang/lib.rpmmoved +%dir /usr/lib/swift +/usr/lib/swift/linux/ +%ifarch aarch64 +/usr/lib/swift/linux/aarch64/ +%else +/usr/lib/swift/linux/x86_64/ +%endif %{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf @@ -232,6 +275,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Mar 28 2019 Ron Olson 5.0-0.53.20190325gitba33f9e +- Modified spec file to handle upgrades from 4.2 to 5.0. * Mon Mar 25 2019 Ron Olson 5.0-0.52.20190325gitba33f9e - Updated to swift-5.0-RELEASE * Mon Mar 25 2019 Ron Olson 5.0-0.51.20190324git130a414 @@ -240,7 +285,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m * Fri Mar 22 2019 Ron Olson 5.0-0.50.20190310git4d6e741 - The swift-corelibs-xctest library was being zeroed out due to issue with CMake 3.14 where it was being copied into the same directory. A bug - report has been filed with CMake but until it's resolved, the cmake file + report has been filed with CMake but until it is resolved, the cmake file has been patched to not perform the copy. * Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 - Modules did not work properly in the REPL due to additional lib path; From 8e1d00b3d69e4e74edbffa2b00f95893894b5553 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 18 Apr 2019 18:09:04 -0500 Subject: [PATCH 024/152] Modified spec to fix issue with new installs --- swift-lang.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index ecbf9ce..5c47450 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.0 -Release: 0.53.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.54.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -68,11 +68,6 @@ Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Conflicts: %{name}-runtime < %{version}-%{release} - ExclusiveArch: x86_64 aarch64 @@ -91,11 +86,6 @@ correct programs easier for the developer. %package runtime Summary: Runtime files for Swift programs -Provides: %{name}-runtime = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Conflicts: %{name}-runtime < %{version}-%{release} - %description runtime Runtime libraries for Swift programs @@ -275,6 +265,8 @@ end %changelog +* Thu Apr 18 2019 Ron Olson 5.0-0.54.20190325gitba33f9e +- And modified it again to allow new installations * Thu Mar 28 2019 Ron Olson 5.0-0.53.20190325gitba33f9e - Modified spec file to handle upgrades from 4.2 to 5.0. * Mon Mar 25 2019 Ron Olson 5.0-0.52.20190325gitba33f9e From 8c36c7a0682ad5e2075d223398792a02f5cbc23d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 19 Apr 2019 09:24:49 -0500 Subject: [PATCH 025/152] Updated to swift-5.0.1-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 13 ++++++++----- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/sources b/sources index 43904bb..02b2a41 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 16ed0702dfa15d51b6e33aced2ced3cc56fe2068bcaecf5a81de610f2131dbe78487b5fbbbb048a9b37a74e824bb8f6bb0f6cc37fdfe0659a6f810f248825399 -SHA512 (cmark.tar.gz) = d2ce237e9d151cca310028d35845392508656311a063debdd1e46b4b854a110f4b764e37ad3385bd45a4e723477146c8e19238542bfe1c766a82cc5292d08405 -SHA512 (corelibs-foundation.tar.gz) = 255c7e026265334d98e9d62e3e51e4d4fecd55e8cc15610811db1c5353e2acde62fcc2a3f5932c73d2e8cd139e88a567e02ff77fd05a31ab48270f12de6c2980 -SHA512 (corelibs-libdispatch.tar.gz) = b36e1fd5904f1e499005bcfd6aa1fd2761e0734df29ec1a989484fc0e15d65d8986d076d2be612c352789928148b28ffd6450c9629a6fb1a6a1af986e7062d82 -SHA512 (corelibs-xctest.tar.gz) = 8632367a6123627d4019169984322e4ee5c35feca75cca48ee27368a5534181388baa935255d931f3f3cb71f381535b2d2c172ddec26a8a31e7c20ae783a05d4 -SHA512 (llbuild.tar.gz) = d6f43fbcb1cc3db08124bc1640ff50616ca9aa15828abae7c2be9a92085ed74796bc4b00920120a1828c414d56a114b201fc15ea5f044aa586bb7144502e2747 -SHA512 (lldb.tar.gz) = d65b2cada8097522d2666363d4b29212bec15c77c8eaef973f98c24de6b11809f10af1422ee6a4b4b96d95cbf48ade23435e945dcaa83bde7bebc1593ee0aa48 -SHA512 (llvm.tar.gz) = 8a87d9f0d517f410509a48c5fb2311558f3eeca2b2e09a32328fc9cbc1328cf04672590dbfe2eb3bb7039d531d30ddfbcc3952d637ea35d25b9874df03aae33e -SHA512 (package-manager.tar.gz) = 57d7c150ef5883bfbac98719fe288d42cd103c4e8ab9e82fd598a4060479414c48c1886494376eaa3995c47fd3be36e4b904bbea6fec60ab1e062c0e2d169f6e -SHA512 (swift-compiler-rt.tar.gz) = 82c0031b0edf1749b2a7e6d4757cd41942afb1aec02568a88d003161a19edb223244a12e5bf5cd71b9c5fd4bf39db855fb263bdee932f2236048aed3f1aba70b -SHA512 (swift-integration-tests.tar.gz) = 31ec972e3a4724673705d76d5afe17d527f3dfa914ccaedb289cbee9846a8cf118d376f06b0c2188afc9fe531e8aaccf5ba3baff2f3ae6c66721645699d36491 -SHA512 (swift-xcode-playground-support.tar.gz) = 43e0c2e2ba41361fb5067dd07467dd6727b6e3d071df49020452f446badd2dc37462612818d48227d684ebf0141f74a3583821fe86d6168404a51cc88b29ff48 -SHA512 (swift.tar.gz) = 5beb6827ed62349a46df05eef37e33ea8cc0fd1345af60086392873d593c78a5e1e45c7a8e374f01db835b663f7a7aa9ce935ce68486bc9940c0a4f5d19115f7 +SHA512 (clang.tar.gz) = 57fb577f3cd3f76def161ea7ddd1f6fa41cc13085cfc648e3ba45f0b6c0e22beb2c950b8bfb00e95aa7967eda8badafa5ac630cd89cdb688fd3931a367a2f63c +SHA512 (cmark.tar.gz) = c64487dade556e09a237377aa6ea4d760c12eaad4b03a890e2560f4fb83b433581489f6fd1188aa1a5c6b91dec9c9f736a954cc7c0235f8e5c8783e646a799a2 +SHA512 (corelibs-foundation.tar.gz) = a16c797ffebc3001399544611b9d9830a6c9d7dae71691ed2756626c5a09824aa609dcbb635880fb43fe1dca9d5437b7437fba66659540ff668ca7fbbeea11e1 +SHA512 (corelibs-libdispatch.tar.gz) = 5f2f1108cac5b8b70429ac9cf5f66d19335e00d022e826430578aea0edc5c0fb8b6af12346909b5120bbe392150ab897683c8987c169ad090d1e8c8ffbe75f18 +SHA512 (corelibs-xctest.tar.gz) = 15759202be95d0e53a2b10a715bb7acac1e8ce6d157d6766aa22df50f3c6eabc19ea76988630d2199a2702cdcb8bf9d8ad08f890c0c4dd3edfdcb8ffef2a01e0 +SHA512 (llbuild.tar.gz) = b2212989635e362691435c19a2b6c6748a40282ef7c80e0cd3440cc6d4debb06252bb944df6afb84f4007438480e91866d07795284c1a7248ca454111be57fdf +SHA512 (lldb.tar.gz) = 05178cafaf3cbf09c4aa0f50a5580c50d63583153eaf9f7ca0952e8cd80e961d315d5c9e6076750f7bd4c4761303ad6ca30b8bc53d3df7be4c0ed6c295014e55 +SHA512 (llvm.tar.gz) = 498c3fb2c8c693dbba8c6e2fe42aef34539e70eedd72f42bd1156c0cd408c3c9b4e3334d2fc53b3cee5461c17b754e85ca1a6551b235941e9e551c41c408db94 +SHA512 (package-manager.tar.gz) = 6d69732c74d68507b868a5126f401a84c9ced5750eb6380c7861cc347b13e7d076d11ef03587d2b3879f905583565d50c916b70c44cfeb3e6a80daf7c47df7a1 +SHA512 (swift-compiler-rt.tar.gz) = 65593bac29914cf500c95556e41e02c6d2a3ecf8df129799fe37cb0e9cfa200391e923dcebc923111fbe415fa57e0300720a4d412f540bb9ec815bd9e75774ef +SHA512 (swift-integration-tests.tar.gz) = 5d60b05cd590a89db0a9b5e3c39df4528548c08ea87d22d4af661eda699f887bcc12ad4df9aca129b72f6dc15b91bc023eae00660fbcdee838acf041bc5d34b1 +SHA512 (swift-xcode-playground-support.tar.gz) = 89471fefd1fa93079672b8dbbe3d65e25d82fa61811e44efc97aced33e5416c912d8d22e6b09ba42fc4454d5d6181dd9fcd0953b1decb2ac2e7d989b3b90b6f7 +SHA512 (swift.tar.gz) = 52f879e0e9268910009c548c8bec2db71fba8719850f8dff1a29efd67f948c24512391350067f947183411ab1cbd785c2d5dac5e08f991cfdccc0d1645d9d38e diff --git a/swift-lang.spec b/swift-lang.spec index 5c47450..e2083ae 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global swifttag 5.0-RELEASE -%global swiftgithash ba33f9e -%global swiftgitdate 20190325 +%global swifttag 5.0.1-RELEASE +%global swiftgithash 604054e +%global swiftgitdate 20190418 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.0 -Release: 0.54.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.0.1 +Release: 0.55.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -227,6 +227,7 @@ for _, dir in ipairs(subdirs) do end end + %files %license swift/LICENSE.txt %{_bindir}/swift* @@ -265,6 +266,8 @@ end %changelog +* Thu Apr 18 2019 Ron Olson 5.0.1-0.55.20190418git604054e +- Updated to swift-5.0.1-RELEASE * Thu Apr 18 2019 Ron Olson 5.0-0.54.20190325gitba33f9e - And modified it again to allow new installations * Thu Mar 28 2019 Ron Olson 5.0-0.53.20190325gitba33f9e From 923138010e9be41aa2cb86a6a9434f683f3c48a7 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 2 Jul 2019 12:52:43 -0500 Subject: [PATCH 026/152] Added patch to remove reference to sys/sysctl.h for Rawhide --- nosysctl.patch | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- swift-lang.spec | 7 +++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 nosysctl.patch diff --git a/nosysctl.patch b/nosysctl.patch new file mode 100644 index 0000000..adcf59d --- /dev/null +++ b/nosysctl.patch @@ -0,0 +1,83 @@ +diff -Naur ./swift-corelibs-libdispatch-orig/src/internal.h ./swift-corelibs-libdispatch/src/internal.h +--- ./swift-corelibs-libdispatch-orig/src/internal.h 2019-07-02 10:24:46.257356055 -0500 ++++ ./swift-corelibs-libdispatch/src/internal.h 2019-07-02 10:25:26.384952870 -0500 +@@ -273,7 +273,6 @@ + #ifdef __ANDROID__ + #include + #else +-#include + #include + #endif /* __ANDROID__ */ + #include +diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_apply.c ./swift-corelibs-libdispatch/tests/dispatch_apply.c +--- ./swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2019-07-02 10:24:46.224354738 -0500 ++++ ./swift-corelibs-libdispatch/tests/dispatch_apply.c 2019-07-02 10:26:18.882939254 -0500 +@@ -31,8 +31,6 @@ + #include + #ifdef __ANDROID__ + #include +-#else +-#include + #endif /* __ANDROID__ */ + + #include +diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_concur.c ./swift-corelibs-libdispatch/tests/dispatch_concur.c +--- ./swift-corelibs-libdispatch-orig/tests/dispatch_concur.c 2019-07-02 10:24:46.224354738 -0500 ++++ ./swift-corelibs-libdispatch/tests/dispatch_concur.c 2019-07-02 10:26:37.290635752 -0500 +@@ -28,8 +28,6 @@ + #include + #ifdef __ANDROID__ + #include +-#else +-#include + #endif /* __ANDROID__ */ + + #include +diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_priority.c ./swift-corelibs-libdispatch/tests/dispatch_priority.c +--- ./swift-corelibs-libdispatch-orig/tests/dispatch_priority.c 2019-07-02 10:24:46.226354818 -0500 ++++ ./swift-corelibs-libdispatch/tests/dispatch_priority.c 2019-07-02 10:26:49.918113542 -0500 +@@ -32,8 +32,6 @@ + #include + #ifdef __ANDROID__ + #include +-#else +-#include + #endif /* __ANDROID__ */ + + #include +diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_readsync.c ./swift-corelibs-libdispatch/tests/dispatch_readsync.c +--- ./swift-corelibs-libdispatch-orig/tests/dispatch_readsync.c 2019-07-02 10:24:46.227354858 -0500 ++++ ./swift-corelibs-libdispatch/tests/dispatch_readsync.c 2019-07-02 10:27:08.247807089 -0500 +@@ -26,8 +26,6 @@ + #endif + #ifdef __ANDROID__ + #include +-#else +-#include + #endif /* __ANDROID__ */ + #include + +diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_vm.c ./swift-corelibs-libdispatch/tests/dispatch_vm.c +--- ./swift-corelibs-libdispatch-orig/tests/dispatch_vm.c 2019-07-02 10:24:46.230354978 -0500 ++++ ./swift-corelibs-libdispatch/tests/dispatch_vm.c 2019-07-02 10:27:22.443347702 -0500 +@@ -30,8 +30,6 @@ + #include + #ifdef __ANDROID__ + #include +-#else +-#include + #endif /* __ANDROID__ */ + #include + #include +diff -Naur ./swift-corelibs-libdispatch-orig/tests/Foundation/bench.mm ./swift-corelibs-libdispatch/tests/Foundation/bench.mm +--- ./swift-corelibs-libdispatch-orig/tests/Foundation/bench.mm 2019-07-02 10:24:46.231355018 -0500 ++++ ./swift-corelibs-libdispatch/tests/Foundation/bench.mm 2019-07-02 10:25:41.562527148 -0500 +@@ -22,8 +22,6 @@ + #include + #ifdef __ANDROID__ + #include +-#else +-#include + #endif /* __ANDROID__ */ + #include + #include diff --git a/sources b/sources index 02b2a41..01fe0d8 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (clang.tar.gz) = 57fb577f3cd3f76def161ea7ddd1f6fa41cc13085cfc648e3ba45f0b6c0e22beb2c950b8bfb00e95aa7967eda8badafa5ac630cd89cdb688fd3931a367a2f63c SHA512 (cmark.tar.gz) = c64487dade556e09a237377aa6ea4d760c12eaad4b03a890e2560f4fb83b433581489f6fd1188aa1a5c6b91dec9c9f736a954cc7c0235f8e5c8783e646a799a2 -SHA512 (corelibs-foundation.tar.gz) = a16c797ffebc3001399544611b9d9830a6c9d7dae71691ed2756626c5a09824aa609dcbb635880fb43fe1dca9d5437b7437fba66659540ff668ca7fbbeea11e1 +SHA512 (corelibs-foundation.tar.gz) = 908f03c8495e3b97ad599af432d1b7732965b37537747f9472a323504fc8cb7d32c3322b0d16deb31581a65a12e4b2247dfd106c4a6ba96f321c30923d3e55bf SHA512 (corelibs-libdispatch.tar.gz) = 5f2f1108cac5b8b70429ac9cf5f66d19335e00d022e826430578aea0edc5c0fb8b6af12346909b5120bbe392150ab897683c8987c169ad090d1e8c8ffbe75f18 SHA512 (corelibs-xctest.tar.gz) = 15759202be95d0e53a2b10a715bb7acac1e8ce6d157d6766aa22df50f3c6eabc19ea76988630d2199a2702cdcb8bf9d8ad08f890c0c4dd3edfdcb8ffef2a01e0 SHA512 (llbuild.tar.gz) = b2212989635e362691435c19a2b6c6748a40282ef7c80e0cd3440cc6d4debb06252bb944df6afb84f4007438480e91866d07795284c1a7248ca454111be57fdf diff --git a/swift-lang.spec b/swift-lang.spec index e2083ae..9bdaaa6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -33,6 +33,7 @@ Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch Patch5: no-inplace-copy.patch +Patch6: nosysctl.patch BuildRequires: clang BuildRequires: cmake @@ -133,6 +134,10 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # out the file %patch5 -p0 +# Patch to handle warning-treated-as-error with sys/sysctl.h being marked +# as depreciated +%patch6 -p0 + %build export VERBOSE=1 @@ -266,6 +271,8 @@ end %changelog +* Tue Jul 02 2019 Ron Olson 5.0.1-0.56.20190418git604054e +- Added patch to fix issue with sys/sysctl.h being depreciated in Rawhide * Thu Apr 18 2019 Ron Olson 5.0.1-0.55.20190418git604054e - Updated to swift-5.0.1-RELEASE * Thu Apr 18 2019 Ron Olson 5.0-0.54.20190325gitba33f9e From 84bcaa35f5546dd2b8984681743173ba98158335 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 2 Jul 2019 15:12:07 -0500 Subject: [PATCH 027/152] Had the wrong build number --- swift-lang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 9bdaaa6..2698867 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.0.1 -Release: 0.55.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.56.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org From 0c401fc18bdc0d5f212b3c4145dc935100c11853 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 2 Jul 2019 22:51:11 -0500 Subject: [PATCH 028/152] Removed reference to sphinx as there is an issue with its use of pygments and a custom lexer --- swift-lang.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 2698867..1fd404e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -55,12 +55,6 @@ BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel -# python2-sphinx was removed after f30 -%if 0%{?fedora} > 30 -BuildRequires: python3-sphinx -%else -BuildRequires: python2-sphinx -%endif BuildRequires: ninja-build Requires: glibc-devel From 5f32c8916fee4509c077d4e7b7c298fe4f8a5e6d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 15 Jul 2019 20:01:24 -0500 Subject: [PATCH 029/152] Updated to Swift-5.0.2-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 12 +++++++----- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/sources b/sources index 01fe0d8..6dd03a9 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 57fb577f3cd3f76def161ea7ddd1f6fa41cc13085cfc648e3ba45f0b6c0e22beb2c950b8bfb00e95aa7967eda8badafa5ac630cd89cdb688fd3931a367a2f63c -SHA512 (cmark.tar.gz) = c64487dade556e09a237377aa6ea4d760c12eaad4b03a890e2560f4fb83b433581489f6fd1188aa1a5c6b91dec9c9f736a954cc7c0235f8e5c8783e646a799a2 -SHA512 (corelibs-foundation.tar.gz) = 908f03c8495e3b97ad599af432d1b7732965b37537747f9472a323504fc8cb7d32c3322b0d16deb31581a65a12e4b2247dfd106c4a6ba96f321c30923d3e55bf -SHA512 (corelibs-libdispatch.tar.gz) = 5f2f1108cac5b8b70429ac9cf5f66d19335e00d022e826430578aea0edc5c0fb8b6af12346909b5120bbe392150ab897683c8987c169ad090d1e8c8ffbe75f18 -SHA512 (corelibs-xctest.tar.gz) = 15759202be95d0e53a2b10a715bb7acac1e8ce6d157d6766aa22df50f3c6eabc19ea76988630d2199a2702cdcb8bf9d8ad08f890c0c4dd3edfdcb8ffef2a01e0 -SHA512 (llbuild.tar.gz) = b2212989635e362691435c19a2b6c6748a40282ef7c80e0cd3440cc6d4debb06252bb944df6afb84f4007438480e91866d07795284c1a7248ca454111be57fdf -SHA512 (lldb.tar.gz) = 05178cafaf3cbf09c4aa0f50a5580c50d63583153eaf9f7ca0952e8cd80e961d315d5c9e6076750f7bd4c4761303ad6ca30b8bc53d3df7be4c0ed6c295014e55 -SHA512 (llvm.tar.gz) = 498c3fb2c8c693dbba8c6e2fe42aef34539e70eedd72f42bd1156c0cd408c3c9b4e3334d2fc53b3cee5461c17b754e85ca1a6551b235941e9e551c41c408db94 -SHA512 (package-manager.tar.gz) = 6d69732c74d68507b868a5126f401a84c9ced5750eb6380c7861cc347b13e7d076d11ef03587d2b3879f905583565d50c916b70c44cfeb3e6a80daf7c47df7a1 -SHA512 (swift-compiler-rt.tar.gz) = 65593bac29914cf500c95556e41e02c6d2a3ecf8df129799fe37cb0e9cfa200391e923dcebc923111fbe415fa57e0300720a4d412f540bb9ec815bd9e75774ef -SHA512 (swift-integration-tests.tar.gz) = 5d60b05cd590a89db0a9b5e3c39df4528548c08ea87d22d4af661eda699f887bcc12ad4df9aca129b72f6dc15b91bc023eae00660fbcdee838acf041bc5d34b1 -SHA512 (swift-xcode-playground-support.tar.gz) = 89471fefd1fa93079672b8dbbe3d65e25d82fa61811e44efc97aced33e5416c912d8d22e6b09ba42fc4454d5d6181dd9fcd0953b1decb2ac2e7d989b3b90b6f7 -SHA512 (swift.tar.gz) = 52f879e0e9268910009c548c8bec2db71fba8719850f8dff1a29efd67f948c24512391350067f947183411ab1cbd785c2d5dac5e08f991cfdccc0d1645d9d38e +SHA512 (clang.tar.gz) = 7ae1826423d1b086e46ca99852d0380755cc015ef1bfeca90bceb8c61ada1871c69597a791773571eea84b8a673bdac721cf1b6449ca1cbb0b2fac8815fe91b3 +SHA512 (cmark.tar.gz) = f149ac93e53e5e85d440be0dc8bd716c88f88f0e9f1b5df0eac7c6d70d4c92995a651c55a13049bcf7581256a9c0652d8d04dfcd182d119a3f4d6a97787af1fc +SHA512 (corelibs-foundation.tar.gz) = 426118fb22671418d22f52f3e99fd6a907badde35dd6ba0e76cc7cd848fb2b703bd577af017a4661d75c0ace49801f77388f7a702e074d54eced3e41efee1bc4 +SHA512 (corelibs-libdispatch.tar.gz) = ff5e96e61bdece5ea5d1da9398f9f800785002fe977ead93a6d8cb9abd9945f33cae505b0d01d3bef78575609cbe3744e0f0fb7ec3a7c57c278ee338629b2594 +SHA512 (corelibs-xctest.tar.gz) = 76c026dd74d350b80dd0800519c1accaecdb46b42d67c86cc412f67e31cd9dadb2cebfaa35e01086675cc141ad3ecdff1c885b5e35699538aaa4ca2877c9164b +SHA512 (llbuild.tar.gz) = 5b410f5581ed1497ec45e21285896d5cfa5bb7414c846be2d78f7ab7d730de4142d880930649d24c34df32f3c3fbcfeb858227b718f1a7ba77d47ea81d64d0d1 +SHA512 (lldb.tar.gz) = 857bd721b40ceda26ab97d7d3549c2fb62241468b1b5a7fab30ab3dcd4bd70ac45ee4f1e84538585a93fccd15255e37ce90ae52b214d06c35538dca70f53c419 +SHA512 (llvm.tar.gz) = 2807be73469cc264f7ee199fcb5c5bb63deed7fa5647f66a61d715f5226a093bfbbf3085436bb0d122c4cfba482a724cc690914b3c0fa25968abf44c607b916b +SHA512 (package-manager.tar.gz) = b1e2de32b005ff9f910e763a57d57e2d1be67062f07954d5c2c7b5e41e3c46045e32125413ee895dc829fcd0b41a6ae0fc1cd27910f66cff1361493da2369581 +SHA512 (swift-compiler-rt.tar.gz) = 808184f8ceed8ab5d37d91c8f9011e1f1c5c667f39e2b31165db840cc3b52ca73f7bec4b52ccdef592981ad97cb0be401054326393421c626375b7c045acce50 +SHA512 (swift-integration-tests.tar.gz) = 6f69c5f33ffca4c7e3d095f76027dd5695cec3a9e9de83289377dafa8a5b0219bae9bd07d72aca9b514b4ff54b6141fb22283cb42ca95a5acc3168b923862766 +SHA512 (swift-xcode-playground-support.tar.gz) = a16fe0739a52e0188063fffeab3bba029a9c4051bd5cc84a54ba449881b760debadb4436486061dfd2a0421ba78bc28be57fdcc240055c6e69027acc2b3f8351 +SHA512 (swift.tar.gz) = 014d225d024f286055fbcd8ba781d10717b2d76a114269065f0e2ff71f6c115d57035ea7ac0fe1302ae653e455cc2a34b9ce3f63711d020fb8bfbe7751b6e7b9 diff --git a/swift-lang.spec b/swift-lang.spec index 1fd404e..769c678 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global swifttag 5.0.1-RELEASE -%global swiftgithash 604054e -%global swiftgitdate 20190418 +%global swifttag 5.0.2-RELEASE +%global swiftgithash 3d95d09 +%global swiftgitdate 20190715 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.0.1 -Release: 0.56.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.0.2 +Release: 0.57.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -265,6 +265,8 @@ end %changelog +* Mon Jul 15 2019 Ron Olson 5.0.2-0.57.20190715git3d95d09 +- Updated to swift-5.0.2-RELEASE * Tue Jul 02 2019 Ron Olson 5.0.1-0.56.20190418git604054e - Added patch to fix issue with sys/sysctl.h being depreciated in Rawhide * Thu Apr 18 2019 Ron Olson 5.0.1-0.55.20190418git604054e From d750885f12490d8bec235de22faae85767ebc08f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 24 Jul 2019 19:14:33 -0500 Subject: [PATCH 030/152] First public build of Swift 5.1 --- build-setup.patch | 35 +++ clangloc.patch | 27 ++- linux-tests-python-3.patch | 35 +++ no-inplace-copy.patch | 15 -- no-ninja-build.patch | 15 -- nosysctl.patch | 83 ------- python3.patch | 437 +++++++++++++++++++++++++++++++++++++ sources | 26 +-- swift-lang.spec | 159 ++++++++------ 9 files changed, 633 insertions(+), 199 deletions(-) create mode 100644 build-setup.patch create mode 100644 linux-tests-python-3.patch delete mode 100644 no-inplace-copy.patch delete mode 100644 no-ninja-build.patch delete mode 100644 nosysctl.patch create mode 100644 python3.patch diff --git a/build-setup.patch b/build-setup.patch new file mode 100644 index 0000000..d14cecd --- /dev/null +++ b/build-setup.patch @@ -0,0 +1,35 @@ +--- swift/utils/build-presets.ini.orig 2019-04-28 10:12:14.640900289 -0500 ++++ swift/utils/build-presets.ini 2019-04-28 10:27:42.926567124 -0500 +@@ -723,12 +723,9 @@ + llbuild + swiftpm + xctest +-libicu +-libcxx + + dash-dash + +-build-ninja + install-swift + install-lldb + install-llbuild +@@ -737,7 +734,7 @@ + install-libicu + install-prefix=/usr + swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc +-llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd ++llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt + install-libcxx + build-swift-static-stdlib + build-swift-static-sdk-overlay +@@ -766,8 +763,8 @@ + test-optimized + foundation + libdispatch +-indexstore-db +-sourcekit-lsp ++indexstore-db=0 ++sourcekit-lsp=0 + lit-args=-v --time-tests + + dash-dash diff --git a/clangloc.patch b/clangloc.patch index 5892519..c7012a4 100644 --- a/clangloc.patch +++ b/clangloc.patch @@ -1,11 +1,16 @@ ---- lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp.orig 2019-02-08 20:24:10.121192411 -0600 -+++ lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp 2019-02-08 22:20:36.347687737 -0600 -@@ -34,7 +34,7 @@ - #else - static bool DefaultComputeClangDirectory(FileSpec &file_spec) { - return HostInfoPosix::ComputePathRelativeToLibrary( -- file_spec, "/lib/lldb/clang/"); -+ file_spec, "/swift/clang/"); - return HostInfoPosix::ComputePathRelativeToLibrary( - file_spec, (llvm::Twine("/lib") + CLANG_LIBDIR_SUFFIX + "/clang/" + - CLANG_VERSION_STRING) +--- lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp.orig 2019-06-25 14:34:32.837621023 -0500 ++++ lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp 2019-06-26 16:03:32.304254695 -0500 +@@ -54,11 +54,11 @@ + static const llvm::StringRef kResourceDirSuffixes[] = { + // LLVM.org's build of LLDB uses the clang resource directory placed + // in $install_dir/lib{,64}/clang/$clang_version. +- "lib" CLANG_LIBDIR_SUFFIX "/clang/" CLANG_VERSION_STRING, ++ "/swift" "/clang/" CLANG_VERSION_STRING, + // swift-lldb uses the clang resource directory copied from swift, which + // by default is placed in $install_dir/lib{,64}/lldb/clang. LLDB places + // it there, so we use LLDB_LIBDIR_SUFFIX. +- "lib" LLDB_LIBDIR_SUFFIX "/lldb/clang", ++ "/swift" "/clang", + }; + + for (const auto &Suffix : kResourceDirSuffixes) { diff --git a/linux-tests-python-3.patch b/linux-tests-python-3.patch new file mode 100644 index 0000000..e64c644 --- /dev/null +++ b/linux-tests-python-3.patch @@ -0,0 +1,35 @@ +--- swift-integration-tests/test-snapshot-binaries/linux_load_commands.py.orig 2019-07-22 18:29:09.865242157 -0500 ++++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2019-07-22 18:29:36.655204752 -0500 +@@ -85,12 +85,12 @@ + numberOfLinesSeen = 0 + + print("Visiting lib: {}".format(lib)) +- lines = list(reversed(subprocess.check_output([args.read_elf, "-program-headers", lib]).split("\n")[:-1])) ++ lines = list(reversed(subprocess.check_output([args.read_elf, "-program-headers", lib]).split(b"\n")[:-1])) + p = ParseState() + + # Until we finish parsing or run out of lines to parse... + while len(lines) > 0: +- l = lines.pop() ++ l = lines.pop().decode("utf-8") + print("DUMP: '{}'".format(l)) + assert(p is not None) + curState = p +@@ -143,7 +143,7 @@ + "-iname", + "*.so" + ] +- return subprocess.check_output(cmd).split("\n")[:-1] ++ return subprocess.check_output(cmd).split(b"\n")[:-1] + + def main(): + parser = argparse.ArgumentParser() +@@ -154,7 +154,7 @@ + + libraries = get_libraries(args.package_path) + for l in libraries: +- process_library(args, l) ++ process_library(args, l.decode("utf-8")) + sys.exit(0) + + if __name__ == "__main__": diff --git a/no-inplace-copy.patch b/no-inplace-copy.patch deleted file mode 100644 index 585293b..0000000 --- a/no-inplace-copy.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake.orig 2019-03-22 13:10:16.930540857 -0500 -+++ swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake 2019-03-22 15:48:46.960621151 -0500 -@@ -139,12 +139,6 @@ - ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources - COMMAND - ${CMAKE_COMMAND} -E copy ${AST_RESOURCES} ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources) -- else() -- add_custom_command(TARGET -- ${target} -- POST_BUILD -- COMMAND -- ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}) - endif() - endfunction() - diff --git a/no-ninja-build.patch b/no-ninja-build.patch deleted file mode 100644 index 1aeb7a4..0000000 --- a/no-ninja-build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2019-03-11 08:44:39.664264614 -0500 -+++ swift/utils/build-presets.ini 2019-03-11 08:52:18.038295456 -0500 -@@ -716,12 +716,9 @@ - llbuild - swiftpm - xctest --libicu --libcxx - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild diff --git a/nosysctl.patch b/nosysctl.patch deleted file mode 100644 index adcf59d..0000000 --- a/nosysctl.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Naur ./swift-corelibs-libdispatch-orig/src/internal.h ./swift-corelibs-libdispatch/src/internal.h ---- ./swift-corelibs-libdispatch-orig/src/internal.h 2019-07-02 10:24:46.257356055 -0500 -+++ ./swift-corelibs-libdispatch/src/internal.h 2019-07-02 10:25:26.384952870 -0500 -@@ -273,7 +273,6 @@ - #ifdef __ANDROID__ - #include - #else --#include - #include - #endif /* __ANDROID__ */ - #include -diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_apply.c ./swift-corelibs-libdispatch/tests/dispatch_apply.c ---- ./swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2019-07-02 10:24:46.224354738 -0500 -+++ ./swift-corelibs-libdispatch/tests/dispatch_apply.c 2019-07-02 10:26:18.882939254 -0500 -@@ -31,8 +31,6 @@ - #include - #ifdef __ANDROID__ - #include --#else --#include - #endif /* __ANDROID__ */ - - #include -diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_concur.c ./swift-corelibs-libdispatch/tests/dispatch_concur.c ---- ./swift-corelibs-libdispatch-orig/tests/dispatch_concur.c 2019-07-02 10:24:46.224354738 -0500 -+++ ./swift-corelibs-libdispatch/tests/dispatch_concur.c 2019-07-02 10:26:37.290635752 -0500 -@@ -28,8 +28,6 @@ - #include - #ifdef __ANDROID__ - #include --#else --#include - #endif /* __ANDROID__ */ - - #include -diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_priority.c ./swift-corelibs-libdispatch/tests/dispatch_priority.c ---- ./swift-corelibs-libdispatch-orig/tests/dispatch_priority.c 2019-07-02 10:24:46.226354818 -0500 -+++ ./swift-corelibs-libdispatch/tests/dispatch_priority.c 2019-07-02 10:26:49.918113542 -0500 -@@ -32,8 +32,6 @@ - #include - #ifdef __ANDROID__ - #include --#else --#include - #endif /* __ANDROID__ */ - - #include -diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_readsync.c ./swift-corelibs-libdispatch/tests/dispatch_readsync.c ---- ./swift-corelibs-libdispatch-orig/tests/dispatch_readsync.c 2019-07-02 10:24:46.227354858 -0500 -+++ ./swift-corelibs-libdispatch/tests/dispatch_readsync.c 2019-07-02 10:27:08.247807089 -0500 -@@ -26,8 +26,6 @@ - #endif - #ifdef __ANDROID__ - #include --#else --#include - #endif /* __ANDROID__ */ - #include - -diff -Naur ./swift-corelibs-libdispatch-orig/tests/dispatch_vm.c ./swift-corelibs-libdispatch/tests/dispatch_vm.c ---- ./swift-corelibs-libdispatch-orig/tests/dispatch_vm.c 2019-07-02 10:24:46.230354978 -0500 -+++ ./swift-corelibs-libdispatch/tests/dispatch_vm.c 2019-07-02 10:27:22.443347702 -0500 -@@ -30,8 +30,6 @@ - #include - #ifdef __ANDROID__ - #include --#else --#include - #endif /* __ANDROID__ */ - #include - #include -diff -Naur ./swift-corelibs-libdispatch-orig/tests/Foundation/bench.mm ./swift-corelibs-libdispatch/tests/Foundation/bench.mm ---- ./swift-corelibs-libdispatch-orig/tests/Foundation/bench.mm 2019-07-02 10:24:46.231355018 -0500 -+++ ./swift-corelibs-libdispatch/tests/Foundation/bench.mm 2019-07-02 10:25:41.562527148 -0500 -@@ -22,8 +22,6 @@ - #include - #ifdef __ANDROID__ - #include --#else --#include - #endif /* __ANDROID__ */ - #include - #include diff --git a/python3.patch b/python3.patch new file mode 100644 index 0000000..a65c0f4 --- /dev/null +++ b/python3.patch @@ -0,0 +1,437 @@ +diff -Naur swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb swift/stdlib/public/core/FloatingPointTypes.swift.gyb +--- swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-22 11:22:17.049551459 -0500 +@@ -13,8 +13,8 @@ + import SwiftShims + + %{ +-from SwiftIntTypes import all_integer_types +-from SwiftFloatingPointTypes import all_floating_point_types ++import SwiftIntTypes ++import SwiftFloatingPointTypes + + # + # Utility code for later in this template +@@ -27,7 +27,7 @@ + builtinIntLiteralBits = 2048 + }% + +-% for self_type in all_floating_point_types(): ++% for self_type in SwiftFloatingPointTypes.all_floating_point_types(): + %{ + Self = self_type.stdlib_name + bits = self_type.bits +@@ -1650,7 +1650,7 @@ + } + } + +-% for src_type in all_floating_point_types(): ++% for src_type in SwiftFloatingPointTypes.all_floating_point_types(): + % srcBits = src_type.bits + % That = src_type.stdlib_name + +diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb +--- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-22 15:30:40.491317722 -0500 +@@ -14,10 +14,9 @@ + # Utility code for later in this template + # + +-from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init +-from SwiftFloatingPointTypes import getFtoIBounds ++import SwiftIntTypes ++import SwiftFloatingPointTypes + +-from string import maketrans, capitalize + from itertools import chain + + # Number of bits in the Builtin.Word type +@@ -1064,7 +1063,7 @@ + //===--- Concrete FixedWidthIntegers --------------------------------------===// + //===----------------------------------------------------------------------===// + +-% for self_type in all_integer_types(word_bits): ++% for self_type in SwiftIntTypes.all_integer_types(word_bits): + % bits = self_type.bits + % signed = self_type.is_signed + % BuiltinName = self_type.builtin_name +@@ -1125,7 +1124,7 @@ + + % for (FloatType, FloatBits) in [ + % ('Float', 32), ('Double', 64), ('Float80', 80)]: +-% (lower, upper) = getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) ++% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) + + % if FloatType == 'Float80': + #if !os(Windows) && (arch(i386) || arch(x86_64)) +@@ -1651,7 +1650,7 @@ + return Hasher._hash( + seed: seed, + bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), +- count: ${bits / 8}) ++ count: ${bits // 8}) + % end + } + } +diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb +--- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/Mirrors.swift.gyb 2019-07-23 09:20:38.269152361 -0500 +@@ -12,7 +12,7 @@ + + %{ + +-from SwiftIntTypes import all_integer_types ++import SwiftIntTypes + + # Number of bits in the Builtin.Word type + word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 +@@ -26,7 +26,7 @@ + ('Unicode.Scalar', '.uInt', 'UInt64(self)'), + ] + +-for self_ty in all_integer_types(word_bits): ++for self_ty in SwiftIntTypes.all_integer_types(word_bits): + Self = self_ty.stdlib_name + if self_ty.is_signed: + Types.append( (Self, '.int', 'Int64(self)') ) +diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb +--- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-22 15:30:52.516752476 -0500 +@@ -11,7 +11,7 @@ + //===----------------------------------------------------------------------===// + + %{ +-from SwiftIntTypes import all_integer_types ++import SwiftIntTypes + word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 + storagescalarCounts = [2,4,8,16,32,64] + vectorscalarCounts = storagescalarCounts + [3] +@@ -90,17 +90,17 @@ + % if n >= 4: + /// Creates a new vector from two half-length vectors. + @_transparent +- public init(lowHalf: SIMD${n/2}, highHalf: SIMD${n/2}) { ++ public init(lowHalf: SIMD${n//2}, highHalf: SIMD${n//2}) { + self.init() + self.lowHalf = lowHalf + self.highHalf = highHalf + } + +-% for (half,indx) in [('low','i'), ('high',str(n/2)+'+i'), ('even','2*i'), ('odd','2*i+1')]: ++% for (half,indx) in [('low','i'), ('high',str(n//2)+'+i'), ('even','2*i'), ('odd','2*i+1')]: + /// A half-length vector made up of the ${half} elements of the vector. +- public var ${half}Half: SIMD${n/2} { ++ public var ${half}Half: SIMD${n//2} { + @inlinable get { +- var result = SIMD${n/2}() ++ var result = SIMD${n//2}() + for i in result.indices { result[i] = self[${indx}] } + return result + } +@@ -159,7 +159,7 @@ + public var debugDescription: String { + return "SIMD${n}<\(Scalar.self)>(${', '.join(map(lambda c: + '\\(self['+ str(c) + '])', +- xrange(n)))})" ++ range(n)))})" + } + } + +@@ -203,7 +203,7 @@ + } + } + +-%for self_type in all_integer_types(word_bits): ++%for self_type in SwiftIntTypes.all_integer_types(word_bits): + % Self = self_type.stdlib_name + % BuiltinName = self_type.builtin_name + % Mask = Self if self_type.is_signed else self_type.get_opposite_signedness().stdlib_name +@@ -212,7 +212,7 @@ + public typealias SIMDMaskScalar = ${Mask} + + % for n in storagescalarCounts: +-% bytes = n * self_type.bits / 8 ++% bytes = n * self_type.bits // 8 + /// Storage for a vector of ${spelledNumbers[n]} integers. + @frozen + @_alignment(${bytes if bytes <= 16 else 16}) +@@ -257,7 +257,7 @@ + public typealias SIMDMaskScalar = Int${bits} + + % for n in storagescalarCounts: +-% bytes = n * bits / 8 ++% bytes = n * bits // 8 + /// Storage for a vector of ${spelledNumbers[n]} floating-point values. + @frozen + @_alignment(${bytes if bytes <= 16 else 16}) +diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb +--- swift-orig/stdlib/public/core/Tuple.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/Tuple.swift.gyb 2019-07-17 20:54:45.400558556 -0500 +@@ -111,7 +111,7 @@ + % equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams]) + + % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) +-% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) ++% greaterTuple = "(\"a\", {})".format(", ".join(map(str, list(range(1, arity - 1)) + [arity]))) + + /// Returns a Boolean value indicating whether the corresponding components of + /// two tuples are equal. +diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py +--- swift-orig/utils/gyb_sourcekit_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_sourcekit_support/__init__.py 2019-07-18 14:19:45.668770778 -0500 +@@ -14,9 +14,9 @@ + # utils/gyb_sourcekit_support/ directory as a module. + # + # ---------------------------------------------------------------------------- +-from UIDs import UID_KEYS +-from UIDs import UID_KINDS +-from UIDs import UID_REQUESTS ++from .UIDs import UID_KEYS ++from .UIDs import UID_KINDS ++from .UIDs import UID_REQUESTS + + + def check_uid_duplication(): +diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py +--- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/AttributeNodes.py 2019-07-18 12:34:20.708714660 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + ATTRIBUTE_NODES = [ + # token-list -> token? token-list? +diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py +--- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-18 12:34:20.711714774 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + AVAILABILITY_NODES = [ + # availability-spec-list -> availability-entry availability-spec-list? +diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py +--- swift-orig/utils/gyb_syntax_support/Child.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Child.py 2019-07-18 12:34:20.712714811 -0500 +@@ -1,7 +1,7 @@ + # flake8: noqa I201 +-from Classification import classification_by_name +-from Token import SYNTAX_TOKEN_MAP +-from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word ++from .Classification import classification_by_name ++from .Token import SYNTAX_TOKEN_MAP ++from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word + + + class Child(object): +diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py +--- swift-orig/utils/gyb_syntax_support/Classification.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Classification.py 2019-07-18 12:34:20.713714849 -0500 +@@ -1,5 +1,5 @@ +-from Node import error +-from kinds import lowercase_first_word # noqa: I201 ++from .Node import error ++from .kinds import lowercase_first_word # noqa: I201 + + + class SyntaxClassification(object): +diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py +--- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/CommonNodes.py 2019-07-18 12:34:20.714714887 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + COMMON_NODES = [ + Node('Decl', kind='Syntax'), +diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py +--- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/DeclNodes.py 2019-07-18 12:34:20.716714963 -0500 +@@ -1,6 +1,6 @@ + # flake8: noqa I201 +-from Child import Child +-from Node import Node ++from .Child import Child ++from .Node import Node + + + DECL_NODES = [ +diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py +--- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/ExprNodes.py 2019-07-18 12:34:20.717715000 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + EXPR_NODES = [ + # An inout expression. +diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py +--- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/GenericNodes.py 2019-07-18 12:34:20.718715038 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + GENERIC_NODES = [ + # generic-where-clause -> 'where' requirement-list +diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py +--- swift-orig/utils/gyb_syntax_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/__init__.py 2019-07-18 12:34:33.973215999 -0500 +@@ -1,19 +1,19 @@ + import textwrap +-from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 +-from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 +-import Classification # noqa: I201 +-from CommonNodes import COMMON_NODES # noqa: I201 +-from DeclNodes import DECL_NODES # noqa: I201 +-from ExprNodes import EXPR_NODES # noqa: I201 +-from GenericNodes import GENERIC_NODES # noqa: I201 +-from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ ++from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 ++from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 ++from . import Classification # noqa: I201 ++from .CommonNodes import COMMON_NODES # noqa: I201 ++from .DeclNodes import DECL_NODES # noqa: I201 ++from .ExprNodes import EXPR_NODES # noqa: I201 ++from .GenericNodes import GENERIC_NODES # noqa: I201 ++from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ + get_serialization_code, \ + verify_syntax_node_serialization_codes + +-from PatternNodes import PATTERN_NODES # noqa: I201 +-from StmtNodes import STMT_NODES # noqa: I201 +-import Token +-from TypeNodes import TYPE_NODES # noqa: I201 ++from .PatternNodes import PATTERN_NODES # noqa: I201 ++from .StmtNodes import STMT_NODES # noqa: I201 ++from . import Token ++from .TypeNodes import TYPE_NODES # noqa: I201 + + + # Re-export global constants +diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py +--- swift-orig/utils/gyb_syntax_support/Node.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Node.py 2019-07-18 12:34:20.722715189 -0500 +@@ -1,6 +1,6 @@ + from __future__ import print_function + import sys # noqa: I201 +-from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word ++from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word + + + def error(msg): +diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py +--- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-18 12:34:20.723715227 -0500 +@@ -1,4 +1,4 @@ +-from Node import error ++from .Node import error + + + SYNTAX_NODE_SERIALIZATION_CODES = { +diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py +--- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/PatternNodes.py 2019-07-18 12:34:20.724715265 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + PATTERN_NODES = [ + +diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py +--- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/StmtNodes.py 2019-07-18 12:34:20.726715341 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + STMT_NODES = [ + # continue-stmt -> 'continue' label? ';'? +diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py +--- swift-orig/utils/gyb_syntax_support/Token.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Token.py 2019-07-18 12:34:20.727715378 -0500 +@@ -1,6 +1,6 @@ +-from Classification import classification_by_name +-from Node import error # noqa: I201 +-from kinds import lowercase_first_word # noqa: I201 ++from .Classification import classification_by_name ++from .Node import error # noqa: I201 ++from .kinds import lowercase_first_word # noqa: I201 + + + class Token(object): +diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py +--- swift-orig/utils/gyb_syntax_support/Trivia.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Trivia.py 2019-07-18 14:22:04.074001913 -0500 +@@ -1,5 +1,5 @@ +-from Node import error +-from kinds import lowercase_first_word # noqa: I201 ++from .Node import error ++from .kinds import lowercase_first_word # noqa: I201 + + + class Trivia(object): +diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py +--- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/TypeNodes.py 2019-07-18 12:34:20.731715529 -0500 +@@ -1,5 +1,5 @@ +-from Child import Child +-from Node import Node # noqa: I201 ++from .Child import Child ++from .Node import Node # noqa: I201 + + TYPE_NODES = [ + # simple-type-identifier -> identifier generic-argument-clause? +diff -Naur swift-orig/utils/line-directive swift/utils/line-directive +--- swift-orig/utils/line-directive 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/line-directive 2019-07-19 09:01:35.602482603 -0500 +@@ -60,7 +60,7 @@ + + def _make_line_map(target_filename, stream=None): + """ +- >>> from StringIO import StringIO ++ >>> from io import StringIO + >>> _make_line_map('box', + ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) + ... line 2 +@@ -94,7 +94,7 @@ + + def map_line_to_source_file(target_filename, target_line_num): + """ +- >>> from tempfile import * ++ >>> from .tempfile import * + >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open + >>> # the file for a second time if delete=True. Therefore, we have to + >>> # manually handle closing and deleting this file to allow us to open +@@ -144,7 +144,7 @@ + def map_line_from_source_file(source_filename, source_line_num, + target_filename): + """ +- >>> from tempfile import * ++ >>> from .tempfile import * + >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open + >>> # the file for a second time if delete=True. Therefore, we have to + >>> # manually handle closing and deleting this file to allow us to open +@@ -230,7 +230,7 @@ + def run(): + """Simulate a couple of gyb-generated files + +- >>> from tempfile import * ++ >>> from .tempfile import * + >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open + >>> # the file for a second time if delete=True. Therefore, we have to + >>> # manually handle closing and deleting this file to allow us to open diff --git a/sources b/sources index 6dd03a9..d86f821 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 7ae1826423d1b086e46ca99852d0380755cc015ef1bfeca90bceb8c61ada1871c69597a791773571eea84b8a673bdac721cf1b6449ca1cbb0b2fac8815fe91b3 -SHA512 (cmark.tar.gz) = f149ac93e53e5e85d440be0dc8bd716c88f88f0e9f1b5df0eac7c6d70d4c92995a651c55a13049bcf7581256a9c0652d8d04dfcd182d119a3f4d6a97787af1fc -SHA512 (corelibs-foundation.tar.gz) = 426118fb22671418d22f52f3e99fd6a907badde35dd6ba0e76cc7cd848fb2b703bd577af017a4661d75c0ace49801f77388f7a702e074d54eced3e41efee1bc4 -SHA512 (corelibs-libdispatch.tar.gz) = ff5e96e61bdece5ea5d1da9398f9f800785002fe977ead93a6d8cb9abd9945f33cae505b0d01d3bef78575609cbe3744e0f0fb7ec3a7c57c278ee338629b2594 -SHA512 (corelibs-xctest.tar.gz) = 76c026dd74d350b80dd0800519c1accaecdb46b42d67c86cc412f67e31cd9dadb2cebfaa35e01086675cc141ad3ecdff1c885b5e35699538aaa4ca2877c9164b -SHA512 (llbuild.tar.gz) = 5b410f5581ed1497ec45e21285896d5cfa5bb7414c846be2d78f7ab7d730de4142d880930649d24c34df32f3c3fbcfeb858227b718f1a7ba77d47ea81d64d0d1 -SHA512 (lldb.tar.gz) = 857bd721b40ceda26ab97d7d3549c2fb62241468b1b5a7fab30ab3dcd4bd70ac45ee4f1e84538585a93fccd15255e37ce90ae52b214d06c35538dca70f53c419 -SHA512 (llvm.tar.gz) = 2807be73469cc264f7ee199fcb5c5bb63deed7fa5647f66a61d715f5226a093bfbbf3085436bb0d122c4cfba482a724cc690914b3c0fa25968abf44c607b916b -SHA512 (package-manager.tar.gz) = b1e2de32b005ff9f910e763a57d57e2d1be67062f07954d5c2c7b5e41e3c46045e32125413ee895dc829fcd0b41a6ae0fc1cd27910f66cff1361493da2369581 -SHA512 (swift-compiler-rt.tar.gz) = 808184f8ceed8ab5d37d91c8f9011e1f1c5c667f39e2b31165db840cc3b52ca73f7bec4b52ccdef592981ad97cb0be401054326393421c626375b7c045acce50 -SHA512 (swift-integration-tests.tar.gz) = 6f69c5f33ffca4c7e3d095f76027dd5695cec3a9e9de83289377dafa8a5b0219bae9bd07d72aca9b514b4ff54b6141fb22283cb42ca95a5acc3168b923862766 -SHA512 (swift-xcode-playground-support.tar.gz) = a16fe0739a52e0188063fffeab3bba029a9c4051bd5cc84a54ba449881b760debadb4436486061dfd2a0421ba78bc28be57fdcc240055c6e69027acc2b3f8351 -SHA512 (swift.tar.gz) = 014d225d024f286055fbcd8ba781d10717b2d76a114269065f0e2ff71f6c115d57035ea7ac0fe1302ae653e455cc2a34b9ce3f63711d020fb8bfbe7751b6e7b9 +SHA512 (clang.tar.gz) = 1f5f142f2797061bac3fcc309f03c2aca6964592857e36f340f82cbb20049e038671751b05f27c3d1988f595874ffd819c34f0f9b2f9e98984c99cb422a9d9ce +SHA512 (cmark.tar.gz) = cdb1753ddaed22ffaa10c95151a93d4f39ddf0597c6c8182d687f1b6abf1c8978e3ea7edf162d21db14eb3d15c72ef72c8fb49103c8dcc9290b2680b28b39a60 +SHA512 (corelibs-foundation.tar.gz) = 59a7406c0966d5d853273b66f47d60e3d6fc6d50450d46bff8d515ccd5cb3b74002a53e21355f0db30fa87112a634f9ac7bd9ba449d4e951360dadffa7f54148 +SHA512 (corelibs-libdispatch.tar.gz) = 3ec00b21d968b35c435a7f5906fcfd5d5d17d1e66fd2a118d46027ab3b5d27a395d2698e2dda2897a181cac68cf685e74e9b8d9c683ae91f1596c7f68f631f2f +SHA512 (corelibs-xctest.tar.gz) = e6dbc11cf6c0e831558d0c8cbcf93e05aee014e073841dd20541737125da3d08a045721728247887b7565fd2a4a619adcd75019206d441fe7ec3da908962e350 +SHA512 (llbuild.tar.gz) = 64ef49cc20854501f572de0421f9765bec0e3b76d7d40dda3b0eb05ed015b339f96b9691468911489e23dbcbd3f7974c82e60d47fc2dfd13b99e5b105aa26e69 +SHA512 (lldb.tar.gz) = 322ad5ed8ebc26ad00d52200e5df674a6bd6ec2f16869a99698377c29e285f9a185c760c4bfae77858bbbf900cc150a93d5c86299a58336c2af848a91d60d0d6 +SHA512 (llvm.tar.gz) = 484c9c7b4633e25659916b52d5f68f0ac682ab727c003b23adbf62e44c5ca4cefe1f723a1b5a7933996fef06c4cd899fb2e95e50d8d442a1b00ba70e9329ec4b +SHA512 (package-manager.tar.gz) = 104d826a66f6d8282466f4ff9190ad72392e76a99af82aeb25414ae7cc32980b8c71bd7e5acdb67c71b3cfc2f85e4121df714cd2dd452018d48bc441f9708ce9 +SHA512 (swift-compiler-rt.tar.gz) = 09af536f9bd26bd1d0157ae9783c38834c37e9bd2389026b0c0aa76159aa4e49dd94bbabf9382fe3ed430a44fd2b34c6c8f6911edff410b1bd8945dc187256c5 +SHA512 (swift-integration-tests.tar.gz) = 47cb73445126fd44d5248939f5cab01961ded810f0d1095a10fb10440c55f83b649362c442e6cfe3f5f3629dd580687352f2d7a54312c4c8dac31afff34a1508 +SHA512 (swift-xcode-playground-support.tar.gz) = 789b08b191b75f85841d44105aa071bf49422043346c647f0d22e695d99dd82638e6508272e9e2dc156b14c7d27b038328474c48522f96290e1cb45f3692e95c +SHA512 (swift.tar.gz) = 02a9cd874219822030f10c964ef26b02dbf04d793ed63e50ccac5afe438c9c4e202b6989f5314f8366dcf1209276c4c32509fdbb8ca4aed80b4153b92b39ac77 diff --git a/swift-lang.spec b/swift-lang.spec index 769c678..eea6bd2 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.0.2-RELEASE -%global swiftgithash 3d95d09 -%global swiftgitdate 20190715 +%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2019-07-23-a +%global swiftgithash 3e8f631 +%global swiftgitdate 20190723 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* + Name: swift-lang -Version: 5.0.2 -Release: 0.57.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1 +Release: 0.24.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -28,12 +29,12 @@ Source13: swift-lang.conf Source14: swift-lang-runtime.conf Patch0: change-lldb-location.patch -Patch1: no-ninja-build.patch +Patch1: build-setup.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch -Patch5: no-inplace-copy.patch -Patch6: nosysctl.patch +Patch5: python3.patch +Patch6: linux-tests-python-3.patch BuildRequires: clang BuildRequires: cmake @@ -41,11 +42,8 @@ BuildRequires: swig BuildRequires: pkgconfig BuildRequires: perl-podlators BuildRequires: rsync -%if 0%{?fedora} > 28 -BuildRequires: python-unversioned-command -%endif -BuildRequires: python2 -BuildRequires: python2-devel +BuildRequires: python3 +BuildRequires: python3-devel BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel @@ -63,6 +61,11 @@ Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name}-runtime < %{version}-%{release} + ExclusiveArch: x86_64 aarch64 @@ -81,6 +84,11 @@ correct programs easier for the developer. %package runtime Summary: Runtime files for Swift programs +Provides: %{name}-runtime = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name}-runtime < %{version}-%{release} + %description runtime Runtime libraries for Swift programs @@ -119,23 +127,25 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Fixes an issue with using std::thread in a vector in compiler-rt %patch3 -p0 - + # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger %patch4 -p0 -# Patch to handle library being copied to same directory; CMake 3.14 zeros -# out the file +# Python 3 is the new default so we need to make the python code work with it %patch5 -p0 - -# Patch to handle warning-treated-as-error with sys/sysctl.h being marked -# as depreciated %patch6 -p0 %build export VERBOSE=1 export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 +# We may not have /usr/bin/python, so we roll our own +# because the build script expects there to be one. +mkdir $PWD/binforpython +ln -s /usr/bin/python3 $PWD/binforpython/python +export PATH=$PWD/binforpython:$PATH +# Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -151,6 +161,8 @@ install -m 0755 %{_builddir}/usr/bin/swift-demangle %{buildroot}%{_bindir} install -m 0755 %{_builddir}/usr/bin/swift-package %{buildroot}%{_bindir} install -m 0755 %{_builddir}/usr/bin/swift-run %{buildroot}%{_bindir} install -m 0755 %{_builddir}/usr/bin/swift-test %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/swift-api-digester %{buildroot}%{_bindir} +install -m 0644 %{_builddir}/usr/bin/swift-api-checker.py %{buildroot}%{_bindir} ln -fs swift %{buildroot}/usr/bin/swift-autolink-extract ln -fs swift %{buildroot}/usr/bin/swiftc ln -fs swift %{buildroot}/usr/bin/swift-format @@ -165,14 +177,18 @@ 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.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/libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb +ln -fs libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb/libIndexStore.so +cp %{_builddir}/usr/lib/liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn +ln -fs liblldb.so.7svn %{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.7 %{buildroot}/usr/lib/swift-lldb -ln -fs liblldbIntelFeatures.so.7 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so +cp %{_builddir}/usr/lib/liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift +cp %{_builddir}/usr/lib/libBlocksRuntime.so %{buildroot}/usr/lib/swift-lldb +cp %{_builddir}/usr/lib/libdispatch.so %{buildroot}/usr/lib/swift-lldb mkdir -p %{buildroot}/usr/lib/swift cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/usr/lib/swift @@ -185,6 +201,7 @@ 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/linux/libFoundationNetworking.so chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuild.so chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuildSwift.so @@ -199,43 +216,14 @@ mkdir -p %{buildroot}%{_mandir}/man1 install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1 -# This is necessary because in Swift 4 the directories -# under clang were actual directories. In 5 Apple added -# an additional layer of indirection, to the compiler -# version, with the previous directories relocated there. -# Apparently there is an issue with rpm being able to -# replace directories with something else (in this case, -# symlinks), thus making this pre-installation step -# necessary when upgrading from 4.x to 5. -%pretrans -p -path = "/usr/lib/swift/clang" -subdirs = {"include", "lib"} -for _, dir in ipairs(subdirs) do - fullDir = path .. "/" .. dir - st = posix.stat(fullDir) - if st and st.type == "directory" then - status = os.rename(fullDir, fullDir .. ".rpmmoved") - if not status then - suffix = 0 - while not status do - suffix = suffix + 1 - status = os.rename(fullDir .. ".rpmmoved", fullDir .. ".rpmmoved." .. suffix) - end - os.rename(fullDir, fullDir .. ".rpmmoved") - end - end -end - - %files %license swift/LICENSE.txt %{_bindir}/swift* %{_mandir}/man1/* -%ghost /usr/lib/swift/clang/include.rpmmoved -%ghost /usr/lib/swift/clang/lib.rpmmoved /usr/lib/swift-lldb/ /usr/lib/swift/Block/ /usr/lib/swift/CoreFoundation/ +/usr/lib/swift/_InternalSwiftSyntaxParser/ /usr/lib/swift/clang/ /usr/lib/swift/dispatch/ /usr/lib/swift/migrator/ @@ -243,6 +231,7 @@ end /usr/lib/swift/pm/ /usr/lib/swift/shims/ /usr/lib/swift_static/ +/usr/lib/swift/CFURLSessionInterface/ %{_libexecdir}/swift-lldb/ %{_sysconfdir}/ld.so.conf.d/swift-lang.conf @@ -265,14 +254,60 @@ end %changelog -* Mon Jul 15 2019 Ron Olson 5.0.2-0.57.20190715git3d95d09 -- Updated to swift-5.0.2-RELEASE -* Tue Jul 02 2019 Ron Olson 5.0.1-0.56.20190418git604054e -- Added patch to fix issue with sys/sysctl.h being depreciated in Rawhide -* Thu Apr 18 2019 Ron Olson 5.0.1-0.55.20190418git604054e -- Updated to swift-5.0.1-RELEASE -* Thu Apr 18 2019 Ron Olson 5.0-0.54.20190325gitba33f9e -- And modified it again to allow new installations +* Wed Jul 24 2019 Ron Olson 5.1-0.24.20190723git3e8f631 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-23-a +* Tue Jul 23 2019 Ron Olson 5.1-0.23.20190719gitf883175 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-19-a and first version + that relies on Python 3 for building +* Mon Jul 15 2019 Ron Olson 5.1-0.22.20190714git7b90512 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-14-a +* Sun Jul 14 2019 Ron Olson 5.1-0.21.20190713git26c2dbe +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-13-a +* Sat Jul 13 2019 Ron Olson 5.1-0.20.20190712gita062b3c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-12-a +* Fri Jul 12 2019 Ron Olson 5.1-0.19.20190711gitacd767e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-11-a +* Thu Jul 11 2019 Ron Olson 5.1-0.18.20190710gitd7f811d +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-10-a +* Wed Jul 10 2019 Ron Olson 5.1-0.17.20190709gitf67864b +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-09-a +* Thu Jul 04 2019 Ron Olson 5.1-0.16.20190703gitd2c038e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-03-a +* Wed Jul 03 2019 Ron Olson 5.1-0.15.20190702git2efadfd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-02-a +* Tue Jul 02 2019 Ron Olson 5.1-0.14.20190701git6761ba4 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-01-a and removed + dependency on python-sphinx as a problem with a pygments lexer was being + treated as an error and causing the builds to fail +* Sun Jun 30 2019 Ron Olson 5.1-0.13.20190629gitdcde8ac +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-29-a +* Sat Jun 29 2019 Ron Olson 5.1-0.12.20190628gitca3c825 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-28-a +* Fri Jun 28 2019 Ron Olson 5.1-0.11.20190627git993b248 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-27-a +* Thu Jun 27 2019 Ron Olson 5.1-0.10.20190626git16859f1 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-26-a and added patch + to remove reference to depreciated header file +* Wed Jun 26 2019 Ron Olson 5.1-0.9.20190624git4e7bcdb +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-24-a and got the REPL + to work +* Sun Jun 23 2019 Ron Olson 5.1-0.8.20190621git9729868 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-21-a +* Fri Jun 21 2019 Ron Olson 5.1-0.7.20190620gita5aa0c6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-20-a +* Thu Jun 20 2019 Ron Olson 5.1-0.6.20190619git500333c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-19-a +* Thu Jun 20 2019 Ron Olson 5.1-0.5.20190619git500333c +- Cleaned up the spec file to remove 4.2 to 5 migration code and some + old patches +* Mon Jun 17 2019 Ron Olson 5.1-0.4.20190616gitcbfbc8e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-16-a +* Sun Jun 02 2019 Ron Olson 5.1-0.3.20190529git37f230a +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-05-29-a +* Fri Apr 26 2019 Ron Olson 5.1-0.2.20190425git6d89fc9 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-04-25-a +* Thu Apr 18 2019 Ron Olson 5.1-0.1.20190416git85a776d +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-04-16-a * Thu Mar 28 2019 Ron Olson 5.0-0.53.20190325gitba33f9e - Modified spec file to handle upgrades from 4.2 to 5.0. * Mon Mar 25 2019 Ron Olson 5.0-0.52.20190325gitba33f9e From b5a55c41f0808e002de98d099788960517b52f6b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 24 Jul 2019 19:19:04 -0500 Subject: [PATCH 031/152] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From a8b39fbd767b8e4ae01ffd08f11befa52eb668fb Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 14 Aug 2019 18:02:42 -0500 Subject: [PATCH 032/152] Updated to 2019-08-14 5.1-dev build --- sources | 26 +++++++++++++------------- swift-lang.spec | 20 ++++++++++++++------ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/sources b/sources index d86f821..72f7222 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 1f5f142f2797061bac3fcc309f03c2aca6964592857e36f340f82cbb20049e038671751b05f27c3d1988f595874ffd819c34f0f9b2f9e98984c99cb422a9d9ce -SHA512 (cmark.tar.gz) = cdb1753ddaed22ffaa10c95151a93d4f39ddf0597c6c8182d687f1b6abf1c8978e3ea7edf162d21db14eb3d15c72ef72c8fb49103c8dcc9290b2680b28b39a60 -SHA512 (corelibs-foundation.tar.gz) = 59a7406c0966d5d853273b66f47d60e3d6fc6d50450d46bff8d515ccd5cb3b74002a53e21355f0db30fa87112a634f9ac7bd9ba449d4e951360dadffa7f54148 -SHA512 (corelibs-libdispatch.tar.gz) = 3ec00b21d968b35c435a7f5906fcfd5d5d17d1e66fd2a118d46027ab3b5d27a395d2698e2dda2897a181cac68cf685e74e9b8d9c683ae91f1596c7f68f631f2f -SHA512 (corelibs-xctest.tar.gz) = e6dbc11cf6c0e831558d0c8cbcf93e05aee014e073841dd20541737125da3d08a045721728247887b7565fd2a4a619adcd75019206d441fe7ec3da908962e350 -SHA512 (llbuild.tar.gz) = 64ef49cc20854501f572de0421f9765bec0e3b76d7d40dda3b0eb05ed015b339f96b9691468911489e23dbcbd3f7974c82e60d47fc2dfd13b99e5b105aa26e69 -SHA512 (lldb.tar.gz) = 322ad5ed8ebc26ad00d52200e5df674a6bd6ec2f16869a99698377c29e285f9a185c760c4bfae77858bbbf900cc150a93d5c86299a58336c2af848a91d60d0d6 -SHA512 (llvm.tar.gz) = 484c9c7b4633e25659916b52d5f68f0ac682ab727c003b23adbf62e44c5ca4cefe1f723a1b5a7933996fef06c4cd899fb2e95e50d8d442a1b00ba70e9329ec4b -SHA512 (package-manager.tar.gz) = 104d826a66f6d8282466f4ff9190ad72392e76a99af82aeb25414ae7cc32980b8c71bd7e5acdb67c71b3cfc2f85e4121df714cd2dd452018d48bc441f9708ce9 -SHA512 (swift-compiler-rt.tar.gz) = 09af536f9bd26bd1d0157ae9783c38834c37e9bd2389026b0c0aa76159aa4e49dd94bbabf9382fe3ed430a44fd2b34c6c8f6911edff410b1bd8945dc187256c5 -SHA512 (swift-integration-tests.tar.gz) = 47cb73445126fd44d5248939f5cab01961ded810f0d1095a10fb10440c55f83b649362c442e6cfe3f5f3629dd580687352f2d7a54312c4c8dac31afff34a1508 -SHA512 (swift-xcode-playground-support.tar.gz) = 789b08b191b75f85841d44105aa071bf49422043346c647f0d22e695d99dd82638e6508272e9e2dc156b14c7d27b038328474c48522f96290e1cb45f3692e95c -SHA512 (swift.tar.gz) = 02a9cd874219822030f10c964ef26b02dbf04d793ed63e50ccac5afe438c9c4e202b6989f5314f8366dcf1209276c4c32509fdbb8ca4aed80b4153b92b39ac77 +SHA512 (clang.tar.gz) = f45e17fa142d28bea21ee8f95dc493d6fd0fbe1121249322b21cced25c1874566cb736adf99bf81b1c312f40cfe2ce416f8a065aa1f12d796830cb76ca309643 +SHA512 (cmark.tar.gz) = 34191f64f143e5fd0ab6a9c10a08a8823e396f7e1bab6bb0e45d98c77cc470181f27e9d2161e8bd0e688c7b02b39b25bcf3d0100b3cc21583e219be14609de00 +SHA512 (corelibs-foundation.tar.gz) = c242cd0a8a506a8689ce118908a0fa1c23c1e2389ae0e6fae1b04dda68f4e151f281a9978eb64ba7cf3498bacdafacced8ca5571dc363dec29510db04c690963 +SHA512 (corelibs-libdispatch.tar.gz) = 3590b2e0127eab85f05707f606bd320481defa239caf503fc664924bbcb62a63bf0591487acb3c8404323700da202fa2c8aabbd7869f697f3ba19b228043a560 +SHA512 (corelibs-xctest.tar.gz) = f1321ebc572dc171abb731ba466ada7b0a8c3eaed646cf98b9927b93c4418acc96a6ef2b35b60c829757c71dc4950320161b7914bbd17c8c6f76719be824a7f5 +SHA512 (llbuild.tar.gz) = e5215a1bb21a91b9c1cf6cd4a40f7b815ca70d483905202b9a4211d112695ebf40855b9b11e781ea7179a9b2cbd1ea0067fcf82d3442136f61a896ffd8188e20 +SHA512 (lldb.tar.gz) = 1cb233667818a2be0a06630af582201df80841472b7ec22eacb986eb17c1faadf8235b47f08af5e8d1f936363ae60e68992e5d7e555cb05531b26183dc9a17c5 +SHA512 (llvm.tar.gz) = e656602a7c3d508c93ca641c5256dd5d5a427c98296740a2f630b47d1dc55ffee6590d60d30e68d53a496f8fd12f4904ea931a2b23949b481c5333f032c44464 +SHA512 (package-manager.tar.gz) = f0d003ca92c49e47af7ff2c0df8d7b1452d583b6f094bbd0c20e79ecc32f1019c6e3d88324d2559ea3f329bc250db0b9a43191499823c54f18a8fe6f1b447411 +SHA512 (swift-compiler-rt.tar.gz) = eb4ede0a92c2b83301ab42586231e46d48e72e5ad27feb9b6a5929b3bea12f164a218d8d1bda06e4e00c8133a59f5a5e64cfaef6478d8759b491ba2a5cece9ca +SHA512 (swift-integration-tests.tar.gz) = 9d61a0db31dc190921cd1619b31ce5ad2aecc216585c3fadda304d300e8b7d009f97a6d3307824d546319fcc3cc8e7fe49e0b92e916d38ee58556b2809309a11 +SHA512 (swift-xcode-playground-support.tar.gz) = af58473e6eaee4308911b2eeb8b9065fb56f8797f9545beb74f13acb13db978efd79755a1a6242a7a198aa05aa69c1b5ab60d1548beb99bd8b480568662c76d0 +SHA512 (swift.tar.gz) = 7f5ebd97cbba80c0539f7d13cd854bb174221dc2453024082e51fd5f9468f396b9b913731b6ab944c37e6735bd6e475aa3097c63aea4077d7ae9e6378c14f20b diff --git a/swift-lang.spec b/swift-lang.spec index eea6bd2..b77d70b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2019-07-23-a -%global swiftgithash 3e8f631 -%global swiftgitdate 20190723 +%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a +%global swiftgithash 425a146 +%global swiftgitdate 20190813 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.1 -Release: 0.24.%{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 @@ -232,13 +232,12 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m /usr/lib/swift/shims/ /usr/lib/swift_static/ /usr/lib/swift/CFURLSessionInterface/ +/usr/lib/swift/CFXMLInterface/ %{_libexecdir}/swift-lldb/ %{_sysconfdir}/ld.so.conf.d/swift-lang.conf %files runtime -%ghost /usr/lib/swift/clang/include.rpmmoved -%ghost /usr/lib/swift/clang/lib.rpmmoved %dir /usr/lib/swift /usr/lib/swift/linux/ %ifarch aarch64 @@ -254,6 +253,15 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Aug 14 2019 Ron Olson 5.1-0.28.20190813git425a146 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a +* Tue Aug 13 2019 Ron Olson 5.1-0.27.20190812git425a146 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-12-a and added another + directory +* Fri Jul 26 2019 Ron Olson 5.1-0.26.20190725git0450b7d +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-25-a +* Thu Jul 25 2019 Ron Olson 5.1-0.25.20190724gite9b6385 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-24-a * Wed Jul 24 2019 Ron Olson 5.1-0.24.20190723git3e8f631 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-23-a * Tue Jul 23 2019 Ron Olson 5.1-0.23.20190719gitf883175 From 77e5c101cd4f90b41f43868804ce980b50b70555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:06:33 +0200 Subject: [PATCH 033/152] Rebuilt for Python 3.8 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index b77d70b..3afe0b0 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.1 -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 @@ -253,6 +253,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Aug 19 2019 Miro Hrončok - 5.1-0.29.20190813git425a146 +- Rebuilt for Python 3.8 + * Wed Aug 14 2019 Ron Olson 5.1-0.28.20190813git425a146 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a * Tue Aug 13 2019 Ron Olson 5.1-0.27.20190812git425a146 From 7ff4af2fca8b86be8c1fb1577913ffa9547ff204 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 18 Sep 2019 12:56:52 -0500 Subject: [PATCH 034/152] Updated to latest dev build 2019-09-18 for Rawhide --- build-setup.patch | 37 +++++++++++------- lldb_python38_platform.patch | 21 +++++++++++ sources | 26 ++++++------- swift-lang.spec | 73 ++++++++++++++++++++++++++++++++---- 4 files changed, 124 insertions(+), 33 deletions(-) create mode 100644 lldb_python38_platform.patch diff --git a/build-setup.patch b/build-setup.patch index d14cecd..d0cc4e2 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,6 +1,15 @@ ---- swift/utils/build-presets.ini.orig 2019-04-28 10:12:14.640900289 -0500 -+++ swift/utils/build-presets.ini 2019-04-28 10:27:42.926567124 -0500 -@@ -723,12 +723,9 @@ +--- swift/utils/build-presets.ini.orig 2019-08-16 22:08:50.000000000 -0500 ++++ swift/utils/build-presets.ini 2019-08-21 21:26:01.340252697 -0500 +@@ -730,7 +730,7 @@ + #===------------------------------------------------------------------------===# + [preset: mixin_linux_install_components_with_clang] + swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc +-llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd ++llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt + + [preset: mixin_linux_installation] + mixin-preset= +@@ -740,12 +740,9 @@ llbuild swiftpm xctest @@ -13,16 +22,7 @@ install-swift install-lldb install-llbuild -@@ -737,7 +734,7 @@ - install-libicu - install-prefix=/usr - swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc --llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd -+llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt - install-libcxx - build-swift-static-stdlib - build-swift-static-sdk-overlay -@@ -766,8 +763,8 @@ +@@ -782,8 +779,8 @@ test-optimized foundation libdispatch @@ -33,3 +33,14 @@ lit-args=-v --time-tests dash-dash +@@ -996,8 +993,8 @@ + xctest + foundation + libdispatch +-indexstore-db +-sourcekit-lsp ++indexstore-db=0 ++sourcekit-lsp=0 + dash-dash + + install-swift diff --git a/lldb_python38_platform.patch b/lldb_python38_platform.patch new file mode 100644 index 0000000..3408269 --- /dev/null +++ b/lldb_python38_platform.patch @@ -0,0 +1,21 @@ +--- lldb/scripts/Python/finishSwigPythonLLDB.py.orig 2019-09-09 10:19:48.545053827 -0500 ++++ lldb/scripts/Python/finishSwigPythonLLDB.py 2019-09-09 10:28:59.121109016 -0500 +@@ -673,8 +673,16 @@ + + from distutils.sysconfig import get_python_lib + if platform.system() == 'Linux': +- if platform.linux_distribution()[0] == 'Fedora': +- dbg.dump_text("Platform is Fedora Linux") ++ linux_distro = '' ++ # platform.linux_distribution() is not available in ++ # Python >= 3.8 ++ if sys.version_info[0] >= 3 and sys.version_info[1] >= 8: ++ from distro import linux_distribution ++ linux_distro = linux_distribution()[0] ++ else: ++ linux_distro = platform.linux_distribution()[0] ++ if linux_distro == 'Fedora' or linux_distro == 'Red Hat Enterprise Linux' or linux_distro == 'CentOS Linux': ++ dbg.dump_text("Platform is Fedora Linux or Red Hat Enterprise Linux or CentOS Linux") + # On Fedora the installation gets split into lib and lib64, + # which prevents building lldb from completing successfully. + return get_python_lib(False, False, vstrPythonInstallDir) diff --git a/sources b/sources index 72f7222..a41741d 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = f45e17fa142d28bea21ee8f95dc493d6fd0fbe1121249322b21cced25c1874566cb736adf99bf81b1c312f40cfe2ce416f8a065aa1f12d796830cb76ca309643 -SHA512 (cmark.tar.gz) = 34191f64f143e5fd0ab6a9c10a08a8823e396f7e1bab6bb0e45d98c77cc470181f27e9d2161e8bd0e688c7b02b39b25bcf3d0100b3cc21583e219be14609de00 -SHA512 (corelibs-foundation.tar.gz) = c242cd0a8a506a8689ce118908a0fa1c23c1e2389ae0e6fae1b04dda68f4e151f281a9978eb64ba7cf3498bacdafacced8ca5571dc363dec29510db04c690963 -SHA512 (corelibs-libdispatch.tar.gz) = 3590b2e0127eab85f05707f606bd320481defa239caf503fc664924bbcb62a63bf0591487acb3c8404323700da202fa2c8aabbd7869f697f3ba19b228043a560 -SHA512 (corelibs-xctest.tar.gz) = f1321ebc572dc171abb731ba466ada7b0a8c3eaed646cf98b9927b93c4418acc96a6ef2b35b60c829757c71dc4950320161b7914bbd17c8c6f76719be824a7f5 -SHA512 (llbuild.tar.gz) = e5215a1bb21a91b9c1cf6cd4a40f7b815ca70d483905202b9a4211d112695ebf40855b9b11e781ea7179a9b2cbd1ea0067fcf82d3442136f61a896ffd8188e20 -SHA512 (lldb.tar.gz) = 1cb233667818a2be0a06630af582201df80841472b7ec22eacb986eb17c1faadf8235b47f08af5e8d1f936363ae60e68992e5d7e555cb05531b26183dc9a17c5 -SHA512 (llvm.tar.gz) = e656602a7c3d508c93ca641c5256dd5d5a427c98296740a2f630b47d1dc55ffee6590d60d30e68d53a496f8fd12f4904ea931a2b23949b481c5333f032c44464 -SHA512 (package-manager.tar.gz) = f0d003ca92c49e47af7ff2c0df8d7b1452d583b6f094bbd0c20e79ecc32f1019c6e3d88324d2559ea3f329bc250db0b9a43191499823c54f18a8fe6f1b447411 -SHA512 (swift-compiler-rt.tar.gz) = eb4ede0a92c2b83301ab42586231e46d48e72e5ad27feb9b6a5929b3bea12f164a218d8d1bda06e4e00c8133a59f5a5e64cfaef6478d8759b491ba2a5cece9ca -SHA512 (swift-integration-tests.tar.gz) = 9d61a0db31dc190921cd1619b31ce5ad2aecc216585c3fadda304d300e8b7d009f97a6d3307824d546319fcc3cc8e7fe49e0b92e916d38ee58556b2809309a11 -SHA512 (swift-xcode-playground-support.tar.gz) = af58473e6eaee4308911b2eeb8b9065fb56f8797f9545beb74f13acb13db978efd79755a1a6242a7a198aa05aa69c1b5ab60d1548beb99bd8b480568662c76d0 -SHA512 (swift.tar.gz) = 7f5ebd97cbba80c0539f7d13cd854bb174221dc2453024082e51fd5f9468f396b9b913731b6ab944c37e6735bd6e475aa3097c63aea4077d7ae9e6378c14f20b +SHA512 (clang.tar.gz) = 73dc78d01a480175d5ba62dafec86bee0ba188a894922d4be5c3625ae5ff191d74a833bbabde2d9e50ce4cd3dc81f5906491a6efe4bc2db41402102998773389 +SHA512 (cmark.tar.gz) = 59aa8003ce33eb54fca9d27d5023d83e486df995bd60786285874c1ae0070ca61ced9360a949748b30f60d04fc823b044ca6c044cf9f63b4653ae2121bb8491f +SHA512 (corelibs-foundation.tar.gz) = db70e6c9e62bb5d3380dcc047ab63cf08644e830de82a6d976e80e4c77cb25199e69dfbce23c659e29ac353968ec6e4be0259325d7691276223edb4740fc866d +SHA512 (corelibs-libdispatch.tar.gz) = 3bca69270b387e314fbca71f80ec56396b5cdc601087da800e69232469a28221132a419b3b3813bcce3d0d3bd89c9a6fe2ed443f570515fdd6235b52b63c354b +SHA512 (corelibs-xctest.tar.gz) = 7b8bc88a2c61c43effbd495ddc4fd748f737bb5899e11f91d668aec340268390cd44bb3ffb422285123ae52d536d894e60c588195c4cc648e82d4abb7c510f65 +SHA512 (llbuild.tar.gz) = ce0d9f441462547a1d2ecc90b49b40cc15c2fe1927142a721e56dfff6778470fa67cdefdcbb58e36afc9d8bdf7abb9d2e7096812c22410edbd2286074a9794c0 +SHA512 (lldb.tar.gz) = 2d8b5c6ffb7a102eaaceb137b7e9d5d8d45a93fbe1ff28caafdb8c500c0cd2755e9e150fd2bf77b09f65187c4105329f9c9f24e80f77e9d0d0f74954d1eeec17 +SHA512 (llvm.tar.gz) = 1694eba9209585375094dced732bc27afd161f27b020dfdbe2e720bb0b028de0b20a99218000f77de6881e684fe84fb4645afcca1e7dbf0f413d8d8a14d05e7b +SHA512 (package-manager.tar.gz) = eb02116e21f22a2faec979e2020ec74c51028acbbc0503b9fb51184f602879430da657a8b920a800298bcbee8d0cba3a66e0c7c7b80909419361e75998af5549 +SHA512 (swift-compiler-rt.tar.gz) = 8473f053dfe1c74787e388d892655c45b968bbe3c23757468cf12b54bfc47e492cb1924fa0c5ead9afc7b7fbf3745dc59c52f3f7a267f8e7cefbd1cd2e29e435 +SHA512 (swift-integration-tests.tar.gz) = 8483262fc37d2d18e251e0c91116fc233f29ace43efb7759c7b3fed7c57b19f09f0e1d87e4f1ee9308a2cb0e0f52d080217922864d7844dcc0d6db854d140eec +SHA512 (swift-xcode-playground-support.tar.gz) = 49558664cd9413041d34a82574924b49003486d4e3623d267d5ac6fbbd3c4391a7b4b2baad7c2ddb53428f05fb8b0dea57122e531243b2f3709b289cc44d2b8e +SHA512 (swift.tar.gz) = e51dba3fe8570162dd888f7005b71d8620b7389c5cf7181b4572497d6a3f0b874274e5a9b60d05b5cdb54440ecc4ba139906c6b1fcbf06cb23ebdabce07a6874 diff --git a/swift-lang.spec b/swift-lang.spec index 3afe0b0..7fe2b9d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a -%global swiftgithash 425a146 -%global swiftgitdate 20190813 +%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2019-09-17-a +%global swiftgithash 1f49050 +%global swiftgitdate 20190917 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.1 -Release: 0.29.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.55.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -35,6 +35,7 @@ Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch Patch5: python3.patch Patch6: linux-tests-python-3.patch +Patch7: lldb_python38_platform.patch BuildRequires: clang BuildRequires: cmake @@ -44,6 +45,7 @@ BuildRequires: perl-podlators BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel @@ -135,6 +137,7 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Python 3 is the new default so we need to make the python code work with it %patch5 -p0 %patch6 -p0 +%patch7 -p0 %build @@ -230,6 +233,7 @@ 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/ +/usr/lib/swift/FrameworkABIBaseline/ /usr/lib/swift_static/ /usr/lib/swift/CFURLSessionInterface/ /usr/lib/swift/CFXMLInterface/ @@ -253,9 +257,64 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Mon Aug 19 2019 Miro Hrončok - 5.1-0.29.20190813git425a146 -- Rebuilt for Python 3.8 - +* Wed Sep 18 2019 Ron Olson 5.1-0.55.20190917git1f49050 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-17-a +* Tue Sep 17 2019 Ron Olson 5.1-0.54.20190916git279ca88 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-16-a +* Mon Sep 16 2019 Ron Olson 5.1-0.53.20190915git279ca88 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-15-a +* Sun Sep 15 2019 Ron Olson 5.1-0.52.20190914git279ca88 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-14-a +* Sat Sep 14 2019 Ron Olson 5.1-0.51.20190913git11b9972 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-13-a +* Fri Sep 13 2019 Ron Olson 5.1-0.50.20190912gitb9d082f +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-12-a +* Thu Sep 12 2019 Ron Olson 5.1-0.49.20190911gitb8f4481 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-11-a +* Tue Sep 10 2019 Ron Olson 5.1-0.48.20190909git28a0436 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-09-a +* Mon Sep 09 2019 Ron Olson 5.1-0.47.20190908git28a0436 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-08-a also added test for + Red Hat Enterprise Linux and CentOS (when it is updated to match RHEL 8) + Also packaged some new files +* Fri Sep 06 2019 Ron Olson 5.1-0.46.20190905git1880eb0 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-05-a +* Thu Sep 05 2019 Ron Olson 5.1-0.45.20190904git1880eb0 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-04-a +* Wed Sep 04 2019 Ron Olson 5.1-0.44.20190903gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-03-a +* Tue Sep 03 2019 Ron Olson 5.1-0.43.20190902gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-02-a +* Mon Sep 02 2019 Ron Olson 5.1-0.42.20190901gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-01-a +* Sun Sep 01 2019 Ron Olson 5.1-0.41.20190831gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-31-a +* Fri Aug 30 2019 Ron Olson 5.1-0.40.20190829gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-29-a +* Thu Aug 29 2019 Ron Olson 5.1-0.39.20190828gite90298c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-28-a and added explicit + requirement for python3-distro +* Wed Aug 28 2019 Ron Olson 5.1-0.38.20190827gite90298c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-27-a and added a patch + to allow LLDB to be built using Python 3.8 (currently in F32/Rawhide) +* Tue Aug 27 2019 Ron Olson 5.1-0.37.20190826git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-26-a +* Mon Aug 26 2019 Ron Olson 5.1-0.36.20190825git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-25-a +* Sun Aug 25 2019 Ron Olson 5.1-0.35.20190824git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a +* Sat Aug 24 2019 Ron Olson 5.1-0.34.20190823git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-23-a +* Fri Aug 23 2019 Ron Olson 5.1-0.33.20190822git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-22-a +* Wed Aug 21 2019 Ron Olson 5.1-0.32.20190820git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-20-a +* Mon Aug 19 2019 Ron Olson 5.1-0.31.20190817git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-17-a +* Sat Aug 17 2019 Ron Olson 5.1-0.30.20190816git1329017 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-16-a +* Fri Aug 16 2019 Ron Olson 5.1-0.29.20190815git1329017 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-15-a * Wed Aug 14 2019 Ron Olson 5.1-0.28.20190813git425a146 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a * Tue Aug 13 2019 Ron Olson 5.1-0.27.20190812git425a146 From 605dfbc6310af5e20edd425aae2254cd730c239e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 20 Sep 2019 09:38:17 -0500 Subject: [PATCH 035/152] Updated to Swift 5.1-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 14 +++++++++----- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/sources b/sources index a41741d..b35c770 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 73dc78d01a480175d5ba62dafec86bee0ba188a894922d4be5c3625ae5ff191d74a833bbabde2d9e50ce4cd3dc81f5906491a6efe4bc2db41402102998773389 -SHA512 (cmark.tar.gz) = 59aa8003ce33eb54fca9d27d5023d83e486df995bd60786285874c1ae0070ca61ced9360a949748b30f60d04fc823b044ca6c044cf9f63b4653ae2121bb8491f -SHA512 (corelibs-foundation.tar.gz) = db70e6c9e62bb5d3380dcc047ab63cf08644e830de82a6d976e80e4c77cb25199e69dfbce23c659e29ac353968ec6e4be0259325d7691276223edb4740fc866d -SHA512 (corelibs-libdispatch.tar.gz) = 3bca69270b387e314fbca71f80ec56396b5cdc601087da800e69232469a28221132a419b3b3813bcce3d0d3bd89c9a6fe2ed443f570515fdd6235b52b63c354b -SHA512 (corelibs-xctest.tar.gz) = 7b8bc88a2c61c43effbd495ddc4fd748f737bb5899e11f91d668aec340268390cd44bb3ffb422285123ae52d536d894e60c588195c4cc648e82d4abb7c510f65 -SHA512 (llbuild.tar.gz) = ce0d9f441462547a1d2ecc90b49b40cc15c2fe1927142a721e56dfff6778470fa67cdefdcbb58e36afc9d8bdf7abb9d2e7096812c22410edbd2286074a9794c0 -SHA512 (lldb.tar.gz) = 2d8b5c6ffb7a102eaaceb137b7e9d5d8d45a93fbe1ff28caafdb8c500c0cd2755e9e150fd2bf77b09f65187c4105329f9c9f24e80f77e9d0d0f74954d1eeec17 -SHA512 (llvm.tar.gz) = 1694eba9209585375094dced732bc27afd161f27b020dfdbe2e720bb0b028de0b20a99218000f77de6881e684fe84fb4645afcca1e7dbf0f413d8d8a14d05e7b -SHA512 (package-manager.tar.gz) = eb02116e21f22a2faec979e2020ec74c51028acbbc0503b9fb51184f602879430da657a8b920a800298bcbee8d0cba3a66e0c7c7b80909419361e75998af5549 -SHA512 (swift-compiler-rt.tar.gz) = 8473f053dfe1c74787e388d892655c45b968bbe3c23757468cf12b54bfc47e492cb1924fa0c5ead9afc7b7fbf3745dc59c52f3f7a267f8e7cefbd1cd2e29e435 -SHA512 (swift-integration-tests.tar.gz) = 8483262fc37d2d18e251e0c91116fc233f29ace43efb7759c7b3fed7c57b19f09f0e1d87e4f1ee9308a2cb0e0f52d080217922864d7844dcc0d6db854d140eec -SHA512 (swift-xcode-playground-support.tar.gz) = 49558664cd9413041d34a82574924b49003486d4e3623d267d5ac6fbbd3c4391a7b4b2baad7c2ddb53428f05fb8b0dea57122e531243b2f3709b289cc44d2b8e -SHA512 (swift.tar.gz) = e51dba3fe8570162dd888f7005b71d8620b7389c5cf7181b4572497d6a3f0b874274e5a9b60d05b5cdb54440ecc4ba139906c6b1fcbf06cb23ebdabce07a6874 +SHA512 (clang.tar.gz) = 0848d7a01294ef8f1637e3ee0efb3eef0fced729a68826afa147a814e821cd4fb8a1d6137353efa7c953a6f3ecae557eb88e77c23232c4e644148f6f2afa99af +SHA512 (cmark.tar.gz) = 92bba62ea4c9207febcf0deaa69fc99bf8b7848a623bac012539169c30cf9f1c54e0a2285b93e86a9384a4d2b56edf6ed696dfd5a6e2afb292dbed7226ca46dc +SHA512 (corelibs-foundation.tar.gz) = 7a4bb7cc24b03e0c61ffdc30157259008907d531b8491c55f26715cd3ece540df044181796ac05eff4dbfac14ad3500c22a313db66074fde9779742b6d182f58 +SHA512 (corelibs-libdispatch.tar.gz) = 6aaabf0cce62b8fc327944964d4e157316081e4f1c2319d404b19363d4404464af62a28e54efe7b7c52b1f3b03bfdb52222ae3c0f65d2709a4a04a3aa0eb2527 +SHA512 (corelibs-xctest.tar.gz) = 9016d8c18c9b747a7c6016e27f1a42a22390ba2f4486f3f5f2fb9aec4fca1d80062be952725784bd06dd088049518528bc77ce3c64d84d1ed58be95396bdf9a6 +SHA512 (llbuild.tar.gz) = 90bf5fc225b66a05b7b0390015fc47a7463a9c53679086015a927b59b2483856b43bd689db1246f49d5d63c1f47e6c770d8162c6ca7becb93f6ee715de2c26e1 +SHA512 (lldb.tar.gz) = c7938ce8d7655390d80f48288391c8a77398542bd37a41c20651e44b435ad079f019f27d8c294131a682f1649c6db1f8e28c857387d39671fd44308183793911 +SHA512 (llvm.tar.gz) = 609de4fa7c7907ce9a1fc623335fc4e2a708340dba9902d74c879619df5b55a4bfc099f461d78178199edb9404dab68588b907d4c8ff85e58d2ea94a8bda293f +SHA512 (package-manager.tar.gz) = 3d54dce43f762a75dd0025e08f8a84339bf258ea6b94e1521f25c82a6beccdceb67bc8c5656600c2134ae673e548f75aceaa328b024598ba35bd7da8a76c81d0 +SHA512 (swift-compiler-rt.tar.gz) = 7a0388cb89cc28df09915b3709e5026df54e2925b2aab7a7ac009835e82233cf35a2e2d06213b90ffc3bccba73b4d5c7c073fd7d259f8abec195d211a086da27 +SHA512 (swift-integration-tests.tar.gz) = c86618284ea15418c9a4dbbcb98ada2559488ef8eac9faa15029eb291fff03b2db547f9e47ea9169d30f4aa6c7655b581049339181c1fea6d451a0a6505e7492 +SHA512 (swift-xcode-playground-support.tar.gz) = c7faeb2b47aa4e8620f661738a12ec68d038697523a482763b3cb9508921ab60794f11ba73b9bcae38c5cda09555d56660f7eae95a179ede8ca3374cd1f0f59a +SHA512 (swift.tar.gz) = 697e7b8977a9b9550b790cc93cfb6b68211ecc316de3eb505b63c103f3c786d50c96ca340acf03816579f92c87c3dbaebe2a8b2d164492c5a673feb76a88ac15 diff --git a/swift-lang.spec b/swift-lang.spec index 7fe2b9d..a950ad9 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2019-09-17-a -%global swiftgithash 1f49050 -%global swiftgitdate 20190917 +%global swifttag 5.1-RELEASE +%global swiftgithash fa33242 +%global swiftgitdate 20190919 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.1 -Release: 0.55.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.57.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -233,7 +233,6 @@ 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/ -/usr/lib/swift/FrameworkABIBaseline/ /usr/lib/swift_static/ /usr/lib/swift/CFURLSessionInterface/ /usr/lib/swift/CFXMLInterface/ @@ -257,6 +256,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Sep 19 2019 Ron Olson 5.1-0.57.20190919gitfa33242 +- Updated to swift-5.1-RELEASE and removed FrameworkABIBaseline as apparently + it disappeared +* Thu Sep 19 2019 Ron Olson 5.1-0.56.20190918gite05f800 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-18-a * Wed Sep 18 2019 Ron Olson 5.1-0.55.20190917git1f49050 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-17-a * Tue Sep 17 2019 Ron Olson 5.1-0.54.20190916git279ca88 From 614c5e4a76bb0122441a70590857009e210f4b64 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 4 Oct 2019 19:56:58 -0500 Subject: [PATCH 036/152] Updated to swift-5.1.1-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 12 +++++++----- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/sources b/sources index b35c770..4c60f13 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 0848d7a01294ef8f1637e3ee0efb3eef0fced729a68826afa147a814e821cd4fb8a1d6137353efa7c953a6f3ecae557eb88e77c23232c4e644148f6f2afa99af -SHA512 (cmark.tar.gz) = 92bba62ea4c9207febcf0deaa69fc99bf8b7848a623bac012539169c30cf9f1c54e0a2285b93e86a9384a4d2b56edf6ed696dfd5a6e2afb292dbed7226ca46dc -SHA512 (corelibs-foundation.tar.gz) = 7a4bb7cc24b03e0c61ffdc30157259008907d531b8491c55f26715cd3ece540df044181796ac05eff4dbfac14ad3500c22a313db66074fde9779742b6d182f58 -SHA512 (corelibs-libdispatch.tar.gz) = 6aaabf0cce62b8fc327944964d4e157316081e4f1c2319d404b19363d4404464af62a28e54efe7b7c52b1f3b03bfdb52222ae3c0f65d2709a4a04a3aa0eb2527 -SHA512 (corelibs-xctest.tar.gz) = 9016d8c18c9b747a7c6016e27f1a42a22390ba2f4486f3f5f2fb9aec4fca1d80062be952725784bd06dd088049518528bc77ce3c64d84d1ed58be95396bdf9a6 -SHA512 (llbuild.tar.gz) = 90bf5fc225b66a05b7b0390015fc47a7463a9c53679086015a927b59b2483856b43bd689db1246f49d5d63c1f47e6c770d8162c6ca7becb93f6ee715de2c26e1 -SHA512 (lldb.tar.gz) = c7938ce8d7655390d80f48288391c8a77398542bd37a41c20651e44b435ad079f019f27d8c294131a682f1649c6db1f8e28c857387d39671fd44308183793911 -SHA512 (llvm.tar.gz) = 609de4fa7c7907ce9a1fc623335fc4e2a708340dba9902d74c879619df5b55a4bfc099f461d78178199edb9404dab68588b907d4c8ff85e58d2ea94a8bda293f -SHA512 (package-manager.tar.gz) = 3d54dce43f762a75dd0025e08f8a84339bf258ea6b94e1521f25c82a6beccdceb67bc8c5656600c2134ae673e548f75aceaa328b024598ba35bd7da8a76c81d0 -SHA512 (swift-compiler-rt.tar.gz) = 7a0388cb89cc28df09915b3709e5026df54e2925b2aab7a7ac009835e82233cf35a2e2d06213b90ffc3bccba73b4d5c7c073fd7d259f8abec195d211a086da27 -SHA512 (swift-integration-tests.tar.gz) = c86618284ea15418c9a4dbbcb98ada2559488ef8eac9faa15029eb291fff03b2db547f9e47ea9169d30f4aa6c7655b581049339181c1fea6d451a0a6505e7492 -SHA512 (swift-xcode-playground-support.tar.gz) = c7faeb2b47aa4e8620f661738a12ec68d038697523a482763b3cb9508921ab60794f11ba73b9bcae38c5cda09555d56660f7eae95a179ede8ca3374cd1f0f59a -SHA512 (swift.tar.gz) = 697e7b8977a9b9550b790cc93cfb6b68211ecc316de3eb505b63c103f3c786d50c96ca340acf03816579f92c87c3dbaebe2a8b2d164492c5a673feb76a88ac15 +SHA512 (clang.tar.gz) = 51e936271e390801ec780cf841e6ad2aa6112934f3788a1cd99a64f3526bffc45835cabceb6155638b777beab8fc5e505ef18a5e029bd35a79181f08f07c97c9 +SHA512 (cmark.tar.gz) = 8727e522610ebf2b37960ff082dd3d4e000a6f7130d6f21c648edc26d1f57e94086ce26f6e84799ac43526393a9d6689529aa7a6fe73329edcffe26836afeeba +SHA512 (corelibs-foundation.tar.gz) = 8d49960fda7f1a68117c9219ed3eacb39c8526b60d715f30bb0b8e20c6a7f6776fc9c906ea5d3478ba6d58bfa10d967dbfef271dd48147f6aa79d4d876fabb2b +SHA512 (corelibs-libdispatch.tar.gz) = 27ea1d2a2372b31f27c0b46216c363451af3c7701f3517909ae0be75ff31549f6a74c61b7a81c618ebd5e5630c9398e8b8bf4b69af5565962ffef55cb627d1f2 +SHA512 (corelibs-xctest.tar.gz) = 4c639f8d93ca4acf98df0ca1c9ad66d277adc5b175d41414e2c74166c5aff537e7560fdf6179c1aecde91a7b0428df0c2f617ac10ac9e8f0d6e72600a3ed8e9e +SHA512 (llbuild.tar.gz) = 08f111bb06749edc47f0527e9e7b8c02e6e4df0bdc6a4077fec2ac8aca6fe5866de79fd27fcac5b1e521f1ebb2c495d9b148e8b9d36dad4787bbaddf0c954568 +SHA512 (lldb.tar.gz) = c7fc26cff55df5e34942a6904ad32c0150f9d9b5f880430e0b94bb73fb671621b1ffbb12eef67b1cfd09444ad19dccbabd5659f995bd5dc120f09a4bc9ced0d6 +SHA512 (llvm.tar.gz) = 2e0c525a4644888a0b5e14517e6b67071be322cd759cd053f2ad5867be998c5f1a68cf1fde58019f89706dd96899eb2813d7101320edcbfecb0ba8eecda317dc +SHA512 (package-manager.tar.gz) = 7926667871ccbf935a27dff132d4bb4c75a2389b97a77209da3c102db2ffcc46c3937bf81484bf2558e4c354b7eee95f6a5223ae6ddbc101fa82044340e91351 +SHA512 (swift-compiler-rt.tar.gz) = 9523cbae5bf065423041795d6b3ed2560d8d643fb4fa7d949d6dc4a642e0320a1d9fbcf4f5f4ba5cb6586b07ec2bf786d52218f92fdff72c75f2a73983b379e8 +SHA512 (swift-integration-tests.tar.gz) = 81374de3f960846d310b0bdd4194b05c4ec9adf0b59a259851980e79187ce17e805d28806e2b94daf745a0c97afa287c1193fe5c02799fcb80b5e66a9e7df992 +SHA512 (swift-xcode-playground-support.tar.gz) = b674521318da220a2fc83de4f214b59e74515ad0c6d706ca37d73bbeb5f3fc81efd8397caae02e2ac17b3488cacb2f0b55a2ef457441c897d34d6ad69ea59892 +SHA512 (swift.tar.gz) = 967fc2224014b3ed04d12c45c6b2169a02d7eb170053fac6d4b9a2dee5edf215ab595ab7d8504d5dcc5665b606fa45801cc3833d1d8787eafe612ff7b2311f9c diff --git a/swift-lang.spec b/swift-lang.spec index a950ad9..f243712 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.1-RELEASE -%global swiftgithash fa33242 -%global swiftgitdate 20190919 +%global swifttag 5.1.1-RELEASE +%global swiftgithash 4242edd +%global swiftgitdate 20191004 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.1 -Release: 0.57.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1.1 +Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -256,6 +256,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Oct 04 2019 Ron Olson 5.1.1-0.1.20191004git4242edd +- Updated to swift-5.1.1-RELEASE * Thu Sep 19 2019 Ron Olson 5.1-0.57.20190919gitfa33242 - Updated to swift-5.1-RELEASE and removed FrameworkABIBaseline as apparently it disappeared From 564a5f987fbba7e6be893a897135baed1ad9c81e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 17 Oct 2019 14:48:54 -0500 Subject: [PATCH 037/152] Fixed issue with swift-lang-runtime only being offered to install --- swift-lang.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index f243712..150fdbb 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.1.1 -Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.2.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -64,9 +64,6 @@ Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Conflicts: %{name}-runtime < %{version}-%{release} ExclusiveArch: x86_64 aarch64 @@ -87,9 +84,6 @@ correct programs easier for the developer. Summary: Runtime files for Swift programs Provides: %{name}-runtime = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Conflicts: %{name}-runtime < %{version}-%{release} %description runtime @@ -256,6 +250,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Oct 17 2019 Ron Olson 5.1.1-0.2.20191004git4242edd +- Fixed issue with installing swift-lang only gave the option for + swift-lang-runtime * Fri Oct 04 2019 Ron Olson 5.1.1-0.1.20191004git4242edd - Updated to swift-5.1.1-RELEASE * Thu Sep 19 2019 Ron Olson 5.1-0.57.20190919gitfa33242 From b81010b99277f7aa5302dd126fe1012281f6aa2b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 30 Oct 2019 15:11:04 -0500 Subject: [PATCH 038/152] Fix for Bug 1766922 (https://bugzilla.redhat.com/show_bug.cgi\?id\=1766922) --- compiler-rt-sanitizer.patch | 11 +++++++++++ swift-lang.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 compiler-rt-sanitizer.patch diff --git a/compiler-rt-sanitizer.patch b/compiler-rt-sanitizer.patch new file mode 100644 index 0000000..bf8df64 --- /dev/null +++ b/compiler-rt-sanitizer.patch @@ -0,0 +1,11 @@ +--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2019-10-30 12:10:54.591060832 -0500 ++++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-10-30 12:11:56.483063580 -0500 +@@ -1131,7 +1131,7 @@ + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) + /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ +-CHECK_SIZE_AND_OFFSET(ipc_perm, mode); ++/* CHECK_SIZE_AND_OFFSET(ipc_perm, mode); */ /* Error with clang 9.0.0 */ + #endif + + CHECK_TYPE_SIZE(shmid_ds); diff --git a/swift-lang.spec b/swift-lang.spec index 150fdbb..f6ee58b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.1.1 -Release: 0.2.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -36,6 +36,7 @@ Patch4: swift-unwrapped.patch Patch5: python3.patch Patch6: linux-tests-python-3.patch Patch7: lldb_python38_platform.patch +Patch8: compiler-rt-sanitizer.patch BuildRequires: clang BuildRequires: cmake @@ -133,6 +134,9 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo %patch6 -p0 %patch7 -p0 +# New in Clang 9 is an assertion error of an array declared with a negative size +%patch8 -p0 + %build export VERBOSE=1 @@ -250,6 +254,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Oct 30 2019 Ron Olson 5.1.1-0.3.20191004git4242edd +- Clang 9 was causing compiler-rt to not build properly due to a macro. * Thu Oct 17 2019 Ron Olson 5.1.1-0.2.20191004git4242edd - Fixed issue with installing swift-lang only gave the option for swift-lang-runtime From 139807c3a87c592b9fbdab1e0f77a11cb0041db5 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 2 Nov 2019 12:59:25 +0000 Subject: [PATCH 039/152] Rebuild for ICU 65 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index f6ee58b..571bb70 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.1.1 -Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.4.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -254,6 +254,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Sat Nov 02 2019 Pete Walter - 5.1.1-0.4.20191004git4242edd +- Rebuild for ICU 65 + * Wed Oct 30 2019 Ron Olson 5.1.1-0.3.20191004git4242edd - Clang 9 was causing compiler-rt to not build properly due to a macro. * Thu Oct 17 2019 Ron Olson 5.1.1-0.2.20191004git4242edd From c6d9c13a18a8cf0d83c820c227597395de869852 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 7 Nov 2019 20:29:15 -0600 Subject: [PATCH 040/152] Updated to swift-5.1.2-RELEASE --- .gitignore | 4 +++ build-setup.patch | 42 ++---------------------- sourcekit.patch | 20 ++++++++++++ sources | 26 +++++++-------- swift-lang.spec | 82 ++++++++++++++++++++++++++++++++--------------- 5 files changed, 96 insertions(+), 78 deletions(-) create mode 100644 sourcekit.patch diff --git a/.gitignore b/.gitignore index aaa9862..596370a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ /swift-integration-tests.tar.gz /swift-xcode-playground-support.tar.gz /swift.tar.gz +/indexstore-db.tar.gz +/llvm-project.tar.gz +/release-61-2.tar.gz +/sourcekit-lsp.tar.gz diff --git a/build-setup.patch b/build-setup.patch index d0cc4e2..e9a34ff 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,20 +1,6 @@ ---- swift/utils/build-presets.ini.orig 2019-08-16 22:08:50.000000000 -0500 -+++ swift/utils/build-presets.ini 2019-08-21 21:26:01.340252697 -0500 -@@ -730,7 +730,7 @@ - #===------------------------------------------------------------------------===# - [preset: mixin_linux_install_components_with_clang] - swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc --llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd -+llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt - - [preset: mixin_linux_installation] - mixin-preset= -@@ -740,12 +740,9 @@ - llbuild - swiftpm - xctest --libicu --libcxx +--- swift/utils/build-presets.ini.orig 2019-11-05 10:52:56.027260006 -0600 ++++ swift/utils/build-presets.ini 2019-11-05 10:53:52.275185967 -0600 +@@ -745,7 +745,6 @@ dash-dash @@ -22,25 +8,3 @@ install-swift install-lldb install-llbuild -@@ -782,8 +779,8 @@ - test-optimized - foundation - libdispatch --indexstore-db --sourcekit-lsp -+indexstore-db=0 -+sourcekit-lsp=0 - lit-args=-v --time-tests - - dash-dash -@@ -996,8 +993,8 @@ - xctest - foundation - libdispatch --indexstore-db --sourcekit-lsp -+indexstore-db=0 -+sourcekit-lsp=0 - dash-dash - - install-swift diff --git a/sourcekit.patch b/sourcekit.patch new file mode 100644 index 0000000..96896f4 --- /dev/null +++ b/sourcekit.patch @@ -0,0 +1,20 @@ +--- sourcekit-lsp/Utilities/build-script-helper.py.orig 2019-10-29 09:41:43.052157614 -0500 ++++ sourcekit-lsp/Utilities/build-script-helper.py 2019-10-30 21:23:18.538560646 -0500 +@@ -15,7 +15,7 @@ + subprocess.check_call(cmd, env=env) + + def swiftpm_bin_path(swift_exec, swiftpm_args, env=None): +- swiftpm_args = filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args) ++ swiftpm_args = list(filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args)) + cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args + print(' '.join(cmd)) + return subprocess.check_output(cmd, env=env).strip() +@@ -56,7 +56,7 @@ + install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain) + + def install_binary(exe, source_dir, install_dir, toolchain): +- cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir] ++ cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir] + print(' '.join(cmd)) + subprocess.check_call(cmd) + diff --git a/sources b/sources index 4c60f13..47e52bb 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (clang.tar.gz) = 51e936271e390801ec780cf841e6ad2aa6112934f3788a1cd99a64f3526bffc45835cabceb6155638b777beab8fc5e505ef18a5e029bd35a79181f08f07c97c9 -SHA512 (cmark.tar.gz) = 8727e522610ebf2b37960ff082dd3d4e000a6f7130d6f21c648edc26d1f57e94086ce26f6e84799ac43526393a9d6689529aa7a6fe73329edcffe26836afeeba -SHA512 (corelibs-foundation.tar.gz) = 8d49960fda7f1a68117c9219ed3eacb39c8526b60d715f30bb0b8e20c6a7f6776fc9c906ea5d3478ba6d58bfa10d967dbfef271dd48147f6aa79d4d876fabb2b -SHA512 (corelibs-libdispatch.tar.gz) = 27ea1d2a2372b31f27c0b46216c363451af3c7701f3517909ae0be75ff31549f6a74c61b7a81c618ebd5e5630c9398e8b8bf4b69af5565962ffef55cb627d1f2 -SHA512 (corelibs-xctest.tar.gz) = 4c639f8d93ca4acf98df0ca1c9ad66d277adc5b175d41414e2c74166c5aff537e7560fdf6179c1aecde91a7b0428df0c2f617ac10ac9e8f0d6e72600a3ed8e9e -SHA512 (llbuild.tar.gz) = 08f111bb06749edc47f0527e9e7b8c02e6e4df0bdc6a4077fec2ac8aca6fe5866de79fd27fcac5b1e521f1ebb2c495d9b148e8b9d36dad4787bbaddf0c954568 -SHA512 (lldb.tar.gz) = c7fc26cff55df5e34942a6904ad32c0150f9d9b5f880430e0b94bb73fb671621b1ffbb12eef67b1cfd09444ad19dccbabd5659f995bd5dc120f09a4bc9ced0d6 -SHA512 (llvm.tar.gz) = 2e0c525a4644888a0b5e14517e6b67071be322cd759cd053f2ad5867be998c5f1a68cf1fde58019f89706dd96899eb2813d7101320edcbfecb0ba8eecda317dc -SHA512 (package-manager.tar.gz) = 7926667871ccbf935a27dff132d4bb4c75a2389b97a77209da3c102db2ffcc46c3937bf81484bf2558e4c354b7eee95f6a5223ae6ddbc101fa82044340e91351 -SHA512 (swift-compiler-rt.tar.gz) = 9523cbae5bf065423041795d6b3ed2560d8d643fb4fa7d949d6dc4a642e0320a1d9fbcf4f5f4ba5cb6586b07ec2bf786d52218f92fdff72c75f2a73983b379e8 -SHA512 (swift-integration-tests.tar.gz) = 81374de3f960846d310b0bdd4194b05c4ec9adf0b59a259851980e79187ce17e805d28806e2b94daf745a0c97afa287c1193fe5c02799fcb80b5e66a9e7df992 -SHA512 (swift-xcode-playground-support.tar.gz) = b674521318da220a2fc83de4f214b59e74515ad0c6d706ca37d73bbeb5f3fc81efd8397caae02e2ac17b3488cacb2f0b55a2ef457441c897d34d6ad69ea59892 -SHA512 (swift.tar.gz) = 967fc2224014b3ed04d12c45c6b2169a02d7eb170053fac6d4b9a2dee5edf215ab595ab7d8504d5dcc5665b606fa45801cc3833d1d8787eafe612ff7b2311f9c +SHA512 (cmark.tar.gz) = d1186592f52c456f8f8b6614b7542e27c41133e0eb74ddc86c5b4429f832fd9bbbf91ed869b094ed7b2ddb9f3faa5ddbfcf708418428f59ab63664e52cb58b9d +SHA512 (corelibs-foundation.tar.gz) = ae6197078e629a7e66a6ffd47c48be3d05fadc28bcae020ecc68a96660e9697a364ec9b2ada031a02b841fd10f7e9a99644b2b94d4304212a6dee43b86f5ee4a +SHA512 (corelibs-libdispatch.tar.gz) = 2720c8427e5847e0b5df26598ac5652816240813c10cd839b37dce33d0d46696c5a068e818accded3e9055d3d443355bf936e21c6daad13d007d1a4f635cd5a1 +SHA512 (corelibs-xctest.tar.gz) = 8066d3452c14b1cc427fc55c5d40774e82fd40194e09681b716f9eab7bec997f40a548495e151aebe8634778b2132476ec632026bebfc21f615041e9e166b828 +SHA512 (indexstore-db.tar.gz) = d20342e43d38bc1ea4429c872e0a232adb24d3b264dbd5eb1e589231021a6c2684d1734daced0cb5ef61f6b68cf747de2c205dbebf07f0543297151724bc4de5 +SHA512 (llbuild.tar.gz) = 40cf7df3c2ddfeea03827364e289d46b93cdef62e3df87e9e9049022cfa37fe6eec73af4a28a39c4b0ac56e8be86b0ed96a8e0c48ac2f86f6cd19856294e51b1 +SHA512 (llvm-project.tar.gz) = 39b6fb0983236c61109b713f61b4c44d84d321a46eb303d4ec85c146309d23c540c628f0b9b1483e49d0392048e5d9a32e587341dacb1fd5c06709a3a307c093 +SHA512 (package-manager.tar.gz) = e9fe4f98ca887e5138fcacf4a4ab0d2093e7bf2f5975244919435e87b2d252ea1ab38313133f5ef2dac0beedacdc45a78c0a827c31603f6abc86ddafab589b28 +SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 +SHA512 (sourcekit-lsp.tar.gz) = fcbaa807f1f8c00e4e7c2bb8e7010afcbf864b6c9700a1e6c63bc80200544246579e4e6241b6015216921cf669341d250e92a9ccc66887d88864b31af3673f48 +SHA512 (swift-integration-tests.tar.gz) = 20d21e08e87cf80423bba8b06abf6e95189c7bae18354cca880bb91f3a7bedacabdc8b4be1edd22792eb7ffcac2374ced6009000209e43b021173622bea8e7ee +SHA512 (swift-xcode-playground-support.tar.gz) = b8382b5ac014e0f14571ffe16da814c63e9e44a0489a6ff8cd2d5ee45da6cceb260b2d4ee6766ce36a0d1043faf293f60671cb99edb4206ccc7b97a0c16701ea +SHA512 (swift.tar.gz) = da7461740e9a47c7508dc1ea541c153b9e6d0788fe532acdd217d5188946b5c6fcee56e4fbd36f9da298035c3bfc226436d1b6603b3adcc4dd3a989a7f2754e1 diff --git a/swift-lang.spec b/swift-lang.spec index f6ee58b..9b21824 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,30 +1,30 @@ %global debug_package %{nil} -%global swifttag 5.1.1-RELEASE -%global swiftgithash 4242edd -%global swiftgitdate 20191004 +%global swifttag 5.1.2-RELEASE +%global swiftgithash 71def56 +%global swiftgitdate 20191107 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.1.1 -Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1.2 +Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-compiler-rt/archive/swift-%{swifttag}.tar.gz#/swift-compiler-rt.tar.gz -Source2: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source3: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source4: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source5: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source6: https://github.com/apple/swift-clang/archive/swift-%{swifttag}.tar.gz#/clang.tar.gz -Source7: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source8: https://github.com/apple/swift-lldb/archive/swift-%{swifttag}.tar.gz#/lldb.tar.gz -Source9: https://github.com/apple/swift-llvm/archive/swift-%{swifttag}.tar.gz#/llvm.tar.gz -Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz +Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz +Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz +Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz +Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz Source13: swift-lang.conf Source14: swift-lang-runtime.conf @@ -36,7 +36,8 @@ Patch4: swift-unwrapped.patch Patch5: python3.patch Patch6: linux-tests-python-3.patch Patch7: lldb_python38_platform.patch -Patch8: compiler-rt-sanitizer.patch +Patch8: sourcekit.patch +Patch9: compiler-rt-sanitizer.patch BuildRequires: clang BuildRequires: cmake @@ -60,6 +61,7 @@ BuildRequires: ninja-build Requires: glibc-devel Requires: clang +Requires: clang-tools-extra Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} @@ -97,19 +99,29 @@ Runtime libraries for Swift programs # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-clang-swift-%{swifttag} clang mv swift-cmark-swift-%{swifttag} cmark -mv swift-compiler-rt-swift-%{swifttag} compiler-rt mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest mv swift-integration-tests-swift-%{swifttag} swift-integration-tests mv swift-llbuild-swift-%{swifttag} llbuild -mv swift-lldb-swift-%{swifttag} lldb -mv swift-llvm-swift-%{swifttag} llvm mv swift-package-manager-swift-%{swifttag} swiftpm mv swift-swift-%{swifttag} swift mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support +mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp + +mv indexstore-db-swift-%{swifttag} indexstore-db +mv llvm-project-swift-%{swifttag} llvm-project +# Apple did some reorganization of the various components and what +# used to be separate subprojects are now symlinks into llvm-project +ln -s llvm-project/llvm llvm +ln -s llvm-project/lldb lldb +ln -s llvm-project/libcxx libcxx +ln -s llvm-project/compiler-rt compiler-rt +ln -s llvm-project/clang-tools-extra clang-tools-extra +ln -s llvm-project/clang clang +# ICU +mv icu-release-61-2 icu # This patch tells the Swift executable to look for its Swift-specific # lldb executable in /usr/libexec/swift-lldb, not in the same directory @@ -133,14 +145,14 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch8 -p0 # New in Clang 9 is an assertion error of an array declared with a negative size -%patch8 -p0 +%patch9 -p0 %build export VERBOSE=1 -export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 # We may not have /usr/bin/python, so we roll our own # because the build script expects there to be one. mkdir $PWD/binforpython @@ -151,7 +163,6 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil %install -export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 mkdir -p %{buildroot}%{_libexecdir}/swift-lldb mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}/usr/lib @@ -168,6 +179,9 @@ ln -fs swift %{buildroot}/usr/bin/swift-autolink-extract ln -fs swift %{buildroot}/usr/bin/swiftc ln -fs swift %{buildroot}/usr/bin/swift-format +install -m 0755 %{_builddir}/usr/bin/sourcekit-lsp %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/usr/bin/plutil %{buildroot}%{_bindir} + install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb @@ -201,8 +215,11 @@ ln -fs /usr/lib/swift/clang/7.0.0/share %{buildroot}/usr/lib/swift/clang/share 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/libFoundationXML.so chmod 0755 %{buildroot}/usr/lib/swift/linux/libXCTest.so chmod 0755 %{buildroot}/usr/lib/swift/linux/libFoundationNetworking.so +chmod 0755 %{buildroot}/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so +chmod 0755 %{buildroot}/usr/lib/swift/linux/libswiftRemoteMirror.so chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuild.so chmod 0755 %{buildroot}/usr/lib/swift/pm/llbuild/libllbuildSwift.so @@ -234,8 +251,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m /usr/lib/swift_static/ /usr/lib/swift/CFURLSessionInterface/ /usr/lib/swift/CFXMLInterface/ +/usr/lib/swift/FrameworkABIBaseline/ %{_libexecdir}/swift-lldb/ %{_sysconfdir}/ld.so.conf.d/swift-lang.conf +%{_bindir}/plutil +%{_bindir}/sourcekit-lsp %files runtime @@ -254,8 +274,18 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Thu Nov 07 2019 Ron Olson 5.1.2-0.1.20191107git71def56 +- Updated to swift-5.1.2-RELEASE +* Wed Nov 06 2019 Ron Olson 5.1-0.7.20191105gitb368b0d +- Added icu, also updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-05-a +* Mon Nov 04 2019 Ron Olson 5.1-0.6.20191101git74328cd +- Added unpackaged files, switched to new llvm-project-based subproject +* Sun Nov 03 2019 Ron Olson 5.1-0.5.20191101git74328cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-01-a +* Thu Oct 31 2019 Ron Olson 5.1.1-0.4.20191004git4242edd +- Added sourcekit-lsp * Wed Oct 30 2019 Ron Olson 5.1.1-0.3.20191004git4242edd -- Clang 9 was causing compiler-rt to not build properly due to a macro. +- Clang 9 was causing compiler-rt to not build properly due to a macro. * Thu Oct 17 2019 Ron Olson 5.1.1-0.2.20191004git4242edd - Fixed issue with installing swift-lang only gave the option for swift-lang-runtime From ff13e6151af4a36e128c37beb6fac7cfdd39923e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 9 Dec 2019 16:29:50 -0600 Subject: [PATCH 041/152] Added sourcekit-lsp functionality for code-completion in supported editors --- .gitignore | 1 + build-setup-s390x.patch | 15 ++++++++ sourcekit-loc.patch | 34 ++++++++++++++++++ sources | 3 +- swift-lang.spec | 79 +++++++++++++++++++++++++++++++++++------ 5 files changed, 120 insertions(+), 12 deletions(-) create mode 100644 build-setup-s390x.patch create mode 100644 sourcekit-loc.patch diff --git a/.gitignore b/.gitignore index 596370a..d86b377 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /llvm-project.tar.gz /release-61-2.tar.gz /sourcekit-lsp.tar.gz +/swift-syntax.tar.gz diff --git a/build-setup-s390x.patch b/build-setup-s390x.patch new file mode 100644 index 0000000..c4ad610 --- /dev/null +++ b/build-setup-s390x.patch @@ -0,0 +1,15 @@ +--- swift/utils/build-presets.ini.orig 2019-11-25 18:30:46.968790036 +0000 ++++ swift/utils/build-presets.ini 2019-11-25 18:31:56.158790036 +0000 +@@ -740,12 +740,10 @@ + llbuild + swiftpm + xctest +-libicu + libcxx + + dash-dash + +-build-ninja + install-swift + install-lldb + install-llbuild diff --git a/sourcekit-loc.patch b/sourcekit-loc.patch new file mode 100644 index 0000000..06bf428 --- /dev/null +++ b/sourcekit-loc.patch @@ -0,0 +1,34 @@ +--- sourcekit-lsp/Sources/SKCore/Toolchain.swift.orig 2019-12-07 13:28:15.316371656 -0600 ++++ sourcekit-lsp/Sources/SKCore/Toolchain.swift 2019-12-07 19:25:39.784513174 -0600 +@@ -127,12 +127,12 @@ + + var foundAny = false + +- let clangPath = binPath.appending(component: "clang") ++ let clangPath = AbsolutePath("/usr/libexec/swift-lldb/clang") + if fs.isExecutableFile(clangPath) { + self.clang = clangPath + foundAny = true + } +- let clangdPath = binPath.appending(component: "clangd") ++ let clangdPath = AbsolutePath("/usr/libexec/swift-lldb/clangd") + if fs.isExecutableFile(clangdPath) { + self.clangd = clangdPath + foundAny = true +@@ -152,14 +152,14 @@ + self.sourcekitd = sourcekitdPath + foundAny = true + } else { +- let sourcekitdPath = libPath.appending(component: "libsourcekitdInProc.\(dylibExt)") ++ let sourcekitdPath = AbsolutePath("/usr/lib/swift-lldb/libsourcekitdInProc.so") + if fs.isFile(sourcekitdPath) { + self.sourcekitd = sourcekitdPath + foundAny = true + } + } + +- let libIndexStore = libPath.appending(components: "libIndexStore.\(dylibExt)") ++ let libIndexStore = AbsolutePath("/usr/lib/swift-lldb/libIndexStore.so") + if fs.isFile(libIndexStore) { + self.libIndexStore = libIndexStore + foundAny = true diff --git a/sources b/sources index 47e52bb..a546269 100644 --- a/sources +++ b/sources @@ -9,5 +9,6 @@ SHA512 (package-manager.tar.gz) = e9fe4f98ca887e5138fcacf4a4ab0d2093e7bf2f597524 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 SHA512 (sourcekit-lsp.tar.gz) = fcbaa807f1f8c00e4e7c2bb8e7010afcbf864b6c9700a1e6c63bc80200544246579e4e6241b6015216921cf669341d250e92a9ccc66887d88864b31af3673f48 SHA512 (swift-integration-tests.tar.gz) = 20d21e08e87cf80423bba8b06abf6e95189c7bae18354cca880bb91f3a7bedacabdc8b4be1edd22792eb7ffcac2374ced6009000209e43b021173622bea8e7ee +SHA512 (swift-syntax.tar.gz) = ff2f35b19951b6922fc5b12a00f079db66c7d659bc94452b0cbc0d04e914dc5275570b366ce3b3819bf020d5dad59e132577a82ceab9b72dd8ef8520e7a8e90b SHA512 (swift-xcode-playground-support.tar.gz) = b8382b5ac014e0f14571ffe16da814c63e9e44a0489a6ff8cd2d5ee45da6cceb260b2d4ee6766ce36a0d1043faf293f60671cb99edb4206ccc7b97a0c16701ea -SHA512 (swift.tar.gz) = da7461740e9a47c7508dc1ea541c153b9e6d0788fe532acdd217d5188946b5c6fcee56e4fbd36f9da298035c3bfc226436d1b6603b3adcc4dd3a989a7f2754e1 +SHA512 (swift.tar.gz) = 804bde53afb200e855732548f388dbf7f4a9813db600164b6729393822fc61bae90b5d7fe67dc74a5f9b88221fbf62dbcb27825bfb9c446b69cec7471f7f7f70 diff --git a/swift-lang.spec b/swift-lang.spec index 9b21824..2b4f9fd 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,16 +1,16 @@ %global debug_package %{nil} %global swifttag 5.1.2-RELEASE -%global swiftgithash 71def56 -%global swiftgitdate 20191107 +%global swiftgithash ed9117a +%global swiftgitdate 20191130 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.1.2 -Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.17.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language -License: ASL 2.0 +License: ASL 2.0 and Unicode URL: https://swift.org Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz @@ -25,8 +25,9 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz -Source13: swift-lang.conf -Source14: swift-lang-runtime.conf +Source13: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz +Source14: swift-lang.conf +Source15: swift-lang-runtime.conf Patch0: change-lldb-location.patch Patch1: build-setup.patch @@ -38,6 +39,8 @@ Patch6: linux-tests-python-3.patch Patch7: lldb_python38_platform.patch Patch8: sourcekit.patch Patch9: compiler-rt-sanitizer.patch +Patch10: build-setup-s390x.patch +Patch11: sourcekit-loc.patch BuildRequires: clang BuildRequires: cmake @@ -58,17 +61,17 @@ BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build +BuildRequires: make Requires: glibc-devel Requires: clang -Requires: clang-tools-extra Requires: ncurses-devel Requires: ncurses-compat-libs Requires: %{name}-runtime = %{version}-%{release} Provides: %{name} = %{version}-%{release} -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 %description @@ -94,7 +97,7 @@ Runtime libraries for Swift programs %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is @@ -123,13 +126,21 @@ ln -s llvm-project/clang clang # ICU mv icu-release-61-2 icu +# Swift Syntax on its own release (sigh) +mv swift-syntax-swift-5.1.2-RELEASE swift-syntax + # This patch tells the Swift executable to look for its Swift-specific # lldb executable in /usr/libexec/swift-lldb, not in the same directory # as the swift executable (i.e. /usr/bin). %patch0 -p0 # Since we require ninja for building, there's no sense to rebuild it just for Swift +%ifnarch s390x %patch1 -p0 +%else +# Don't build ICU on s390x +%patch10 -p0 +%endif # This changes the location of where the headers and libs are to keep lldb happy %patch2 -p0 @@ -150,6 +161,8 @@ mv icu-release-61-2 icu # New in Clang 9 is an assertion error of an array declared with a negative size %patch9 -p0 +# Changes locations where sourcekit-lsp looks for things +%patch11 -p0 %build export VERBOSE=1 @@ -184,6 +197,14 @@ install -m 0755 %{_builddir}/usr/bin/plutil %{buildroot}%{_bindir} install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb +install -m 0755 %{_builddir}/usr/bin/clangd %{buildroot}%{_libexecdir}/swift-lldb +install -m 0755 %{_builddir}/usr/bin/clang-7 %{buildroot}%{_libexecdir}/swift-lldb +# This is not a "real" clang, but an ersatz Swift version - placed here so it +# doesn't get in the way of the real one +ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang +ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang++ +ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cl +ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cpp # Why /usr/lib instead of %{_libdir}? # The Swift toolchain is *extermely* sensitive to locations of its files @@ -227,8 +248,8 @@ mkdir -p %{buildroot}/usr/lib/swift_static cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/usr/lib/swift_static mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ -install -m 0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang.conf -install -m 0644 %{SOURCE14} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf +install -m 0644 %{SOURCE14} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang.conf +install -m 0644 %{SOURCE15} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf mkdir -p %{buildroot}%{_mandir}/man1 install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1 @@ -274,6 +295,42 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Dec 09 2019 Ron Olson 5.1-0.17.20191130gited9117a +- Release of 5.1.2 with sourcekit-lsp enabled. The user still needs to build + and install the plugin for vscode; if they do this version will support + code-completion, also works with neovim too +* Sat Dec 07 2019 Ron Olson 5.1-0.16.20191206git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-06-a +* Fri Dec 06 2019 Ron Olson 5.1-0.15.20191205git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-05-a +* Thu Dec 05 2019 Ron Olson 5.1-0.14.20191204git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-04-a +* Wed Dec 04 2019 Ron Olson 5.1-0.13.20191203git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-03-a +* Sat Nov 30 2019 Ron Olson 5.1-0.12.20191129git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-29-a +* Fri Nov 29 2019 Ron Olson 5.1-0.11.20191128git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-28-a +* Thu Nov 28 2019 Ron Olson 5.1-0.10.20191127git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-27-a +* Wed Nov 27 2019 Ron Olson 5.1-0.9.20191126git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-26-a +* Tue Nov 26 2019 Ron Olson 5.1-0.8.20191125git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-25-a +* Mon Nov 25 2019 Ron Olson 5.1-0.7.20191124git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-24-a +* Sat Nov 23 2019 Ron Olson 5.1-0.6.20191122git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-22-a +* Fri Nov 22 2019 Ron Olson 5.1-0.5.20191121git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-21-a +* Tue Nov 19 2019 Ron Olson 5.1-0.4.20191118git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-18-a +* Mon Nov 18 2019 Ron Olson 5.1-0.3.20191117git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-17-a +* Sat Nov 16 2019 Ron Olson 5.1-0.2.20191115git51fe191 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-15-a +* Fri Nov 15 2019 Ron Olson 5.1.3-0.1.20191114gite74feb6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-14-a * Thu Nov 07 2019 Ron Olson 5.1.2-0.1.20191107git71def56 - Updated to swift-5.1.2-RELEASE * Wed Nov 06 2019 Ron Olson 5.1-0.7.20191105gitb368b0d From 93c521dd8d3fd422b30775d0db3b8959655c1613 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 13 Dec 2019 21:10:18 -0600 Subject: [PATCH 042/152] Update to Swift 5.1.3-RELEASE --- glibcpthread.patch | 11 +++++++++++ sources | 26 +++++++++++++------------- swift-lang.spec | 29 +++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 glibcpthread.patch diff --git a/glibcpthread.patch b/glibcpthread.patch new file mode 100644 index 0000000..24ce515 --- /dev/null +++ b/glibcpthread.patch @@ -0,0 +1,11 @@ +--- llvm-project/compiler-rt/lib/builtins/CMakeLists.txt.orig 2019-12-11 15:39:19.537518740 -0600 ++++ llvm-project/compiler-rt/lib/builtins/CMakeLists.txt 2019-12-11 23:23:57.583292289 -0600 +@@ -537,7 +537,7 @@ + add_subdirectory(macho_embedded) + darwin_add_builtin_libraries(${BUILTIN_SUPPORTED_OS}) + else () +- set(BUILTIN_CFLAGS "") ++ set(BUILTIN_CFLAGS "-D_DEFAULT_SOURCE") + + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) + diff --git a/sources b/sources index a546269..8331166 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (cmark.tar.gz) = d1186592f52c456f8f8b6614b7542e27c41133e0eb74ddc86c5b4429f832fd9bbbf91ed869b094ed7b2ddb9f3faa5ddbfcf708418428f59ab63664e52cb58b9d -SHA512 (corelibs-foundation.tar.gz) = ae6197078e629a7e66a6ffd47c48be3d05fadc28bcae020ecc68a96660e9697a364ec9b2ada031a02b841fd10f7e9a99644b2b94d4304212a6dee43b86f5ee4a -SHA512 (corelibs-libdispatch.tar.gz) = 2720c8427e5847e0b5df26598ac5652816240813c10cd839b37dce33d0d46696c5a068e818accded3e9055d3d443355bf936e21c6daad13d007d1a4f635cd5a1 -SHA512 (corelibs-xctest.tar.gz) = 8066d3452c14b1cc427fc55c5d40774e82fd40194e09681b716f9eab7bec997f40a548495e151aebe8634778b2132476ec632026bebfc21f615041e9e166b828 -SHA512 (indexstore-db.tar.gz) = d20342e43d38bc1ea4429c872e0a232adb24d3b264dbd5eb1e589231021a6c2684d1734daced0cb5ef61f6b68cf747de2c205dbebf07f0543297151724bc4de5 -SHA512 (llbuild.tar.gz) = 40cf7df3c2ddfeea03827364e289d46b93cdef62e3df87e9e9049022cfa37fe6eec73af4a28a39c4b0ac56e8be86b0ed96a8e0c48ac2f86f6cd19856294e51b1 -SHA512 (llvm-project.tar.gz) = 39b6fb0983236c61109b713f61b4c44d84d321a46eb303d4ec85c146309d23c540c628f0b9b1483e49d0392048e5d9a32e587341dacb1fd5c06709a3a307c093 -SHA512 (package-manager.tar.gz) = e9fe4f98ca887e5138fcacf4a4ab0d2093e7bf2f5975244919435e87b2d252ea1ab38313133f5ef2dac0beedacdc45a78c0a827c31603f6abc86ddafab589b28 +SHA512 (cmark.tar.gz) = fe8e5cc741596727a14e6b1ebddd50e3f9e1dead4c5ae6b41e65d96c71b759e61b1d565ddff48d577070ea1c4e1c375346deb065ab1ef332314174d4cbdbc7c3 +SHA512 (corelibs-foundation.tar.gz) = 7c01e8396c68963bd9fe4de4eae4790d4f79da4f76d20128acbc4c362ca87ce6fff6a3941517393a8866abbb45b8137bd86224b79778a16d41c9360798fc2e8d +SHA512 (corelibs-libdispatch.tar.gz) = 26be3811ae1997e6fe5fa65a15a69823dda4e62ec622bf5d1a306865f77b0578ecf77f40e4c04dcfa2b5b4bd79d446cfffcc9663b26eb835f1367e84102c867f +SHA512 (corelibs-xctest.tar.gz) = 5d737d2c954904a8539e3257d87d640f2faf2606d6621c3994f9248b3a57582cf407e2090a1866ba1b0f017ce8b9cdd9d0757eb872ffb5d5aba30e2ae97303d6 +SHA512 (indexstore-db.tar.gz) = 0f038a8af8211cc6a1e99e490c5dacb3269481b08f976990cdf5fb0f2de1d6ccae2dc1b31861d5dae57271285f495ea86bd6a3ae919cc6c0b4483aef47dfeada +SHA512 (llbuild.tar.gz) = af333d422edaeb9c37f88b43e0ea9260efc172824f6ed4bba67767030c7e61da4ddf0cf1241f3b31ebf4e107079180fa6b44148e2583205874cf2e961b74c961 +SHA512 (llvm-project.tar.gz) = 4d56838865cbad0e29796d5e1ea70b83cc53f038603350e1974e887e10f147dbb182d8979691d13a8dae2325626efa85a68aa728fcfb70df4f20856793e2bcf8 +SHA512 (package-manager.tar.gz) = 70a70538f87bd62e3daef8d3f18fa8c72d4652bd55f25ddf8e86a2ba20c9509c7281cd1873fea76a562251dab51b293d0568275168f3dde0cae77218237d4a74 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = fcbaa807f1f8c00e4e7c2bb8e7010afcbf864b6c9700a1e6c63bc80200544246579e4e6241b6015216921cf669341d250e92a9ccc66887d88864b31af3673f48 -SHA512 (swift-integration-tests.tar.gz) = 20d21e08e87cf80423bba8b06abf6e95189c7bae18354cca880bb91f3a7bedacabdc8b4be1edd22792eb7ffcac2374ced6009000209e43b021173622bea8e7ee -SHA512 (swift-syntax.tar.gz) = ff2f35b19951b6922fc5b12a00f079db66c7d659bc94452b0cbc0d04e914dc5275570b366ce3b3819bf020d5dad59e132577a82ceab9b72dd8ef8520e7a8e90b -SHA512 (swift-xcode-playground-support.tar.gz) = b8382b5ac014e0f14571ffe16da814c63e9e44a0489a6ff8cd2d5ee45da6cceb260b2d4ee6766ce36a0d1043faf293f60671cb99edb4206ccc7b97a0c16701ea -SHA512 (swift.tar.gz) = 804bde53afb200e855732548f388dbf7f4a9813db600164b6729393822fc61bae90b5d7fe67dc74a5f9b88221fbf62dbcb27825bfb9c446b69cec7471f7f7f70 +SHA512 (sourcekit-lsp.tar.gz) = 825f15150b849e625bfbc3b4bd7f5b7f4469b69aebd4103d221a0445ddcf8e2fc125e295877d256991cc89d92efe9710073440b9b35f7efc316516307b567141 +SHA512 (swift-integration-tests.tar.gz) = 685dd40bee8dfd89e0d9622b0ff809460f229520223493aa1412554cf1c6195c4209aa46e3a005b78337b51c935d0b245e263130a3ee8a837ea728cfe848d73c +SHA512 (swift-syntax.tar.gz) = cddfad1a4c381e54be6bfa95e7d720b2c8adc92b55f3eae4a4b6afb151922c399e0da176c1ade2f13fa033b527f17dcea4a944c5c155267f3448e46e489c1a80 +SHA512 (swift-xcode-playground-support.tar.gz) = 847c21e6ea84e07ab674696d63e64f07c26a775fc14c5caada5702e6abd8353b3cdee56b0ae8864fd7220483ea65ac4c9fbee0e5a9770069b1d1359608fd5726 +SHA512 (swift.tar.gz) = d4080875c949ab3b72d22e94e855c6e2472b6c5b5e4e11346319ea801a27a3f468c95c2f2c79b4af1b24308dcfc28132f859a56f036e9fbe97f6a087176a7464 diff --git a/swift-lang.spec b/swift-lang.spec index 2b4f9fd..aa57f74 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.1.2-RELEASE -%global swiftgithash ed9117a -%global swiftgitdate 20191130 +%global swifttag 5.1.3-RELEASE +%global swiftgithash 005fc1f +%global swiftgitdate 20191213 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.1.2 -Release: 0.17.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1.3 +Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -25,7 +25,7 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz -Source13: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz +Source13: https://github.com/apple/swift-syntax/archive/swift-5.1.3-RELEASE.zip#/swift-syntax.tar.gz Source14: swift-lang.conf Source15: swift-lang-runtime.conf @@ -41,7 +41,8 @@ Patch8: sourcekit.patch Patch9: compiler-rt-sanitizer.patch Patch10: build-setup-s390x.patch Patch11: sourcekit-loc.patch - +Patch12: glibcpthread.patch + BuildRequires: clang BuildRequires: cmake BuildRequires: swig @@ -127,7 +128,7 @@ ln -s llvm-project/clang clang mv icu-release-61-2 icu # Swift Syntax on its own release (sigh) -mv swift-syntax-swift-5.1.2-RELEASE swift-syntax +mv swift-syntax-swift-5.1.3-RELEASE swift-syntax # This patch tells the Swift executable to look for its Swift-specific # lldb executable in /usr/libexec/swift-lldb, not in the same directory @@ -164,6 +165,10 @@ mv swift-syntax-swift-5.1.2-RELEASE swift-syntax # Changes locations where sourcekit-lsp looks for things %patch11 -p0 +# Fixes compiler issue with glibc and pthreads after 2.5.0.9000 +%patch12 -p0 + + %build export VERBOSE=1 # We may not have /usr/bin/python, so we roll our own @@ -295,6 +300,14 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Dec 13 2019 Ron Olson 5.1.3-0.1.20191213git005fc1f +- Updated to swift-5.1.3-RELEASE +* Fri Dec 13 2019 Ron Olson 5.1-0.20.20191212gita22eb08 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-12-a +* Wed Dec 11 2019 Ron Olson 5.1-0.19.20191210git4a1b378 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-10-a +* Tue Dec 10 2019 Ron Olson 5.1-0.18.20191209git4a1b378 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-09-a * Mon Dec 09 2019 Ron Olson 5.1-0.17.20191130gited9117a - Release of 5.1.2 with sourcekit-lsp enabled. The user still needs to build and install the plugin for vscode; if they do this version will support From a7a3efedca865d87e15ac41d4e29a57fd64c885a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 27 Jan 2020 14:55:10 -0600 Subject: [PATCH 043/152] Added patch to explicitly include cstdint header --- indexstore.patch | 11 +++++++++++ llvm.patch | 19 +++++++++++++++++++ sources | 24 ++++++++++++------------ swift-lang.spec | 43 +++++++++++++++++++++++++++++++++++++------ 4 files changed, 79 insertions(+), 18 deletions(-) create mode 100644 indexstore.patch create mode 100644 llvm.patch diff --git a/indexstore.patch b/indexstore.patch new file mode 100644 index 0000000..d3c43ab --- /dev/null +++ b/indexstore.patch @@ -0,0 +1,11 @@ +diff -Naur ./indexstore-db-orig/include/IndexStoreDB/Database/IDCode.h indexstore-db/include/IndexStoreDB/Database/IDCode.h +--- ./indexstore-db-orig/include/IndexStoreDB/Database/IDCode.h 2019-08-19 13:15:44.000000000 -0500 ++++ indexstore-db/include/IndexStoreDB/Database/IDCode.h 2020-01-23 16:20:05.055701686 -0600 +@@ -14,6 +14,7 @@ + #define INDEXSTOREDB_SKDATABASE_IDCODE_H + + #include ++#include + + namespace IndexStoreDB { + namespace db { diff --git a/llvm.patch b/llvm.patch new file mode 100644 index 0000000..406e33c --- /dev/null +++ b/llvm.patch @@ -0,0 +1,19 @@ +diff -Naur llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h +--- llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2019-12-12 22:11:12.000000000 -0600 ++++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-23 11:01:29.173281217 -0600 +@@ -4,6 +4,8 @@ + #include "llvm/Demangle/Compiler.h" + #include "llvm/Demangle/StringView.h" + #include ++#include ++#include + + class OutputStream; + +@@ -599,4 +601,4 @@ + } // namespace ms_demangle + } // namespace llvm + +-#endif +\ No newline at end of file ++#endif diff --git a/sources b/sources index 8331166..9ead5ab 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (cmark.tar.gz) = fe8e5cc741596727a14e6b1ebddd50e3f9e1dead4c5ae6b41e65d96c71b759e61b1d565ddff48d577070ea1c4e1c375346deb065ab1ef332314174d4cbdbc7c3 -SHA512 (corelibs-foundation.tar.gz) = 7c01e8396c68963bd9fe4de4eae4790d4f79da4f76d20128acbc4c362ca87ce6fff6a3941517393a8866abbb45b8137bd86224b79778a16d41c9360798fc2e8d -SHA512 (corelibs-libdispatch.tar.gz) = 26be3811ae1997e6fe5fa65a15a69823dda4e62ec622bf5d1a306865f77b0578ecf77f40e4c04dcfa2b5b4bd79d446cfffcc9663b26eb835f1367e84102c867f -SHA512 (corelibs-xctest.tar.gz) = 5d737d2c954904a8539e3257d87d640f2faf2606d6621c3994f9248b3a57582cf407e2090a1866ba1b0f017ce8b9cdd9d0757eb872ffb5d5aba30e2ae97303d6 -SHA512 (indexstore-db.tar.gz) = 0f038a8af8211cc6a1e99e490c5dacb3269481b08f976990cdf5fb0f2de1d6ccae2dc1b31861d5dae57271285f495ea86bd6a3ae919cc6c0b4483aef47dfeada -SHA512 (llbuild.tar.gz) = af333d422edaeb9c37f88b43e0ea9260efc172824f6ed4bba67767030c7e61da4ddf0cf1241f3b31ebf4e107079180fa6b44148e2583205874cf2e961b74c961 -SHA512 (llvm-project.tar.gz) = 4d56838865cbad0e29796d5e1ea70b83cc53f038603350e1974e887e10f147dbb182d8979691d13a8dae2325626efa85a68aa728fcfb70df4f20856793e2bcf8 -SHA512 (package-manager.tar.gz) = 70a70538f87bd62e3daef8d3f18fa8c72d4652bd55f25ddf8e86a2ba20c9509c7281cd1873fea76a562251dab51b293d0568275168f3dde0cae77218237d4a74 +SHA512 (cmark.tar.gz) = 36492fcff665bf6a79691cdbf89a7c9968567f0cab173e14d871d23c239387a5719f94a963089b4b6d342b9d68c241013b3edbe37ff4a6c31a0b5c5c02739150 +SHA512 (corelibs-foundation.tar.gz) = ea9200f1a197aa4f3ad07646603d1795b764b271e47b85c0809cb75bc7eb38b518d97c25b3fa5b8212c5364c7c32554f8e3884940240535580d3cb70d170874f +SHA512 (corelibs-libdispatch.tar.gz) = bb442bf636841dddfd97c43db9bb0804b26c8dbd26dfd28e23adfe5ddfba41f76ca52b1a7ad333189e246e693fe9074632899ff8aa29e9451be1a95537ed6f08 +SHA512 (corelibs-xctest.tar.gz) = b339027e6e36d4f15207e445a714cd10c95ec28dd4da5120b97308475382068f5e7ad4ed61e3bf1e0b34aa4be2caedf7cec4965301e18d8f976360281087383b +SHA512 (indexstore-db.tar.gz) = 4b0e6702d3af51d4c7dbeca731520177eb6e7802646fac27a6cf6d89cb99077f5be779a0aba20942660342fe0021e822ba911d8a71f8242d67b5dbcff09d49df +SHA512 (llbuild.tar.gz) = 1e159a21d16e281abd593de1cd9f782c9eddac1c850e1d85c3d1b3e4f774d86365502e9a8d67b237c6c083ce9f3b07db44019f5d2f2f69e361958aa7dd71ca33 +SHA512 (llvm-project.tar.gz) = b7b309fc66fd6182dfd19d9a6efbd4591de32a5fbde4ca2011b683d252dad8f5230bf7a5ff5bef4df45b92dfdde4497fe1fe5eda45de85ce8406fd4eba772cbf +SHA512 (package-manager.tar.gz) = 68b08c5c059785996b6f0fea256dbef07eff6413f8f2b2f79e2ddce951270741457c4a4becacfdb5bf3837e82fd0ab8374906cd2c2646ddebfb52600dd54a820 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 825f15150b849e625bfbc3b4bd7f5b7f4469b69aebd4103d221a0445ddcf8e2fc125e295877d256991cc89d92efe9710073440b9b35f7efc316516307b567141 -SHA512 (swift-integration-tests.tar.gz) = 685dd40bee8dfd89e0d9622b0ff809460f229520223493aa1412554cf1c6195c4209aa46e3a005b78337b51c935d0b245e263130a3ee8a837ea728cfe848d73c +SHA512 (sourcekit-lsp.tar.gz) = cd6b455d0532d9a6c70dd9721b076280722005e92850e71237805e8117c64dc01e69e2b12c5bdc41fd7abb9b4abb175428a69150b284d0e728976740309a553b +SHA512 (swift-integration-tests.tar.gz) = cd249f09cb3379492afddd90e93aaccb3b3500359cb8189c1eade37d2f624a8605a0a43bb598b58078b6a4f5bcf0b73fa667b61664da0e0d544e95e8d148df90 SHA512 (swift-syntax.tar.gz) = cddfad1a4c381e54be6bfa95e7d720b2c8adc92b55f3eae4a4b6afb151922c399e0da176c1ade2f13fa033b527f17dcea4a944c5c155267f3448e46e489c1a80 -SHA512 (swift-xcode-playground-support.tar.gz) = 847c21e6ea84e07ab674696d63e64f07c26a775fc14c5caada5702e6abd8353b3cdee56b0ae8864fd7220483ea65ac4c9fbee0e5a9770069b1d1359608fd5726 -SHA512 (swift.tar.gz) = d4080875c949ab3b72d22e94e855c6e2472b6c5b5e4e11346319ea801a27a3f468c95c2f2c79b4af1b24308dcfc28132f859a56f036e9fbe97f6a087176a7464 +SHA512 (swift-xcode-playground-support.tar.gz) = a6d4bfc7bd6e2dd062667a1afb89dbaee47ae4f3b4ab4bd009bc67f827daca79f671f421bc1a19def1d2957d31499057f211ff326e22e07aedcc9e8628f48a5a +SHA512 (swift.tar.gz) = ee02f87c51aadf21030e8318626110d26e4c29f8cc009ddcfab81369dec099089145886424010c6cb14befeb47332a08c2fb9a5537775d58dc182e4ca52e51a7 diff --git a/swift-lang.spec b/swift-lang.spec index aa57f74..e2f7d19 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,16 @@ %global debug_package %{nil} -%global swifttag 5.1.3-RELEASE -%global swiftgithash 005fc1f -%global swiftgitdate 20191213 +%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a +# Swift syntax seems to only be updated on major releases +%global swiftsyntax 5.1.3-RELEASE +%global swiftgithash e45437e +%global swiftgitdate 20200121 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.1.3 -Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.13.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -25,7 +27,7 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz -Source13: https://github.com/apple/swift-syntax/archive/swift-5.1.3-RELEASE.zip#/swift-syntax.tar.gz +Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz Source14: swift-lang.conf Source15: swift-lang-runtime.conf @@ -42,6 +44,8 @@ Patch9: compiler-rt-sanitizer.patch Patch10: build-setup-s390x.patch Patch11: sourcekit-loc.patch Patch12: glibcpthread.patch +Patch13: llvm.patch +Patch14: indexstore.patch BuildRequires: clang BuildRequires: cmake @@ -128,7 +132,7 @@ ln -s llvm-project/clang clang mv icu-release-61-2 icu # Swift Syntax on its own release (sigh) -mv swift-syntax-swift-5.1.3-RELEASE swift-syntax +mv swift-syntax-swift-%{swiftsyntax} swift-syntax # This patch tells the Swift executable to look for its Swift-specific # lldb executable in /usr/libexec/swift-lldb, not in the same directory @@ -168,6 +172,9 @@ mv swift-syntax-swift-5.1.3-RELEASE swift-syntax # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 %patch12 -p0 +# Fixed STL no longer implicitly including +%patch13 -p0 +%patch14 -p0 %build export VERBOSE=1 @@ -300,6 +307,30 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a +* Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-19-a +* Sat Jan 18 2020 Ron Olson 5.1-0.11.20200117gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Sun Jan 12 2020 Ron Olson 5.1-0.10.20200111gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-11-a +* Sat Jan 11 2020 Ron Olson 5.1-0.9.20200110gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-10-a +* Fri Jan 10 2020 Ron Olson 5.1-0.8.20200109gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Wed Jan 08 2020 Ron Olson 5.1-0.7.20200107git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-07-a +* Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a +* Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-19-a +* Thu Dec 19 2019 Ron Olson 5.1-0.4.20191218git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-18-a +* Wed Dec 18 2019 Ron Olson 5.1-0.3.20191217git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-17-a +* Tue Dec 17 2019 Ron Olson 5.1-0.2.20191216git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-16-a * Fri Dec 13 2019 Ron Olson 5.1.3-0.1.20191213git005fc1f - Updated to swift-5.1.3-RELEASE * Fri Dec 13 2019 Ron Olson 5.1-0.20.20191212gita22eb08 From 1e4ecf04d8ddab9716f6d653257601f9ff6729ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:48:22 +0000 Subject: [PATCH 044/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index e2f7d19..b500970 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -10,7 +10,7 @@ Name: swift-lang Version: 5.1.3 -Release: 0.13.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.14.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -307,6 +307,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.1.3-0.14.20200121gite45437e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a * Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e From 1fd61878b99f8d6c542452d8b1a547745912ab88 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 31 Jan 2020 22:15:35 -0600 Subject: [PATCH 045/152] Update to Swift-RELEASE-5.1.4 --- sources | 26 +++++++++++++------------- swift-lang.spec | 23 +++++++++++++++++------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/sources b/sources index 9ead5ab..e6f534b 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (cmark.tar.gz) = 36492fcff665bf6a79691cdbf89a7c9968567f0cab173e14d871d23c239387a5719f94a963089b4b6d342b9d68c241013b3edbe37ff4a6c31a0b5c5c02739150 -SHA512 (corelibs-foundation.tar.gz) = ea9200f1a197aa4f3ad07646603d1795b764b271e47b85c0809cb75bc7eb38b518d97c25b3fa5b8212c5364c7c32554f8e3884940240535580d3cb70d170874f -SHA512 (corelibs-libdispatch.tar.gz) = bb442bf636841dddfd97c43db9bb0804b26c8dbd26dfd28e23adfe5ddfba41f76ca52b1a7ad333189e246e693fe9074632899ff8aa29e9451be1a95537ed6f08 -SHA512 (corelibs-xctest.tar.gz) = b339027e6e36d4f15207e445a714cd10c95ec28dd4da5120b97308475382068f5e7ad4ed61e3bf1e0b34aa4be2caedf7cec4965301e18d8f976360281087383b -SHA512 (indexstore-db.tar.gz) = 4b0e6702d3af51d4c7dbeca731520177eb6e7802646fac27a6cf6d89cb99077f5be779a0aba20942660342fe0021e822ba911d8a71f8242d67b5dbcff09d49df -SHA512 (llbuild.tar.gz) = 1e159a21d16e281abd593de1cd9f782c9eddac1c850e1d85c3d1b3e4f774d86365502e9a8d67b237c6c083ce9f3b07db44019f5d2f2f69e361958aa7dd71ca33 -SHA512 (llvm-project.tar.gz) = b7b309fc66fd6182dfd19d9a6efbd4591de32a5fbde4ca2011b683d252dad8f5230bf7a5ff5bef4df45b92dfdde4497fe1fe5eda45de85ce8406fd4eba772cbf -SHA512 (package-manager.tar.gz) = 68b08c5c059785996b6f0fea256dbef07eff6413f8f2b2f79e2ddce951270741457c4a4becacfdb5bf3837e82fd0ab8374906cd2c2646ddebfb52600dd54a820 +SHA512 (cmark.tar.gz) = d9b16d6b0207849018e2a10b59f3acba5d03fe605626b57515942ef59355210f04ced5d815f322b7c21a729fd8c5af32c03a9e3e47a0a1af98b2065ee426495e +SHA512 (corelibs-foundation.tar.gz) = e3668c79cb4e04cacdc44543cf3dc321ee5f3f6bf9612381aadce5710d6909e107be270fb8742b9b50c93a2131762fe6959980a135987d753b8b668b67c9e710 +SHA512 (corelibs-libdispatch.tar.gz) = 8d34c5f8ebddba75741e31f07fb642b96f3fe642774887239e255f3a3455d418d9e473f76dc5b9a9e468eeff8a36256c20588817a85bd8b3c346bf169f828ef2 +SHA512 (corelibs-xctest.tar.gz) = 9bc102a2b102f117425cbfacd392baca2afdaf38923d846393d7cbb5214b1987c18fc4791f260c5d11480bfed0569851df9f61f073a44a2efe5b48a8b95aa081 +SHA512 (indexstore-db.tar.gz) = ef420d4841f297ad334d8b243d90096eb1713e2cd2270d7689a58d90ae5f46695ae0bde43e7fcdf4473882b6652c0e9050b3c8bed36e037fba00c570dd0cda13 +SHA512 (llbuild.tar.gz) = 34fd1c3c8041dd8aa2aa2b22eeb6c829589b17321c0b08c1c519c4c3ffa898add509126c853c60b2e0b6b8207a8153d658b8a3d9ff2c538e2f1c36bf8a406d2d +SHA512 (llvm-project.tar.gz) = 2cf0db02de579e6aa1a5e3a5b2fd5366ec80abb4274497fde29a0331e310596516472f2759e112e0e9c11c8655668fb34cb6fb4ba851ace23691360a4eec9224 +SHA512 (package-manager.tar.gz) = e7de615beb88ad7e6dd32b14a198fcdce02e4cb126cadf77c85512732cbc3a32974d846a49fd7b7acea84b46aa4d81202cf25a45c98493e71c19f02d144523c1 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = cd6b455d0532d9a6c70dd9721b076280722005e92850e71237805e8117c64dc01e69e2b12c5bdc41fd7abb9b4abb175428a69150b284d0e728976740309a553b -SHA512 (swift-integration-tests.tar.gz) = cd249f09cb3379492afddd90e93aaccb3b3500359cb8189c1eade37d2f624a8605a0a43bb598b58078b6a4f5bcf0b73fa667b61664da0e0d544e95e8d148df90 -SHA512 (swift-syntax.tar.gz) = cddfad1a4c381e54be6bfa95e7d720b2c8adc92b55f3eae4a4b6afb151922c399e0da176c1ade2f13fa033b527f17dcea4a944c5c155267f3448e46e489c1a80 -SHA512 (swift-xcode-playground-support.tar.gz) = a6d4bfc7bd6e2dd062667a1afb89dbaee47ae4f3b4ab4bd009bc67f827daca79f671f421bc1a19def1d2957d31499057f211ff326e22e07aedcc9e8628f48a5a -SHA512 (swift.tar.gz) = ee02f87c51aadf21030e8318626110d26e4c29f8cc009ddcfab81369dec099089145886424010c6cb14befeb47332a08c2fb9a5537775d58dc182e4ca52e51a7 +SHA512 (sourcekit-lsp.tar.gz) = a418f2053b6a04fc77275f0d3491cdeab3cb447e557419905b760a33b0d849042665e268c86b7c72ec11aa521830c948e65a491245cd8f56d9c77c0080b2f5f1 +SHA512 (swift-integration-tests.tar.gz) = 0e584980c5aa6b013e543dc596313dadb9ba3718fcbdf6cf8ce768eba0ce39425304c9926fbf997c2ba46bd73c668b3ee4d47ff717ff75dfee1a2c538a6fbe5c +SHA512 (swift-syntax.tar.gz) = a04c7693a1816e9397c32c23a56d2d9bbd76688cf26f50202004fc5ab17aa6bc91659cb21a97e46a3e71a76afdcbc9b8d0b56faa4b709dff5e6f51c7534fc923 +SHA512 (swift-xcode-playground-support.tar.gz) = 3dfad6a7d8790f3e9947e3f6a5f4c3011b240572b3d50a63667bb87b3206f6a2c113c23f947548b95afc5c88265b417e2156175be7c9a2fe91f2f00e9144b0a1 +SHA512 (swift.tar.gz) = 028db3857d1ae19885310a416d24c90d9502765d3e0b1c6c4824c3ee20e2bd76aceac02ac4199aaf4b8874fd961dbb552759f9eee2c45185b5214db94ff95b82 diff --git a/swift-lang.spec b/swift-lang.spec index e2f7d19..b551712 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,16 +1,16 @@ %global debug_package %{nil} -%global swifttag 5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a +%global swifttag 5.1.4-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.1.3-RELEASE -%global swiftgithash e45437e -%global swiftgitdate 20200121 +%global swiftsyntax 5.1.4-RELEASE +%global swiftgithash 2194dc2 +%global swiftgitdate 20200131 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.1.3 -Release: 0.13.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1.4 +Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -307,6 +307,17 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Jan 31 2020 Ron Olson 5.1.4-0.1.20200131git2194dc2 +- Updated to swift-5.1.4-RELEASE +* Wed Jan 29 2020 Ron Olson 5.1-0.17.20200128gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-28-a +* Tue Jan 28 2020 Ron Olson 5.1-0.16.20200127gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Sat Jan 25 2020 Ron Olson 5.1-0.15.20200124gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-24-a and added patches to + handle the cstdint header not being implicitly included +* Fri Jan 24 2020 Ron Olson 5.1-0.14.20200123gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-23-a * Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a * Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e From b46bf0bf98fd73a1cb4d49397bf2dd46c898c62a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 24 Feb 2020 21:27:05 -0600 Subject: [PATCH 046/152] First update to Swift 5.2 --- build-setup.patch | 18 +- ...on-3.patch => linux-tests-python-3-2.patch | 17 +- llvm.patch | 20 +-- package.cfg | 2 - python3.patch => python3-2.patch | 157 ++++++++---------- sourcekit-2.patch | 0 sourcekit.patch | 20 --- sources | 24 +-- swift-lang.spec | 71 ++++---- swift.patch | 23 +++ 10 files changed, 172 insertions(+), 180 deletions(-) rename linux-tests-python-3.patch => linux-tests-python-3-2.patch (53%) delete mode 100644 package.cfg rename python3.patch => python3-2.patch (72%) create mode 100644 sourcekit-2.patch delete mode 100644 sourcekit.patch create mode 100644 swift.patch diff --git a/build-setup.patch b/build-setup.patch index e9a34ff..0308c3f 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,6 +1,6 @@ ---- swift/utils/build-presets.ini.orig 2019-11-05 10:52:56.027260006 -0600 -+++ swift/utils/build-presets.ini 2019-11-05 10:53:52.275185967 -0600 -@@ -745,7 +745,6 @@ +--- swift/utils/build-presets.ini.orig 2020-01-30 19:54:07.528043218 -0600 ++++ swift/utils/build-presets.ini 2020-01-30 19:55:11.580461138 -0600 +@@ -741,7 +741,6 @@ dash-dash @@ -8,3 +8,15 @@ install-swift install-lldb install-llbuild +@@ -755,11 +754,6 @@ + build-swift-static-sdk-overlay + build-swift-stdlib-unittest-extra + +-# Executes the lit tests for the installable package that is created +-# Assumes the swift-integration-tests repo is checked out +- +-test-installable-package +- + # Build the benchmarks against the toolchain. + toolchain-benchmarks + diff --git a/linux-tests-python-3.patch b/linux-tests-python-3-2.patch similarity index 53% rename from linux-tests-python-3.patch rename to linux-tests-python-3-2.patch index e64c644..45a1bb6 100644 --- a/linux-tests-python-3.patch +++ b/linux-tests-python-3-2.patch @@ -1,5 +1,6 @@ ---- swift-integration-tests/test-snapshot-binaries/linux_load_commands.py.orig 2019-07-22 18:29:09.865242157 -0500 -+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2019-07-22 18:29:36.655204752 -0500 +diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py +--- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py 2019-10-07 17:57:28.000000000 -0500 ++++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2020-01-29 14:05:33.991180706 -0600 @@ -85,12 +85,12 @@ numberOfLinesSeen = 0 @@ -33,3 +34,15 @@ sys.exit(0) if __name__ == "__main__": +diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py +--- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py 2019-10-07 17:57:28.000000000 -0500 ++++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py 2020-01-29 18:35:26.953725332 -0600 +@@ -136,7 +136,7 @@ + + skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync'] + p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE) +- out, _ = p.communicate(lsp.script) ++ out, _ = p.communicate(lsp.script.encode()) + print(out) + print('') + diff --git a/llvm.patch b/llvm.patch index 406e33c..b9f70d5 100644 --- a/llvm.patch +++ b/llvm.patch @@ -1,19 +1,11 @@ -diff -Naur llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h ---- llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2019-12-12 22:11:12.000000000 -0600 -+++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-23 11:01:29.173281217 -0600 -@@ -4,6 +4,8 @@ - #include "llvm/Demangle/Compiler.h" +--- llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h.orig 2020-01-29 10:02:44.222689214 -0600 ++++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-29 10:03:02.007354450 -0600 +@@ -16,6 +16,8 @@ + #include "llvm/Demangle/DemangleConfig.h" #include "llvm/Demangle/StringView.h" #include +#include +#include - class OutputStream; - -@@ -599,4 +601,4 @@ - } // namespace ms_demangle - } // namespace llvm - --#endif -\ No newline at end of file -+#endif + namespace llvm { + namespace itanium_demangle { diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file diff --git a/python3.patch b/python3-2.patch similarity index 72% rename from python3.patch rename to python3-2.patch index a65c0f4..1feab4f 100644 --- a/python3.patch +++ b/python3-2.patch @@ -1,46 +1,14 @@ -diff -Naur swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb swift/stdlib/public/core/FloatingPointTypes.swift.gyb ---- swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-22 11:22:17.049551459 -0500 -@@ -13,8 +13,8 @@ - import SwiftShims - - %{ --from SwiftIntTypes import all_integer_types --from SwiftFloatingPointTypes import all_floating_point_types -+import SwiftIntTypes -+import SwiftFloatingPointTypes - - # - # Utility code for later in this template -@@ -27,7 +27,7 @@ - builtinIntLiteralBits = 2048 - }% - --% for self_type in all_floating_point_types(): -+% for self_type in SwiftFloatingPointTypes.all_floating_point_types(): - %{ - Self = self_type.stdlib_name - bits = self_type.bits -@@ -1650,7 +1650,7 @@ - } - } - --% for src_type in all_floating_point_types(): -+% for src_type in SwiftFloatingPointTypes.all_floating_point_types(): - % srcBits = src_type.bits - % That = src_type.stdlib_name - diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb ---- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-22 15:30:40.491317722 -0500 +--- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-29 13:23:24.851180231 -0600 @@ -14,10 +14,9 @@ # Utility code for later in this template # -from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init -from SwiftFloatingPointTypes import getFtoIBounds -+import SwiftIntTypes -+import SwiftFloatingPointTypes ++import SwiftIntTypes ++import SwiftFloatingPointTypes -from string import maketrans, capitalize from itertools import chain @@ -63,8 +31,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub +% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) % if FloatType == 'Float80': - #if !os(Windows) && (arch(i386) || arch(x86_64)) -@@ -1651,7 +1650,7 @@ + #if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64)) +@@ -1648,7 +1647,7 @@ return Hasher._hash( seed: seed, bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), @@ -74,8 +42,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub } } diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb ---- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/Mirrors.swift.gyb 2019-07-23 09:20:38.269152361 -0500 +--- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/Mirrors.swift.gyb 2020-01-29 13:27:07.425509032 -0600 @@ -12,7 +12,7 @@ %{ @@ -95,14 +63,14 @@ diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/c if self_ty.is_signed: Types.append( (Self, '.int', 'Int64(self)') ) diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb ---- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-22 15:30:52.516752476 -0500 +--- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-29 13:30:52.170919077 -0600 @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// %{ -from SwiftIntTypes import all_integer_types -+import SwiftIntTypes ++import SwiftIntTypes word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 storagescalarCounts = [2,4,8,16,32,64] vectorscalarCounts = storagescalarCounts + [3] @@ -165,10 +133,10 @@ diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/ @frozen @_alignment(${bytes if bytes <= 16 else 16}) diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb ---- swift-orig/stdlib/public/core/Tuple.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/Tuple.swift.gyb 2019-07-17 20:54:45.400558556 -0500 +--- swift-orig/stdlib/public/core/Tuple.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/Tuple.swift.gyb 2020-01-29 13:32:22.287291260 -0600 @@ -111,7 +111,7 @@ - % equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams]) + % equatableTypeParams = ", ".join(["{}: Equatable".format(c) for c in typeParams]) % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) -% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) @@ -177,8 +145,8 @@ diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/cor /// Returns a Boolean value indicating whether the corresponding components of /// two tuples are equal. diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py ---- swift-orig/utils/gyb_sourcekit_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_sourcekit_support/__init__.py 2019-07-18 14:19:45.668770778 -0500 +--- swift-orig/utils/gyb_sourcekit_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_sourcekit_support/__init__.py 2020-01-29 13:33:22.111521781 -0600 @@ -14,9 +14,9 @@ # utils/gyb_sourcekit_support/ directory as a module. # @@ -193,8 +161,8 @@ diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_so def check_uid_duplication(): diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py ---- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/AttributeNodes.py 2019-07-18 12:34:20.708714660 -0500 +--- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/AttributeNodes.py 2020-01-29 13:34:03.265044624 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -204,8 +172,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb ATTRIBUTE_NODES = [ # token-list -> token? token-list? diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py ---- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-18 12:34:20.711714774 -0500 +--- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-29 13:34:33.458161889 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -215,8 +183,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/ AVAILABILITY_NODES = [ # availability-spec-list -> availability-entry availability-spec-list? diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py ---- swift-orig/utils/gyb_syntax_support/Child.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Child.py 2019-07-18 12:34:20.712714811 -0500 +--- swift-orig/utils/gyb_syntax_support/Child.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Child.py 2020-01-29 13:35:02.044219688 -0600 @@ -1,7 +1,7 @@ # flake8: noqa I201 -from Classification import classification_by_name @@ -229,8 +197,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_s class Child(object): diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py ---- swift-orig/utils/gyb_syntax_support/Classification.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Classification.py 2019-07-18 12:34:20.713714849 -0500 +--- swift-orig/utils/gyb_syntax_support/Classification.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Classification.py 2020-01-29 13:46:45.334244147 -0600 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -240,8 +208,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb class SyntaxClassification(object): diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py ---- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/CommonNodes.py 2019-07-18 12:34:20.714714887 -0500 +--- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/CommonNodes.py 2020-01-29 13:47:02.390875308 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -251,8 +219,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_sy COMMON_NODES = [ Node('Decl', kind='Syntax'), diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py ---- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/DeclNodes.py 2019-07-18 12:34:20.716714963 -0500 +--- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/DeclNodes.py 2020-01-29 13:47:30.486914972 -0600 @@ -1,6 +1,6 @@ # flake8: noqa I201 -from Child import Child @@ -263,8 +231,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_synt DECL_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py ---- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/ExprNodes.py 2019-07-18 12:34:20.717715000 -0500 +--- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/ExprNodes.py 2020-01-29 13:47:47.095529555 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -274,8 +242,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_synt EXPR_NODES = [ # An inout expression. diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py ---- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/GenericNodes.py 2019-07-18 12:34:20.718715038 -0500 +--- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/GenericNodes.py 2020-01-29 13:48:04.737182368 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -285,9 +253,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_s GENERIC_NODES = [ # generic-where-clause -> 'where' requirement-list diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py ---- swift-orig/utils/gyb_syntax_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/__init__.py 2019-07-18 12:34:33.973215999 -0500 -@@ -1,19 +1,19 @@ +--- swift-orig/utils/gyb_syntax_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/__init__.py 2020-01-29 13:52:03.762062110 -0600 +@@ -1,22 +1,22 @@ import textwrap -from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 -from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 @@ -296,43 +264,48 @@ diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_synta -from DeclNodes import DECL_NODES # noqa: I201 -from ExprNodes import EXPR_NODES # noqa: I201 -from GenericNodes import GENERIC_NODES # noqa: I201 --from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 +from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 -+from . import Classification # noqa: I201 ++from . import Classification # noqa: I201 +from .CommonNodes import COMMON_NODES # noqa: I201 +from .DeclNodes import DECL_NODES # noqa: I201 +from .ExprNodes import EXPR_NODES # noqa: I201 +from .GenericNodes import GENERIC_NODES # noqa: I201 + +-from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ get_serialization_code, \ verify_syntax_node_serialization_codes -from PatternNodes import PATTERN_NODES # noqa: I201 -from StmtNodes import STMT_NODES # noqa: I201 --import Token --from TypeNodes import TYPE_NODES # noqa: I201 +from .PatternNodes import PATTERN_NODES # noqa: I201 +from .StmtNodes import STMT_NODES # noqa: I201 + +-import Token +-from Trivia import TRIVIAS # noqa: I201 +-from TypeNodes import TYPE_NODES # noqa: I201 +from . import Token ++from .Trivia import TRIVIAS # noqa: I201 +from .TypeNodes import TYPE_NODES # noqa: I201 # Re-export global constants diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py ---- swift-orig/utils/gyb_syntax_support/Node.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Node.py 2019-07-18 12:34:20.722715189 -0500 -@@ -1,6 +1,6 @@ +--- swift-orig/utils/gyb_syntax_support/Node.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Node.py 2020-01-29 13:52:32.755139868 -0600 +@@ -1,7 +1,7 @@ from __future__ import print_function import sys # noqa: I201 + -from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word +from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word def error(msg): diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py ---- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-18 12:34:20.723715227 -0500 +--- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-29 13:52:58.148083796 -0600 @@ -1,4 +1,4 @@ -from Node import error +from .Node import error @@ -340,8 +313,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/u SYNTAX_NODE_SERIALIZATION_CODES = { diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py ---- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/PatternNodes.py 2019-07-18 12:34:20.724715265 -0500 +--- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/PatternNodes.py 2020-01-29 13:53:38.452582038 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -351,8 +324,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_s PATTERN_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py ---- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/StmtNodes.py 2019-07-18 12:34:20.726715341 -0500 +--- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/StmtNodes.py 2020-01-29 13:53:55.056199243 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -362,8 +335,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_synt STMT_NODES = [ # continue-stmt -> 'continue' label? ';'? diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py ---- swift-orig/utils/gyb_syntax_support/Token.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Token.py 2019-07-18 12:34:20.727715378 -0500 +--- swift-orig/utils/gyb_syntax_support/Token.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Token.py 2020-01-29 13:54:12.720855888 -0600 @@ -1,6 +1,6 @@ -from Classification import classification_by_name -from Node import error # noqa: I201 @@ -375,8 +348,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_s class Token(object): diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py ---- swift-orig/utils/gyb_syntax_support/Trivia.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Trivia.py 2019-07-18 14:22:04.074001913 -0500 +--- swift-orig/utils/gyb_syntax_support/Trivia.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Trivia.py 2020-01-29 13:54:41.647931191 -0600 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -386,8 +359,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_ class Trivia(object): diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py ---- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/TypeNodes.py 2019-07-18 12:34:20.731715529 -0500 +--- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/TypeNodes.py 2020-01-29 13:55:07.952909024 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -397,9 +370,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_synt TYPE_NODES = [ # simple-type-identifier -> identifier generic-argument-clause? diff -Naur swift-orig/utils/line-directive swift/utils/line-directive ---- swift-orig/utils/line-directive 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/line-directive 2019-07-19 09:01:35.602482603 -0500 -@@ -60,7 +60,7 @@ +--- swift-orig/utils/line-directive 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/line-directive 2020-01-29 13:57:12.829551057 -0600 +@@ -61,7 +61,7 @@ def _make_line_map(target_filename, stream=None): """ @@ -408,7 +381,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> _make_line_map('box', ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) ... line 2 -@@ -94,7 +94,7 @@ +@@ -95,7 +95,7 @@ def map_line_to_source_file(target_filename, target_line_num): """ @@ -417,7 +390,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -144,7 +144,7 @@ +@@ -145,7 +145,7 @@ def map_line_from_source_file(source_filename, source_line_num, target_filename): """ @@ -426,7 +399,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ def run(): """Simulate a couple of gyb-generated files diff --git a/sourcekit-2.patch b/sourcekit-2.patch new file mode 100644 index 0000000..e69de29 diff --git a/sourcekit.patch b/sourcekit.patch deleted file mode 100644 index 96896f4..0000000 --- a/sourcekit.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sourcekit-lsp/Utilities/build-script-helper.py.orig 2019-10-29 09:41:43.052157614 -0500 -+++ sourcekit-lsp/Utilities/build-script-helper.py 2019-10-30 21:23:18.538560646 -0500 -@@ -15,7 +15,7 @@ - subprocess.check_call(cmd, env=env) - - def swiftpm_bin_path(swift_exec, swiftpm_args, env=None): -- swiftpm_args = filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args) -+ swiftpm_args = list(filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args)) - cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args - print(' '.join(cmd)) - return subprocess.check_output(cmd, env=env).strip() -@@ -56,7 +56,7 @@ - install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain) - - def install_binary(exe, source_dir, install_dir, toolchain): -- cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir] -+ cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir] - print(' '.join(cmd)) - subprocess.check_call(cmd) - diff --git a/sources b/sources index e6f534b..3234b4c 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (cmark.tar.gz) = d9b16d6b0207849018e2a10b59f3acba5d03fe605626b57515942ef59355210f04ced5d815f322b7c21a729fd8c5af32c03a9e3e47a0a1af98b2065ee426495e -SHA512 (corelibs-foundation.tar.gz) = e3668c79cb4e04cacdc44543cf3dc321ee5f3f6bf9612381aadce5710d6909e107be270fb8742b9b50c93a2131762fe6959980a135987d753b8b668b67c9e710 -SHA512 (corelibs-libdispatch.tar.gz) = 8d34c5f8ebddba75741e31f07fb642b96f3fe642774887239e255f3a3455d418d9e473f76dc5b9a9e468eeff8a36256c20588817a85bd8b3c346bf169f828ef2 -SHA512 (corelibs-xctest.tar.gz) = 9bc102a2b102f117425cbfacd392baca2afdaf38923d846393d7cbb5214b1987c18fc4791f260c5d11480bfed0569851df9f61f073a44a2efe5b48a8b95aa081 -SHA512 (indexstore-db.tar.gz) = ef420d4841f297ad334d8b243d90096eb1713e2cd2270d7689a58d90ae5f46695ae0bde43e7fcdf4473882b6652c0e9050b3c8bed36e037fba00c570dd0cda13 -SHA512 (llbuild.tar.gz) = 34fd1c3c8041dd8aa2aa2b22eeb6c829589b17321c0b08c1c519c4c3ffa898add509126c853c60b2e0b6b8207a8153d658b8a3d9ff2c538e2f1c36bf8a406d2d -SHA512 (llvm-project.tar.gz) = 2cf0db02de579e6aa1a5e3a5b2fd5366ec80abb4274497fde29a0331e310596516472f2759e112e0e9c11c8655668fb34cb6fb4ba851ace23691360a4eec9224 -SHA512 (package-manager.tar.gz) = e7de615beb88ad7e6dd32b14a198fcdce02e4cb126cadf77c85512732cbc3a32974d846a49fd7b7acea84b46aa4d81202cf25a45c98493e71c19f02d144523c1 +SHA512 (cmark.tar.gz) = 55d21acf4693982d4fbbcafcc39f6d9442ae9fa1aab75d3f7ebb5e327e9a2862f3fc5c9a638764e1bf592f65dcb60c43cd1a89e65f928e813f7630bcb360935d +SHA512 (corelibs-foundation.tar.gz) = ccd2b51f6541f23beb7eca1de3ba21a155bf21dacd5f5ce9135fd506e68bc92de3c365eaeea4fd0821f7cd306f13277b888407cc9681512db077a6fe016b816b +SHA512 (corelibs-libdispatch.tar.gz) = 08c8f6114a93207bd75cbb3c88cc032b37e04f872777b661ca13d38a33dadbef93a652f95f439e0f21d4e614dc18bda9c372f5593b2292593d277c139c3df800 +SHA512 (corelibs-xctest.tar.gz) = 1d03de8d5ec5e1caf2732df55ac4c8be4f62eb4fd99f2b5601ea378f265cab61c7b02d8f99dcbfeb2c615a09aa24defab34ad679637b82c18f17afa90cdcb027 +SHA512 (indexstore-db.tar.gz) = f5fef16e255aecef7d8cf9492740003686e841c064328e437e21e36c81f8ec5dca5144577ad08234b90366ccb2716dd775ac994ccfeced0f3cf669029c6b7450 +SHA512 (llbuild.tar.gz) = d19952c7aa68cf613c3b8ec1bc519fe22650ab40671f57dfe9bb22c0f77c66babf4603e72c046517396c19ad458a6ed3b0103d10ab068f70cfabc9f554eea68c +SHA512 (llvm-project.tar.gz) = 8469e27de4518e4651afa4b3a8acf75ea9398aadd56f55c35664127b626cc7ef865375a90a6a8367831fb6e773d732cdd119693938ccd58274a39f1dc66108df +SHA512 (package-manager.tar.gz) = f8678112a235c76ddfdf67b6c98a2c288a50e0c8cf3cbf4e467e66ac9489aad72cb29f85d408f59923c94dfd3c9b23b7806535fb53f71ebf2da5038dbd7a2f98 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = a418f2053b6a04fc77275f0d3491cdeab3cb447e557419905b760a33b0d849042665e268c86b7c72ec11aa521830c948e65a491245cd8f56d9c77c0080b2f5f1 -SHA512 (swift-integration-tests.tar.gz) = 0e584980c5aa6b013e543dc596313dadb9ba3718fcbdf6cf8ce768eba0ce39425304c9926fbf997c2ba46bd73c668b3ee4d47ff717ff75dfee1a2c538a6fbe5c +SHA512 (sourcekit-lsp.tar.gz) = 72029a0df8330d19a393633cd8b49d1d887b2c8a89515360c5109003a0d645cc03a85ccdf701ce286f37cac204ce3b9b553611c7e59fe9045d79cbb494efd73d +SHA512 (swift-integration-tests.tar.gz) = a194b44d87bca94bcb9091f2849fd065acd3f12a0c95cb5ff4f0095886f649b529e8bf1e1380820cfdf28f4a1b4a03004350f3310c5b71436826553b14b8e17e SHA512 (swift-syntax.tar.gz) = a04c7693a1816e9397c32c23a56d2d9bbd76688cf26f50202004fc5ab17aa6bc91659cb21a97e46a3e71a76afdcbc9b8d0b56faa4b709dff5e6f51c7534fc923 -SHA512 (swift-xcode-playground-support.tar.gz) = 3dfad6a7d8790f3e9947e3f6a5f4c3011b240572b3d50a63667bb87b3206f6a2c113c23f947548b95afc5c88265b417e2156175be7c9a2fe91f2f00e9144b0a1 -SHA512 (swift.tar.gz) = 028db3857d1ae19885310a416d24c90d9502765d3e0b1c6c4824c3ee20e2bd76aceac02ac4199aaf4b8874fd961dbb552759f9eee2c45185b5214db94ff95b82 +SHA512 (swift-xcode-playground-support.tar.gz) = 93a7f5fc0d3cac4a096c540342860860d874f72a7064e4cd536500822a51f37da30988a628c9d3ffdc7a407af7004781c33b1606e9da070a5602b02b0364f405 +SHA512 (swift.tar.gz) = 55a04991c90425a953cf34b77c1f477a1a8d75c9ee038174e38b979cbbd226ad75751941c8ce0cd03b5676b294e70445f742127503a7f26bdb5a1b9b911734e1 diff --git a/swift-lang.spec b/swift-lang.spec index fb1bba9..54fbda6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,16 +1,16 @@ %global debug_package %{nil} -%global swifttag 5.1.4-RELEASE +%global swifttag 5.2-DEVELOPMENT-SNAPSHOT-2020-02-19-a # Swift syntax seems to only be updated on major releases %global swiftsyntax 5.1.4-RELEASE -%global swiftgithash 2194dc2 -%global swiftgitdate 20200131 +%global swiftgithash 998f2de +%global swiftgitdate 20200219 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.1.4 -Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.2 +Release: 0.7.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -36,16 +36,17 @@ Patch1: build-setup.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch -Patch5: python3.patch -Patch6: linux-tests-python-3.patch +Patch5: python3-2.patch +Patch6: linux-tests-python-3-2.patch Patch7: lldb_python38_platform.patch -Patch8: sourcekit.patch +Patch8: sourcekit-2.patch Patch9: compiler-rt-sanitizer.patch Patch10: build-setup-s390x.patch Patch11: sourcekit-loc.patch Patch12: glibcpthread.patch -Patch13: llvm.patch -Patch14: indexstore.patch +Patch13: swift.patch +Patch14: llvm.patch +Patch15: indexstore.patch BuildRequires: clang BuildRequires: cmake @@ -155,12 +156,12 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger -%patch4 -p0 +#%patch4 -p0 # Python 3 is the new default so we need to make the python code work with it %patch5 -p0 %patch6 -p0 -%patch7 -p0 +#%patch7 -p0 - already in the sources ... patch not needed at all :) %patch8 -p0 # New in Clang 9 is an assertion error of an array declared with a negative size @@ -172,9 +173,15 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 %patch12 -p0 -# Fixed STL no longer implicitly including +# +# 5.2 patches +# %patch13 -p0 + +# implicit include of cstdint %patch14 -p0 +%patch15 -p0 + %build export VERBOSE=1 @@ -227,13 +234,11 @@ ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cpp mkdir -p %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb ln -fs libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb/libIndexStore.so -cp %{_builddir}/usr/lib/liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn +cp %{_builddir}/usr/lib/liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn ln -fs liblldb.so.7svn %{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.7svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift cp %{_builddir}/usr/lib/libBlocksRuntime.so %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libdispatch.so %{buildroot}/usr/lib/swift-lldb @@ -307,24 +312,20 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Fri Jan 31 2020 Ron Olson 5.1.4-0.1.20200131git2194dc2 -- Updated to swift-5.1.4-RELEASE -* Fri Jan 31 2020 Fedora Release Engineering - 5.1.3-0.14.20200121gite45437e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a -* Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-19-a -* Sat Jan 18 2020 Ron Olson 5.1-0.11.20200117gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-17-a -* Sun Jan 12 2020 Ron Olson 5.1-0.10.20200111gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-11-a -* Sat Jan 11 2020 Ron Olson 5.1-0.9.20200110gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-10-a -* Fri Jan 10 2020 Ron Olson 5.1-0.8.20200109gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-09-a -* Wed Jan 08 2020 Ron Olson 5.1-0.7.20200107git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-07-a +* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a +* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a +* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a +* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a * Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a * Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 diff --git a/swift.patch b/swift.patch new file mode 100644 index 0000000..80cc2c8 --- /dev/null +++ b/swift.patch @@ -0,0 +1,23 @@ +diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini +--- swift-orig/utils/build-presets.ini 2020-02-10 23:48:46.000000000 -0600 ++++ swift/utils/build-presets.ini 2020-02-13 20:40:30.123310629 -0600 +@@ -527,7 +527,6 @@ + release + assertions + +-build-swift-stdlib-unittest-extra + + # We run the OS X tests and validation tests. + test +diff -Naur swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py +--- swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-10 23:48:46.000000000 -0600 ++++ swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-13 20:22:27.615497246 -0600 +@@ -12,7 +12,7 @@ + + from argparse import ArgumentError + +-import diagnostics ++from . import diagnostics + + from .targets import StdlibDeploymentTarget + From 2293f8053dc6e820ab52468d787bfdb0c7add663 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 24 Feb 2020 21:30:26 -0600 Subject: [PATCH 047/152] First update to Swift 5.2 --- build-setup.patch | 18 +- ...on-3.patch => linux-tests-python-3-2.patch | 17 +- llvm.patch | 20 +-- python3.patch => python3-2.patch | 157 ++++++++---------- sourcekit-2.patch | 0 sourcekit.patch | 20 --- sources | 24 +-- swift-lang.spec | 71 ++++---- swift.patch | 23 +++ 9 files changed, 172 insertions(+), 178 deletions(-) rename linux-tests-python-3.patch => linux-tests-python-3-2.patch (53%) rename python3.patch => python3-2.patch (72%) create mode 100644 sourcekit-2.patch delete mode 100644 sourcekit.patch create mode 100644 swift.patch diff --git a/build-setup.patch b/build-setup.patch index e9a34ff..0308c3f 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,6 +1,6 @@ ---- swift/utils/build-presets.ini.orig 2019-11-05 10:52:56.027260006 -0600 -+++ swift/utils/build-presets.ini 2019-11-05 10:53:52.275185967 -0600 -@@ -745,7 +745,6 @@ +--- swift/utils/build-presets.ini.orig 2020-01-30 19:54:07.528043218 -0600 ++++ swift/utils/build-presets.ini 2020-01-30 19:55:11.580461138 -0600 +@@ -741,7 +741,6 @@ dash-dash @@ -8,3 +8,15 @@ install-swift install-lldb install-llbuild +@@ -755,11 +754,6 @@ + build-swift-static-sdk-overlay + build-swift-stdlib-unittest-extra + +-# Executes the lit tests for the installable package that is created +-# Assumes the swift-integration-tests repo is checked out +- +-test-installable-package +- + # Build the benchmarks against the toolchain. + toolchain-benchmarks + diff --git a/linux-tests-python-3.patch b/linux-tests-python-3-2.patch similarity index 53% rename from linux-tests-python-3.patch rename to linux-tests-python-3-2.patch index e64c644..45a1bb6 100644 --- a/linux-tests-python-3.patch +++ b/linux-tests-python-3-2.patch @@ -1,5 +1,6 @@ ---- swift-integration-tests/test-snapshot-binaries/linux_load_commands.py.orig 2019-07-22 18:29:09.865242157 -0500 -+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2019-07-22 18:29:36.655204752 -0500 +diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py +--- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py 2019-10-07 17:57:28.000000000 -0500 ++++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2020-01-29 14:05:33.991180706 -0600 @@ -85,12 +85,12 @@ numberOfLinesSeen = 0 @@ -33,3 +34,15 @@ sys.exit(0) if __name__ == "__main__": +diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py +--- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py 2019-10-07 17:57:28.000000000 -0500 ++++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py 2020-01-29 18:35:26.953725332 -0600 +@@ -136,7 +136,7 @@ + + skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync'] + p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE) +- out, _ = p.communicate(lsp.script) ++ out, _ = p.communicate(lsp.script.encode()) + print(out) + print('') + diff --git a/llvm.patch b/llvm.patch index 406e33c..b9f70d5 100644 --- a/llvm.patch +++ b/llvm.patch @@ -1,19 +1,11 @@ -diff -Naur llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h ---- llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2019-12-12 22:11:12.000000000 -0600 -+++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-23 11:01:29.173281217 -0600 -@@ -4,6 +4,8 @@ - #include "llvm/Demangle/Compiler.h" +--- llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h.orig 2020-01-29 10:02:44.222689214 -0600 ++++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-29 10:03:02.007354450 -0600 +@@ -16,6 +16,8 @@ + #include "llvm/Demangle/DemangleConfig.h" #include "llvm/Demangle/StringView.h" #include +#include +#include - class OutputStream; - -@@ -599,4 +601,4 @@ - } // namespace ms_demangle - } // namespace llvm - --#endif -\ No newline at end of file -+#endif + namespace llvm { + namespace itanium_demangle { diff --git a/python3.patch b/python3-2.patch similarity index 72% rename from python3.patch rename to python3-2.patch index a65c0f4..1feab4f 100644 --- a/python3.patch +++ b/python3-2.patch @@ -1,46 +1,14 @@ -diff -Naur swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb swift/stdlib/public/core/FloatingPointTypes.swift.gyb ---- swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-22 11:22:17.049551459 -0500 -@@ -13,8 +13,8 @@ - import SwiftShims - - %{ --from SwiftIntTypes import all_integer_types --from SwiftFloatingPointTypes import all_floating_point_types -+import SwiftIntTypes -+import SwiftFloatingPointTypes - - # - # Utility code for later in this template -@@ -27,7 +27,7 @@ - builtinIntLiteralBits = 2048 - }% - --% for self_type in all_floating_point_types(): -+% for self_type in SwiftFloatingPointTypes.all_floating_point_types(): - %{ - Self = self_type.stdlib_name - bits = self_type.bits -@@ -1650,7 +1650,7 @@ - } - } - --% for src_type in all_floating_point_types(): -+% for src_type in SwiftFloatingPointTypes.all_floating_point_types(): - % srcBits = src_type.bits - % That = src_type.stdlib_name - diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb ---- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-22 15:30:40.491317722 -0500 +--- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-29 13:23:24.851180231 -0600 @@ -14,10 +14,9 @@ # Utility code for later in this template # -from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init -from SwiftFloatingPointTypes import getFtoIBounds -+import SwiftIntTypes -+import SwiftFloatingPointTypes ++import SwiftIntTypes ++import SwiftFloatingPointTypes -from string import maketrans, capitalize from itertools import chain @@ -63,8 +31,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub +% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) % if FloatType == 'Float80': - #if !os(Windows) && (arch(i386) || arch(x86_64)) -@@ -1651,7 +1650,7 @@ + #if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64)) +@@ -1648,7 +1647,7 @@ return Hasher._hash( seed: seed, bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), @@ -74,8 +42,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub } } diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb ---- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/Mirrors.swift.gyb 2019-07-23 09:20:38.269152361 -0500 +--- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/Mirrors.swift.gyb 2020-01-29 13:27:07.425509032 -0600 @@ -12,7 +12,7 @@ %{ @@ -95,14 +63,14 @@ diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/c if self_ty.is_signed: Types.append( (Self, '.int', 'Int64(self)') ) diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb ---- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-22 15:30:52.516752476 -0500 +--- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-29 13:30:52.170919077 -0600 @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// %{ -from SwiftIntTypes import all_integer_types -+import SwiftIntTypes ++import SwiftIntTypes word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 storagescalarCounts = [2,4,8,16,32,64] vectorscalarCounts = storagescalarCounts + [3] @@ -165,10 +133,10 @@ diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/ @frozen @_alignment(${bytes if bytes <= 16 else 16}) diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb ---- swift-orig/stdlib/public/core/Tuple.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/Tuple.swift.gyb 2019-07-17 20:54:45.400558556 -0500 +--- swift-orig/stdlib/public/core/Tuple.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/Tuple.swift.gyb 2020-01-29 13:32:22.287291260 -0600 @@ -111,7 +111,7 @@ - % equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams]) + % equatableTypeParams = ", ".join(["{}: Equatable".format(c) for c in typeParams]) % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) -% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) @@ -177,8 +145,8 @@ diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/cor /// Returns a Boolean value indicating whether the corresponding components of /// two tuples are equal. diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py ---- swift-orig/utils/gyb_sourcekit_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_sourcekit_support/__init__.py 2019-07-18 14:19:45.668770778 -0500 +--- swift-orig/utils/gyb_sourcekit_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_sourcekit_support/__init__.py 2020-01-29 13:33:22.111521781 -0600 @@ -14,9 +14,9 @@ # utils/gyb_sourcekit_support/ directory as a module. # @@ -193,8 +161,8 @@ diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_so def check_uid_duplication(): diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py ---- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/AttributeNodes.py 2019-07-18 12:34:20.708714660 -0500 +--- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/AttributeNodes.py 2020-01-29 13:34:03.265044624 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -204,8 +172,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb ATTRIBUTE_NODES = [ # token-list -> token? token-list? diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py ---- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-18 12:34:20.711714774 -0500 +--- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-29 13:34:33.458161889 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -215,8 +183,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/ AVAILABILITY_NODES = [ # availability-spec-list -> availability-entry availability-spec-list? diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py ---- swift-orig/utils/gyb_syntax_support/Child.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Child.py 2019-07-18 12:34:20.712714811 -0500 +--- swift-orig/utils/gyb_syntax_support/Child.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Child.py 2020-01-29 13:35:02.044219688 -0600 @@ -1,7 +1,7 @@ # flake8: noqa I201 -from Classification import classification_by_name @@ -229,8 +197,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_s class Child(object): diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py ---- swift-orig/utils/gyb_syntax_support/Classification.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Classification.py 2019-07-18 12:34:20.713714849 -0500 +--- swift-orig/utils/gyb_syntax_support/Classification.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Classification.py 2020-01-29 13:46:45.334244147 -0600 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -240,8 +208,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb class SyntaxClassification(object): diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py ---- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/CommonNodes.py 2019-07-18 12:34:20.714714887 -0500 +--- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/CommonNodes.py 2020-01-29 13:47:02.390875308 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -251,8 +219,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_sy COMMON_NODES = [ Node('Decl', kind='Syntax'), diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py ---- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/DeclNodes.py 2019-07-18 12:34:20.716714963 -0500 +--- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/DeclNodes.py 2020-01-29 13:47:30.486914972 -0600 @@ -1,6 +1,6 @@ # flake8: noqa I201 -from Child import Child @@ -263,8 +231,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_synt DECL_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py ---- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/ExprNodes.py 2019-07-18 12:34:20.717715000 -0500 +--- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/ExprNodes.py 2020-01-29 13:47:47.095529555 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -274,8 +242,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_synt EXPR_NODES = [ # An inout expression. diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py ---- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/GenericNodes.py 2019-07-18 12:34:20.718715038 -0500 +--- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/GenericNodes.py 2020-01-29 13:48:04.737182368 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -285,9 +253,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_s GENERIC_NODES = [ # generic-where-clause -> 'where' requirement-list diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py ---- swift-orig/utils/gyb_syntax_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/__init__.py 2019-07-18 12:34:33.973215999 -0500 -@@ -1,19 +1,19 @@ +--- swift-orig/utils/gyb_syntax_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/__init__.py 2020-01-29 13:52:03.762062110 -0600 +@@ -1,22 +1,22 @@ import textwrap -from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 -from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 @@ -296,43 +264,48 @@ diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_synta -from DeclNodes import DECL_NODES # noqa: I201 -from ExprNodes import EXPR_NODES # noqa: I201 -from GenericNodes import GENERIC_NODES # noqa: I201 --from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 +from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 -+from . import Classification # noqa: I201 ++from . import Classification # noqa: I201 +from .CommonNodes import COMMON_NODES # noqa: I201 +from .DeclNodes import DECL_NODES # noqa: I201 +from .ExprNodes import EXPR_NODES # noqa: I201 +from .GenericNodes import GENERIC_NODES # noqa: I201 + +-from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ get_serialization_code, \ verify_syntax_node_serialization_codes -from PatternNodes import PATTERN_NODES # noqa: I201 -from StmtNodes import STMT_NODES # noqa: I201 --import Token --from TypeNodes import TYPE_NODES # noqa: I201 +from .PatternNodes import PATTERN_NODES # noqa: I201 +from .StmtNodes import STMT_NODES # noqa: I201 + +-import Token +-from Trivia import TRIVIAS # noqa: I201 +-from TypeNodes import TYPE_NODES # noqa: I201 +from . import Token ++from .Trivia import TRIVIAS # noqa: I201 +from .TypeNodes import TYPE_NODES # noqa: I201 # Re-export global constants diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py ---- swift-orig/utils/gyb_syntax_support/Node.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Node.py 2019-07-18 12:34:20.722715189 -0500 -@@ -1,6 +1,6 @@ +--- swift-orig/utils/gyb_syntax_support/Node.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Node.py 2020-01-29 13:52:32.755139868 -0600 +@@ -1,7 +1,7 @@ from __future__ import print_function import sys # noqa: I201 + -from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word +from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word def error(msg): diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py ---- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-18 12:34:20.723715227 -0500 +--- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-29 13:52:58.148083796 -0600 @@ -1,4 +1,4 @@ -from Node import error +from .Node import error @@ -340,8 +313,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/u SYNTAX_NODE_SERIALIZATION_CODES = { diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py ---- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/PatternNodes.py 2019-07-18 12:34:20.724715265 -0500 +--- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/PatternNodes.py 2020-01-29 13:53:38.452582038 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -351,8 +324,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_s PATTERN_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py ---- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/StmtNodes.py 2019-07-18 12:34:20.726715341 -0500 +--- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/StmtNodes.py 2020-01-29 13:53:55.056199243 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -362,8 +335,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_synt STMT_NODES = [ # continue-stmt -> 'continue' label? ';'? diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py ---- swift-orig/utils/gyb_syntax_support/Token.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Token.py 2019-07-18 12:34:20.727715378 -0500 +--- swift-orig/utils/gyb_syntax_support/Token.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Token.py 2020-01-29 13:54:12.720855888 -0600 @@ -1,6 +1,6 @@ -from Classification import classification_by_name -from Node import error # noqa: I201 @@ -375,8 +348,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_s class Token(object): diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py ---- swift-orig/utils/gyb_syntax_support/Trivia.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Trivia.py 2019-07-18 14:22:04.074001913 -0500 +--- swift-orig/utils/gyb_syntax_support/Trivia.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Trivia.py 2020-01-29 13:54:41.647931191 -0600 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -386,8 +359,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_ class Trivia(object): diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py ---- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/TypeNodes.py 2019-07-18 12:34:20.731715529 -0500 +--- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/TypeNodes.py 2020-01-29 13:55:07.952909024 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -397,9 +370,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_synt TYPE_NODES = [ # simple-type-identifier -> identifier generic-argument-clause? diff -Naur swift-orig/utils/line-directive swift/utils/line-directive ---- swift-orig/utils/line-directive 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/line-directive 2019-07-19 09:01:35.602482603 -0500 -@@ -60,7 +60,7 @@ +--- swift-orig/utils/line-directive 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/line-directive 2020-01-29 13:57:12.829551057 -0600 +@@ -61,7 +61,7 @@ def _make_line_map(target_filename, stream=None): """ @@ -408,7 +381,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> _make_line_map('box', ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) ... line 2 -@@ -94,7 +94,7 @@ +@@ -95,7 +95,7 @@ def map_line_to_source_file(target_filename, target_line_num): """ @@ -417,7 +390,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -144,7 +144,7 @@ +@@ -145,7 +145,7 @@ def map_line_from_source_file(source_filename, source_line_num, target_filename): """ @@ -426,7 +399,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ def run(): """Simulate a couple of gyb-generated files diff --git a/sourcekit-2.patch b/sourcekit-2.patch new file mode 100644 index 0000000..e69de29 diff --git a/sourcekit.patch b/sourcekit.patch deleted file mode 100644 index 96896f4..0000000 --- a/sourcekit.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sourcekit-lsp/Utilities/build-script-helper.py.orig 2019-10-29 09:41:43.052157614 -0500 -+++ sourcekit-lsp/Utilities/build-script-helper.py 2019-10-30 21:23:18.538560646 -0500 -@@ -15,7 +15,7 @@ - subprocess.check_call(cmd, env=env) - - def swiftpm_bin_path(swift_exec, swiftpm_args, env=None): -- swiftpm_args = filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args) -+ swiftpm_args = list(filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args)) - cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args - print(' '.join(cmd)) - return subprocess.check_output(cmd, env=env).strip() -@@ -56,7 +56,7 @@ - install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain) - - def install_binary(exe, source_dir, install_dir, toolchain): -- cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir] -+ cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir] - print(' '.join(cmd)) - subprocess.check_call(cmd) - diff --git a/sources b/sources index e6f534b..3234b4c 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (cmark.tar.gz) = d9b16d6b0207849018e2a10b59f3acba5d03fe605626b57515942ef59355210f04ced5d815f322b7c21a729fd8c5af32c03a9e3e47a0a1af98b2065ee426495e -SHA512 (corelibs-foundation.tar.gz) = e3668c79cb4e04cacdc44543cf3dc321ee5f3f6bf9612381aadce5710d6909e107be270fb8742b9b50c93a2131762fe6959980a135987d753b8b668b67c9e710 -SHA512 (corelibs-libdispatch.tar.gz) = 8d34c5f8ebddba75741e31f07fb642b96f3fe642774887239e255f3a3455d418d9e473f76dc5b9a9e468eeff8a36256c20588817a85bd8b3c346bf169f828ef2 -SHA512 (corelibs-xctest.tar.gz) = 9bc102a2b102f117425cbfacd392baca2afdaf38923d846393d7cbb5214b1987c18fc4791f260c5d11480bfed0569851df9f61f073a44a2efe5b48a8b95aa081 -SHA512 (indexstore-db.tar.gz) = ef420d4841f297ad334d8b243d90096eb1713e2cd2270d7689a58d90ae5f46695ae0bde43e7fcdf4473882b6652c0e9050b3c8bed36e037fba00c570dd0cda13 -SHA512 (llbuild.tar.gz) = 34fd1c3c8041dd8aa2aa2b22eeb6c829589b17321c0b08c1c519c4c3ffa898add509126c853c60b2e0b6b8207a8153d658b8a3d9ff2c538e2f1c36bf8a406d2d -SHA512 (llvm-project.tar.gz) = 2cf0db02de579e6aa1a5e3a5b2fd5366ec80abb4274497fde29a0331e310596516472f2759e112e0e9c11c8655668fb34cb6fb4ba851ace23691360a4eec9224 -SHA512 (package-manager.tar.gz) = e7de615beb88ad7e6dd32b14a198fcdce02e4cb126cadf77c85512732cbc3a32974d846a49fd7b7acea84b46aa4d81202cf25a45c98493e71c19f02d144523c1 +SHA512 (cmark.tar.gz) = 55d21acf4693982d4fbbcafcc39f6d9442ae9fa1aab75d3f7ebb5e327e9a2862f3fc5c9a638764e1bf592f65dcb60c43cd1a89e65f928e813f7630bcb360935d +SHA512 (corelibs-foundation.tar.gz) = ccd2b51f6541f23beb7eca1de3ba21a155bf21dacd5f5ce9135fd506e68bc92de3c365eaeea4fd0821f7cd306f13277b888407cc9681512db077a6fe016b816b +SHA512 (corelibs-libdispatch.tar.gz) = 08c8f6114a93207bd75cbb3c88cc032b37e04f872777b661ca13d38a33dadbef93a652f95f439e0f21d4e614dc18bda9c372f5593b2292593d277c139c3df800 +SHA512 (corelibs-xctest.tar.gz) = 1d03de8d5ec5e1caf2732df55ac4c8be4f62eb4fd99f2b5601ea378f265cab61c7b02d8f99dcbfeb2c615a09aa24defab34ad679637b82c18f17afa90cdcb027 +SHA512 (indexstore-db.tar.gz) = f5fef16e255aecef7d8cf9492740003686e841c064328e437e21e36c81f8ec5dca5144577ad08234b90366ccb2716dd775ac994ccfeced0f3cf669029c6b7450 +SHA512 (llbuild.tar.gz) = d19952c7aa68cf613c3b8ec1bc519fe22650ab40671f57dfe9bb22c0f77c66babf4603e72c046517396c19ad458a6ed3b0103d10ab068f70cfabc9f554eea68c +SHA512 (llvm-project.tar.gz) = 8469e27de4518e4651afa4b3a8acf75ea9398aadd56f55c35664127b626cc7ef865375a90a6a8367831fb6e773d732cdd119693938ccd58274a39f1dc66108df +SHA512 (package-manager.tar.gz) = f8678112a235c76ddfdf67b6c98a2c288a50e0c8cf3cbf4e467e66ac9489aad72cb29f85d408f59923c94dfd3c9b23b7806535fb53f71ebf2da5038dbd7a2f98 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = a418f2053b6a04fc77275f0d3491cdeab3cb447e557419905b760a33b0d849042665e268c86b7c72ec11aa521830c948e65a491245cd8f56d9c77c0080b2f5f1 -SHA512 (swift-integration-tests.tar.gz) = 0e584980c5aa6b013e543dc596313dadb9ba3718fcbdf6cf8ce768eba0ce39425304c9926fbf997c2ba46bd73c668b3ee4d47ff717ff75dfee1a2c538a6fbe5c +SHA512 (sourcekit-lsp.tar.gz) = 72029a0df8330d19a393633cd8b49d1d887b2c8a89515360c5109003a0d645cc03a85ccdf701ce286f37cac204ce3b9b553611c7e59fe9045d79cbb494efd73d +SHA512 (swift-integration-tests.tar.gz) = a194b44d87bca94bcb9091f2849fd065acd3f12a0c95cb5ff4f0095886f649b529e8bf1e1380820cfdf28f4a1b4a03004350f3310c5b71436826553b14b8e17e SHA512 (swift-syntax.tar.gz) = a04c7693a1816e9397c32c23a56d2d9bbd76688cf26f50202004fc5ab17aa6bc91659cb21a97e46a3e71a76afdcbc9b8d0b56faa4b709dff5e6f51c7534fc923 -SHA512 (swift-xcode-playground-support.tar.gz) = 3dfad6a7d8790f3e9947e3f6a5f4c3011b240572b3d50a63667bb87b3206f6a2c113c23f947548b95afc5c88265b417e2156175be7c9a2fe91f2f00e9144b0a1 -SHA512 (swift.tar.gz) = 028db3857d1ae19885310a416d24c90d9502765d3e0b1c6c4824c3ee20e2bd76aceac02ac4199aaf4b8874fd961dbb552759f9eee2c45185b5214db94ff95b82 +SHA512 (swift-xcode-playground-support.tar.gz) = 93a7f5fc0d3cac4a096c540342860860d874f72a7064e4cd536500822a51f37da30988a628c9d3ffdc7a407af7004781c33b1606e9da070a5602b02b0364f405 +SHA512 (swift.tar.gz) = 55a04991c90425a953cf34b77c1f477a1a8d75c9ee038174e38b979cbbd226ad75751941c8ce0cd03b5676b294e70445f742127503a7f26bdb5a1b9b911734e1 diff --git a/swift-lang.spec b/swift-lang.spec index fb1bba9..54fbda6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,16 +1,16 @@ %global debug_package %{nil} -%global swifttag 5.1.4-RELEASE +%global swifttag 5.2-DEVELOPMENT-SNAPSHOT-2020-02-19-a # Swift syntax seems to only be updated on major releases %global swiftsyntax 5.1.4-RELEASE -%global swiftgithash 2194dc2 -%global swiftgitdate 20200131 +%global swiftgithash 998f2de +%global swiftgitdate 20200219 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang -Version: 5.1.4 -Release: 0.1.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.2 +Release: 0.7.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -36,16 +36,17 @@ Patch1: build-setup.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch -Patch5: python3.patch -Patch6: linux-tests-python-3.patch +Patch5: python3-2.patch +Patch6: linux-tests-python-3-2.patch Patch7: lldb_python38_platform.patch -Patch8: sourcekit.patch +Patch8: sourcekit-2.patch Patch9: compiler-rt-sanitizer.patch Patch10: build-setup-s390x.patch Patch11: sourcekit-loc.patch Patch12: glibcpthread.patch -Patch13: llvm.patch -Patch14: indexstore.patch +Patch13: swift.patch +Patch14: llvm.patch +Patch15: indexstore.patch BuildRequires: clang BuildRequires: cmake @@ -155,12 +156,12 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger -%patch4 -p0 +#%patch4 -p0 # Python 3 is the new default so we need to make the python code work with it %patch5 -p0 %patch6 -p0 -%patch7 -p0 +#%patch7 -p0 - already in the sources ... patch not needed at all :) %patch8 -p0 # New in Clang 9 is an assertion error of an array declared with a negative size @@ -172,9 +173,15 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 %patch12 -p0 -# Fixed STL no longer implicitly including +# +# 5.2 patches +# %patch13 -p0 + +# implicit include of cstdint %patch14 -p0 +%patch15 -p0 + %build export VERBOSE=1 @@ -227,13 +234,11 @@ ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cpp mkdir -p %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb ln -fs libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb/libIndexStore.so -cp %{_builddir}/usr/lib/liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn +cp %{_builddir}/usr/lib/liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn ln -fs liblldb.so.7svn %{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.7svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift cp %{_builddir}/usr/lib/libBlocksRuntime.so %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libdispatch.so %{buildroot}/usr/lib/swift-lldb @@ -307,24 +312,20 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Fri Jan 31 2020 Ron Olson 5.1.4-0.1.20200131git2194dc2 -- Updated to swift-5.1.4-RELEASE -* Fri Jan 31 2020 Fedora Release Engineering - 5.1.3-0.14.20200121gite45437e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a -* Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-19-a -* Sat Jan 18 2020 Ron Olson 5.1-0.11.20200117gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-17-a -* Sun Jan 12 2020 Ron Olson 5.1-0.10.20200111gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-11-a -* Sat Jan 11 2020 Ron Olson 5.1-0.9.20200110gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-10-a -* Fri Jan 10 2020 Ron Olson 5.1-0.8.20200109gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-09-a -* Wed Jan 08 2020 Ron Olson 5.1-0.7.20200107git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-07-a +* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a +* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a +* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a +* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a * Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a * Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 diff --git a/swift.patch b/swift.patch new file mode 100644 index 0000000..80cc2c8 --- /dev/null +++ b/swift.patch @@ -0,0 +1,23 @@ +diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini +--- swift-orig/utils/build-presets.ini 2020-02-10 23:48:46.000000000 -0600 ++++ swift/utils/build-presets.ini 2020-02-13 20:40:30.123310629 -0600 +@@ -527,7 +527,6 @@ + release + assertions + +-build-swift-stdlib-unittest-extra + + # We run the OS X tests and validation tests. + test +diff -Naur swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py +--- swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-10 23:48:46.000000000 -0600 ++++ swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-13 20:22:27.615497246 -0600 +@@ -12,7 +12,7 @@ + + from argparse import ArgumentError + +-import diagnostics ++from . import diagnostics + + from .targets import StdlibDeploymentTarget + From 54d3381aa190de5a5a36ea05018bccbf3982c81b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 13 Mar 2020 21:15:22 -0500 Subject: [PATCH 048/152] Update to Swift 5.1.5 --- .gitignore | 1 + build-setup.patch | 21 +-- implicit_fallthru.patch | 112 +++++++++++++ ...on-3-2.patch => linux-tests-python-3.patch | 17 +- llvm.patch | 20 ++- python3-2.patch => python3.patch | 157 ++++++++++-------- sourcekit-2.patch | 0 sourcekit.patch | 20 +++ sources | 27 +-- swift-lang.spec | 101 +++++++---- swift.patch | 23 --- 11 files changed, 329 insertions(+), 170 deletions(-) create mode 100644 implicit_fallthru.patch rename linux-tests-python-3-2.patch => linux-tests-python-3.patch (53%) rename python3-2.patch => python3.patch (72%) delete mode 100644 sourcekit-2.patch create mode 100644 sourcekit.patch delete mode 100644 swift.patch diff --git a/.gitignore b/.gitignore index d86b377..eef5596 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /release-61-2.tar.gz /sourcekit-lsp.tar.gz /swift-syntax.tar.gz +/cmake-3.16.5.tar.gz diff --git a/build-setup.patch b/build-setup.patch index 0308c3f..65101d0 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,6 +1,6 @@ ---- swift/utils/build-presets.ini.orig 2020-01-30 19:54:07.528043218 -0600 -+++ swift/utils/build-presets.ini 2020-01-30 19:55:11.580461138 -0600 -@@ -741,7 +741,6 @@ +--- swift/utils/build-presets.ini.orig 2020-03-12 16:04:54.935355266 -0500 ++++ swift/utils/build-presets.ini 2020-03-12 16:05:14.714144269 -0500 +@@ -745,7 +745,6 @@ dash-dash @@ -8,15 +8,12 @@ install-swift install-lldb install-llbuild -@@ -755,11 +754,6 @@ - build-swift-static-sdk-overlay - build-swift-stdlib-unittest-extra +@@ -762,7 +761,7 @@ + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out --# Executes the lit tests for the installable package that is created --# Assumes the swift-integration-tests repo is checked out -- -test-installable-package -- - # Build the benchmarks against the toolchain. - toolchain-benchmarks ++#test-installable-package + # Path to the root of the installation filesystem. + install-destdir=%(install_destdir)s diff --git a/implicit_fallthru.patch b/implicit_fallthru.patch new file mode 100644 index 0000000..abcec31 --- /dev/null +++ b/implicit_fallthru.patch @@ -0,0 +1,112 @@ +diff -Naur swift-corelibs-libdispatch-orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c +--- swift-corelibs-libdispatch-orig/src/event/event_epoll.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/event/event_epoll.c 2020-03-11 16:06:21.182865901 -0500 +@@ -174,6 +174,9 @@ + } + case EVFILT_WRITE: + filter = EVFILT_READ; ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case EVFILT_READ: + if (fstat(fd, &sb) < 0) { + return NULL; +diff -Naur swift-corelibs-libdispatch-orig/src/io.c swift-corelibs-libdispatch/src/io.c +--- swift-corelibs-libdispatch-orig/src/io.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/io.c 2020-03-11 16:08:45.344481709 -0500 +@@ -2086,11 +2086,17 @@ + case DISPATCH_OP_DELIVER: + flags = DOP_DEFAULT; + // Fall through ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_OP_DELIVER_AND_COMPLETE: + flags = (flags != DOP_DEFAULT) ? DOP_DELIVER | DOP_NO_EMPTY : + DOP_DEFAULT; + _dispatch_operation_deliver_data(op, flags); + // Fall through ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_OP_COMPLETE: + if (flags != DOP_DEFAULT) { + _dispatch_stream_complete_operation(stream, op); +@@ -2103,6 +2109,9 @@ + case DISPATCH_OP_COMPLETE_RESUME: + _dispatch_stream_complete_operation(stream, op); + // Fall through ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_OP_RESUME: + if (_dispatch_stream_operation_avail(stream)) { + stream->source_running = true; +diff -Naur swift-corelibs-libdispatch-orig/src/semaphore.c swift-corelibs-libdispatch/src/semaphore.c +--- swift-corelibs-libdispatch-orig/src/semaphore.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/semaphore.c 2020-03-11 16:10:04.319558171 -0500 +@@ -118,6 +118,9 @@ + } + // Fall through and try to undo what the fast path did to + // dsema->dsema_value ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_TIME_NOW: + orig = dsema->dsema_value; + while (orig < 0) { +@@ -128,6 +131,9 @@ + } + // Another thread called semaphore_signal(). + // Fall through and drain the wakeup. ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_TIME_FOREVER: + _dispatch_sema4_wait(&dsema->dsema_sema); + break; +diff -Naur swift-corelibs-libdispatch-orig/src/shims/lock.c swift-corelibs-libdispatch/src/shims/lock.c +--- swift-corelibs-libdispatch-orig/src/shims/lock.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/shims/lock.c 2020-03-11 16:10:55.045534383 -0500 +@@ -428,8 +428,17 @@ + continue; + } + /* FALLTHROUGH */ ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case ETIMEDOUT: ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case EFAULT: ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case EWOULDBLOCK: + return errno; + default: +diff -Naur swift-corelibs-libdispatch-orig/src/transform.c swift-corelibs-libdispatch/src/transform.c +--- swift-corelibs-libdispatch-orig/src/transform.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/transform.c 2020-03-11 16:11:47.034560632 -0500 +@@ -781,11 +781,20 @@ + case 1: + *ptr++ = '='; // c + *ptr++ = '='; // d ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case 2: + *ptr++ = '='; // e ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case 3: + *ptr++ = '='; // f + *ptr++ = '='; // g ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case 4: + *ptr++ = '='; // h + break; diff --git a/linux-tests-python-3-2.patch b/linux-tests-python-3.patch similarity index 53% rename from linux-tests-python-3-2.patch rename to linux-tests-python-3.patch index 45a1bb6..e64c644 100644 --- a/linux-tests-python-3-2.patch +++ b/linux-tests-python-3.patch @@ -1,6 +1,5 @@ -diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py ---- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py 2019-10-07 17:57:28.000000000 -0500 -+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2020-01-29 14:05:33.991180706 -0600 +--- swift-integration-tests/test-snapshot-binaries/linux_load_commands.py.orig 2019-07-22 18:29:09.865242157 -0500 ++++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2019-07-22 18:29:36.655204752 -0500 @@ -85,12 +85,12 @@ numberOfLinesSeen = 0 @@ -34,15 +33,3 @@ diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_comman sys.exit(0) if __name__ == "__main__": -diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py ---- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py 2019-10-07 17:57:28.000000000 -0500 -+++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py 2020-01-29 18:35:26.953725332 -0600 -@@ -136,7 +136,7 @@ - - skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync'] - p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE) -- out, _ = p.communicate(lsp.script) -+ out, _ = p.communicate(lsp.script.encode()) - print(out) - print('') - diff --git a/llvm.patch b/llvm.patch index b9f70d5..406e33c 100644 --- a/llvm.patch +++ b/llvm.patch @@ -1,11 +1,19 @@ ---- llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h.orig 2020-01-29 10:02:44.222689214 -0600 -+++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-29 10:03:02.007354450 -0600 -@@ -16,6 +16,8 @@ - #include "llvm/Demangle/DemangleConfig.h" +diff -Naur llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h +--- llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2019-12-12 22:11:12.000000000 -0600 ++++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-23 11:01:29.173281217 -0600 +@@ -4,6 +4,8 @@ + #include "llvm/Demangle/Compiler.h" #include "llvm/Demangle/StringView.h" #include +#include +#include - namespace llvm { - namespace itanium_demangle { + class OutputStream; + +@@ -599,4 +601,4 @@ + } // namespace ms_demangle + } // namespace llvm + +-#endif +\ No newline at end of file ++#endif diff --git a/python3-2.patch b/python3.patch similarity index 72% rename from python3-2.patch rename to python3.patch index 1feab4f..a65c0f4 100644 --- a/python3-2.patch +++ b/python3.patch @@ -1,14 +1,46 @@ +diff -Naur swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb swift/stdlib/public/core/FloatingPointTypes.swift.gyb +--- swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-22 11:22:17.049551459 -0500 +@@ -13,8 +13,8 @@ + import SwiftShims + + %{ +-from SwiftIntTypes import all_integer_types +-from SwiftFloatingPointTypes import all_floating_point_types ++import SwiftIntTypes ++import SwiftFloatingPointTypes + + # + # Utility code for later in this template +@@ -27,7 +27,7 @@ + builtinIntLiteralBits = 2048 + }% + +-% for self_type in all_floating_point_types(): ++% for self_type in SwiftFloatingPointTypes.all_floating_point_types(): + %{ + Self = self_type.stdlib_name + bits = self_type.bits +@@ -1650,7 +1650,7 @@ + } + } + +-% for src_type in all_floating_point_types(): ++% for src_type in SwiftFloatingPointTypes.all_floating_point_types(): + % srcBits = src_type.bits + % That = src_type.stdlib_name + diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb ---- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-29 13:23:24.851180231 -0600 +--- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-22 15:30:40.491317722 -0500 @@ -14,10 +14,9 @@ # Utility code for later in this template # -from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init -from SwiftFloatingPointTypes import getFtoIBounds -+import SwiftIntTypes -+import SwiftFloatingPointTypes ++import SwiftIntTypes ++import SwiftFloatingPointTypes -from string import maketrans, capitalize from itertools import chain @@ -31,8 +63,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub +% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) % if FloatType == 'Float80': - #if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64)) -@@ -1648,7 +1647,7 @@ + #if !os(Windows) && (arch(i386) || arch(x86_64)) +@@ -1651,7 +1650,7 @@ return Hasher._hash( seed: seed, bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), @@ -42,8 +74,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub } } diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb ---- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/Mirrors.swift.gyb 2020-01-29 13:27:07.425509032 -0600 +--- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/Mirrors.swift.gyb 2019-07-23 09:20:38.269152361 -0500 @@ -12,7 +12,7 @@ %{ @@ -63,14 +95,14 @@ diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/c if self_ty.is_signed: Types.append( (Self, '.int', 'Int64(self)') ) diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb ---- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-29 13:30:52.170919077 -0600 +--- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-22 15:30:52.516752476 -0500 @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// %{ -from SwiftIntTypes import all_integer_types -+import SwiftIntTypes ++import SwiftIntTypes word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 storagescalarCounts = [2,4,8,16,32,64] vectorscalarCounts = storagescalarCounts + [3] @@ -133,10 +165,10 @@ diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/ @frozen @_alignment(${bytes if bytes <= 16 else 16}) diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb ---- swift-orig/stdlib/public/core/Tuple.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/Tuple.swift.gyb 2020-01-29 13:32:22.287291260 -0600 +--- swift-orig/stdlib/public/core/Tuple.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/Tuple.swift.gyb 2019-07-17 20:54:45.400558556 -0500 @@ -111,7 +111,7 @@ - % equatableTypeParams = ", ".join(["{}: Equatable".format(c) for c in typeParams]) + % equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams]) % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) -% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) @@ -145,8 +177,8 @@ diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/cor /// Returns a Boolean value indicating whether the corresponding components of /// two tuples are equal. diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py ---- swift-orig/utils/gyb_sourcekit_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_sourcekit_support/__init__.py 2020-01-29 13:33:22.111521781 -0600 +--- swift-orig/utils/gyb_sourcekit_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_sourcekit_support/__init__.py 2019-07-18 14:19:45.668770778 -0500 @@ -14,9 +14,9 @@ # utils/gyb_sourcekit_support/ directory as a module. # @@ -161,8 +193,8 @@ diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_so def check_uid_duplication(): diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py ---- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/AttributeNodes.py 2020-01-29 13:34:03.265044624 -0600 +--- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/AttributeNodes.py 2019-07-18 12:34:20.708714660 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -172,8 +204,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb ATTRIBUTE_NODES = [ # token-list -> token? token-list? diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py ---- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-29 13:34:33.458161889 -0600 +--- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-18 12:34:20.711714774 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -183,8 +215,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/ AVAILABILITY_NODES = [ # availability-spec-list -> availability-entry availability-spec-list? diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py ---- swift-orig/utils/gyb_syntax_support/Child.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Child.py 2020-01-29 13:35:02.044219688 -0600 +--- swift-orig/utils/gyb_syntax_support/Child.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Child.py 2019-07-18 12:34:20.712714811 -0500 @@ -1,7 +1,7 @@ # flake8: noqa I201 -from Classification import classification_by_name @@ -197,8 +229,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_s class Child(object): diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py ---- swift-orig/utils/gyb_syntax_support/Classification.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Classification.py 2020-01-29 13:46:45.334244147 -0600 +--- swift-orig/utils/gyb_syntax_support/Classification.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Classification.py 2019-07-18 12:34:20.713714849 -0500 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -208,8 +240,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb class SyntaxClassification(object): diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py ---- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/CommonNodes.py 2020-01-29 13:47:02.390875308 -0600 +--- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/CommonNodes.py 2019-07-18 12:34:20.714714887 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -219,8 +251,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_sy COMMON_NODES = [ Node('Decl', kind='Syntax'), diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py ---- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/DeclNodes.py 2020-01-29 13:47:30.486914972 -0600 +--- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/DeclNodes.py 2019-07-18 12:34:20.716714963 -0500 @@ -1,6 +1,6 @@ # flake8: noqa I201 -from Child import Child @@ -231,8 +263,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_synt DECL_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py ---- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/ExprNodes.py 2020-01-29 13:47:47.095529555 -0600 +--- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/ExprNodes.py 2019-07-18 12:34:20.717715000 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -242,8 +274,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_synt EXPR_NODES = [ # An inout expression. diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py ---- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/GenericNodes.py 2020-01-29 13:48:04.737182368 -0600 +--- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/GenericNodes.py 2019-07-18 12:34:20.718715038 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -253,9 +285,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_s GENERIC_NODES = [ # generic-where-clause -> 'where' requirement-list diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py ---- swift-orig/utils/gyb_syntax_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/__init__.py 2020-01-29 13:52:03.762062110 -0600 -@@ -1,22 +1,22 @@ +--- swift-orig/utils/gyb_syntax_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/__init__.py 2019-07-18 12:34:33.973215999 -0500 +@@ -1,19 +1,19 @@ import textwrap -from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 -from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 @@ -264,48 +296,43 @@ diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_synta -from DeclNodes import DECL_NODES # noqa: I201 -from ExprNodes import EXPR_NODES # noqa: I201 -from GenericNodes import GENERIC_NODES # noqa: I201 +-from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 +from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 -+from . import Classification # noqa: I201 ++from . import Classification # noqa: I201 +from .CommonNodes import COMMON_NODES # noqa: I201 +from .DeclNodes import DECL_NODES # noqa: I201 +from .ExprNodes import EXPR_NODES # noqa: I201 +from .GenericNodes import GENERIC_NODES # noqa: I201 - --from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ get_serialization_code, \ verify_syntax_node_serialization_codes -from PatternNodes import PATTERN_NODES # noqa: I201 -from StmtNodes import STMT_NODES # noqa: I201 +-import Token +-from TypeNodes import TYPE_NODES # noqa: I201 +from .PatternNodes import PATTERN_NODES # noqa: I201 +from .StmtNodes import STMT_NODES # noqa: I201 - --import Token --from Trivia import TRIVIAS # noqa: I201 --from TypeNodes import TYPE_NODES # noqa: I201 +from . import Token -+from .Trivia import TRIVIAS # noqa: I201 +from .TypeNodes import TYPE_NODES # noqa: I201 # Re-export global constants diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py ---- swift-orig/utils/gyb_syntax_support/Node.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Node.py 2020-01-29 13:52:32.755139868 -0600 -@@ -1,7 +1,7 @@ +--- swift-orig/utils/gyb_syntax_support/Node.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Node.py 2019-07-18 12:34:20.722715189 -0500 +@@ -1,6 +1,6 @@ from __future__ import print_function import sys # noqa: I201 - -from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word +from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word def error(msg): diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py ---- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-29 13:52:58.148083796 -0600 +--- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-18 12:34:20.723715227 -0500 @@ -1,4 +1,4 @@ -from Node import error +from .Node import error @@ -313,8 +340,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/u SYNTAX_NODE_SERIALIZATION_CODES = { diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py ---- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/PatternNodes.py 2020-01-29 13:53:38.452582038 -0600 +--- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/PatternNodes.py 2019-07-18 12:34:20.724715265 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -324,8 +351,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_s PATTERN_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py ---- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/StmtNodes.py 2020-01-29 13:53:55.056199243 -0600 +--- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/StmtNodes.py 2019-07-18 12:34:20.726715341 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -335,8 +362,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_synt STMT_NODES = [ # continue-stmt -> 'continue' label? ';'? diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py ---- swift-orig/utils/gyb_syntax_support/Token.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Token.py 2020-01-29 13:54:12.720855888 -0600 +--- swift-orig/utils/gyb_syntax_support/Token.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Token.py 2019-07-18 12:34:20.727715378 -0500 @@ -1,6 +1,6 @@ -from Classification import classification_by_name -from Node import error # noqa: I201 @@ -348,8 +375,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_s class Token(object): diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py ---- swift-orig/utils/gyb_syntax_support/Trivia.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Trivia.py 2020-01-29 13:54:41.647931191 -0600 +--- swift-orig/utils/gyb_syntax_support/Trivia.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Trivia.py 2019-07-18 14:22:04.074001913 -0500 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -359,8 +386,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_ class Trivia(object): diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py ---- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/TypeNodes.py 2020-01-29 13:55:07.952909024 -0600 +--- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/TypeNodes.py 2019-07-18 12:34:20.731715529 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -370,9 +397,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_synt TYPE_NODES = [ # simple-type-identifier -> identifier generic-argument-clause? diff -Naur swift-orig/utils/line-directive swift/utils/line-directive ---- swift-orig/utils/line-directive 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/line-directive 2020-01-29 13:57:12.829551057 -0600 -@@ -61,7 +61,7 @@ +--- swift-orig/utils/line-directive 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/line-directive 2019-07-19 09:01:35.602482603 -0500 +@@ -60,7 +60,7 @@ def _make_line_map(target_filename, stream=None): """ @@ -381,7 +408,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> _make_line_map('box', ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) ... line 2 -@@ -95,7 +95,7 @@ +@@ -94,7 +94,7 @@ def map_line_to_source_file(target_filename, target_line_num): """ @@ -390,7 +417,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -145,7 +145,7 @@ +@@ -144,7 +144,7 @@ def map_line_from_source_file(source_filename, source_line_num, target_filename): """ @@ -399,7 +426,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -231,7 +231,7 @@ +@@ -230,7 +230,7 @@ def run(): """Simulate a couple of gyb-generated files diff --git a/sourcekit-2.patch b/sourcekit-2.patch deleted file mode 100644 index e69de29..0000000 diff --git a/sourcekit.patch b/sourcekit.patch new file mode 100644 index 0000000..96896f4 --- /dev/null +++ b/sourcekit.patch @@ -0,0 +1,20 @@ +--- sourcekit-lsp/Utilities/build-script-helper.py.orig 2019-10-29 09:41:43.052157614 -0500 ++++ sourcekit-lsp/Utilities/build-script-helper.py 2019-10-30 21:23:18.538560646 -0500 +@@ -15,7 +15,7 @@ + subprocess.check_call(cmd, env=env) + + def swiftpm_bin_path(swift_exec, swiftpm_args, env=None): +- swiftpm_args = filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args) ++ swiftpm_args = list(filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args)) + cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args + print(' '.join(cmd)) + return subprocess.check_output(cmd, env=env).strip() +@@ -56,7 +56,7 @@ + install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain) + + def install_binary(exe, source_dir, install_dir, toolchain): +- cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir] ++ cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir] + print(' '.join(cmd)) + subprocess.check_call(cmd) + diff --git a/sources b/sources index 3234b4c..9c8d30a 100644 --- a/sources +++ b/sources @@ -1,14 +1,15 @@ -SHA512 (cmark.tar.gz) = 55d21acf4693982d4fbbcafcc39f6d9442ae9fa1aab75d3f7ebb5e327e9a2862f3fc5c9a638764e1bf592f65dcb60c43cd1a89e65f928e813f7630bcb360935d -SHA512 (corelibs-foundation.tar.gz) = ccd2b51f6541f23beb7eca1de3ba21a155bf21dacd5f5ce9135fd506e68bc92de3c365eaeea4fd0821f7cd306f13277b888407cc9681512db077a6fe016b816b -SHA512 (corelibs-libdispatch.tar.gz) = 08c8f6114a93207bd75cbb3c88cc032b37e04f872777b661ca13d38a33dadbef93a652f95f439e0f21d4e614dc18bda9c372f5593b2292593d277c139c3df800 -SHA512 (corelibs-xctest.tar.gz) = 1d03de8d5ec5e1caf2732df55ac4c8be4f62eb4fd99f2b5601ea378f265cab61c7b02d8f99dcbfeb2c615a09aa24defab34ad679637b82c18f17afa90cdcb027 -SHA512 (indexstore-db.tar.gz) = f5fef16e255aecef7d8cf9492740003686e841c064328e437e21e36c81f8ec5dca5144577ad08234b90366ccb2716dd775ac994ccfeced0f3cf669029c6b7450 -SHA512 (llbuild.tar.gz) = d19952c7aa68cf613c3b8ec1bc519fe22650ab40671f57dfe9bb22c0f77c66babf4603e72c046517396c19ad458a6ed3b0103d10ab068f70cfabc9f554eea68c -SHA512 (llvm-project.tar.gz) = 8469e27de4518e4651afa4b3a8acf75ea9398aadd56f55c35664127b626cc7ef865375a90a6a8367831fb6e773d732cdd119693938ccd58274a39f1dc66108df -SHA512 (package-manager.tar.gz) = f8678112a235c76ddfdf67b6c98a2c288a50e0c8cf3cbf4e467e66ac9489aad72cb29f85d408f59923c94dfd3c9b23b7806535fb53f71ebf2da5038dbd7a2f98 +SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 +SHA512 (cmark.tar.gz) = 279c96a0de7700c46d58482f500247445238bd3266f81dccef5ad785756cb82667f41dcf1f207a5e69064f8d4514011ca0eb5ba98565e120bba591a4e144d31b +SHA512 (corelibs-foundation.tar.gz) = 1801a624c19585bff8aebe3362ecc5d6f638331303e24ce592dc28418bf667a0e20dcd525e3ff1840258c9cc67c9254d5478436c18da24f7e5c60411fece149f +SHA512 (corelibs-libdispatch.tar.gz) = fab701b5e4b32b03decea1df4561b2ae65afbf7cd82d64768e77aa4907a179374fab4f5a4f81bda6bb490087eabdd2113988ec44424b14744ee0de2c94b96318 +SHA512 (corelibs-xctest.tar.gz) = 857fef0f6e681e563625a5f8f01072b5cd4c89af81ac7c919a5552b2a6f692fa06314d5d93289c6521273bfbbcfb1b619a1c79dffbb24f5a291e16d63cf3b0d9 +SHA512 (indexstore-db.tar.gz) = 7a260272ed309517b4c0878dcfb91db7826651934658632248e9719fe46811b8346b3c57c045f63cbedd15c5c0f5f829464c94f6d7c165b70ed0f418e4150e4a +SHA512 (llbuild.tar.gz) = 5f88dae0f1e76d7c27012b3237f4b7009a5da669dfc2569dc1bac8f9152279f6d2a5b9bf54ec5f844d64c841c0ab4c408835e3de8915f144ddacdcff2afa0575 +SHA512 (llvm-project.tar.gz) = ba88f86a57b6390e8a900620b0453dd61ca9c896cd2067e9415627087220b39a067801586e3e4fc0cfef21dca76e31c130ef9df05a2ddf0ada855fb79f66d228 +SHA512 (package-manager.tar.gz) = 1536f097960b3626060a3d07701d8dddb515862fa805285f9501a5cf3210b77276dac82525f9dc473532b97dd8e2e5287dec72ea4e6129b2cdc7f874d95915fe SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 72029a0df8330d19a393633cd8b49d1d887b2c8a89515360c5109003a0d645cc03a85ccdf701ce286f37cac204ce3b9b553611c7e59fe9045d79cbb494efd73d -SHA512 (swift-integration-tests.tar.gz) = a194b44d87bca94bcb9091f2849fd065acd3f12a0c95cb5ff4f0095886f649b529e8bf1e1380820cfdf28f4a1b4a03004350f3310c5b71436826553b14b8e17e -SHA512 (swift-syntax.tar.gz) = a04c7693a1816e9397c32c23a56d2d9bbd76688cf26f50202004fc5ab17aa6bc91659cb21a97e46a3e71a76afdcbc9b8d0b56faa4b709dff5e6f51c7534fc923 -SHA512 (swift-xcode-playground-support.tar.gz) = 93a7f5fc0d3cac4a096c540342860860d874f72a7064e4cd536500822a51f37da30988a628c9d3ffdc7a407af7004781c33b1606e9da070a5602b02b0364f405 -SHA512 (swift.tar.gz) = 55a04991c90425a953cf34b77c1f477a1a8d75c9ee038174e38b979cbbd226ad75751941c8ce0cd03b5676b294e70445f742127503a7f26bdb5a1b9b911734e1 +SHA512 (sourcekit-lsp.tar.gz) = 9a1abe05795641519f68d58056933d3dd035cf6287652f08f29e632dd5c25966d7f92e64360715bd1f32ac29a7dd6137b0620b0e168dd33768b464b8baa08493 +SHA512 (swift-integration-tests.tar.gz) = 3e581c1d77d8eff71a8c51865cc425e6b6c28cd9c182f9f156d8d908b32c0f76163eac524f7c549c112cc068f945d15edd0be6d4f4b6899026272f03de96c887 +SHA512 (swift-syntax.tar.gz) = 05ee1e89aeb2db56e01cabb29bc6f53da29b9feb669ec0563f4ee9561afb61e40a5d2a24f121601b8afc7a9082864eec73d3fb72f00a570c000693d7db31e9ca +SHA512 (swift-xcode-playground-support.tar.gz) = ff5eb6c97ab7a1d0fabc08c01aebc876abbbc4a79fc437f8286deae7b9c248bd702fbb60217c1b53d5eecb18b096c68662e154d94c105400d6acc2ad72c176e6 +SHA512 (swift.tar.gz) = a5976a8edf2495168f0ba7c090af69ef0ef754ccfdf785a28b32c976eb4bc9e94d0c1022000ec50131b37b58ea8993aae8f095abf0d6b4028ea9fcabfd2e845a diff --git a/swift-lang.spec b/swift-lang.spec index 54fbda6..5806d43 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,16 +1,17 @@ %global debug_package %{nil} -%global swifttag 5.2-DEVELOPMENT-SNAPSHOT-2020-02-19-a +%global swifttag 5.1.5-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.1.4-RELEASE -%global swiftgithash 998f2de -%global swiftgitdate 20200219 +%global swiftsyntax 5.1.5-RELEASE +%global swiftgithash 30c042c +%global swiftgitdate 20200305 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* +%global cmake_version 3.16.5 Name: swift-lang -Version: 5.2 -Release: 0.7.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1.5 +Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -30,26 +31,26 @@ Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz Source14: swift-lang.conf Source15: swift-lang-runtime.conf +Source16: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: change-lldb-location.patch Patch1: build-setup.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch -Patch5: python3-2.patch -Patch6: linux-tests-python-3-2.patch +Patch5: python3.patch +Patch6: linux-tests-python-3.patch Patch7: lldb_python38_platform.patch -Patch8: sourcekit-2.patch +Patch8: sourcekit.patch Patch9: compiler-rt-sanitizer.patch Patch10: build-setup-s390x.patch Patch11: sourcekit-loc.patch Patch12: glibcpthread.patch -Patch13: swift.patch -Patch14: llvm.patch -Patch15: indexstore.patch +Patch13: llvm.patch +Patch14: indexstore.patch +Patch15: implicit_fallthru.patch BuildRequires: clang -BuildRequires: cmake BuildRequires: swig BuildRequires: pkgconfig BuildRequires: perl-podlators @@ -68,6 +69,7 @@ BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build BuildRequires: make +BuildRequires: openssl-devel Requires: glibc-devel Requires: clang @@ -103,6 +105,14 @@ Runtime libraries for Swift programs %prep + +# First we handle our own CMake (sigh) +%setup -q -c -n cmake -a 16 +mkdir cmake-build +cd cmake-build +../cmake-%{cmake_version}/bootstrap && make + +# Now continue on with Swift... %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named @@ -156,12 +166,12 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger -#%patch4 -p0 +%patch4 -p0 # Python 3 is the new default so we need to make the python code work with it %patch5 -p0 %patch6 -p0 -#%patch7 -p0 - already in the sources ... patch not needed at all :) +%patch7 -p0 %patch8 -p0 # New in Clang 9 is an assertion error of an array declared with a negative size @@ -173,13 +183,11 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 %patch12 -p0 -# -# 5.2 patches -# +# Fixed STL no longer implicitly including %patch13 -p0 - -# implicit include of cstdint %patch14 -p0 + +# Implicit fallthrough warning treated as error in Clang 10 %patch15 -p0 @@ -190,6 +198,9 @@ export VERBOSE=1 mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH +# And for CMake, which we built first +export PATH=$PWD/../cmake/cmake-build/bin:$PATH + # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -234,11 +245,13 @@ ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cpp mkdir -p %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb ln -fs libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb/libIndexStore.so -cp %{_builddir}/usr/lib/liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn +cp %{_builddir}/usr/lib/liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn ln -fs liblldb.so.7svn %{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.7svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift cp %{_builddir}/usr/lib/libBlocksRuntime.so %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libdispatch.so %{buildroot}/usr/lib/swift-lldb @@ -312,20 +325,36 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a -* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a -* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a -* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a -* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a -* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a -* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a +* Tue Mar 10 2020 Ron Olson 5.1.5-0.1.20200305git30c042c +- Updated to swift-5.1.5-RELEASE and added building the 3.16 version of CMake + to work around issues with 3.17 +* Mon Feb 17 2020 Ron Olson 5.1.4-0.2.20200131git2194dc2 +- Added patch to handle warning-as-error using Clang 10 +* Fri Jan 31 2020 Ron Olson 5.1.4-0.1.20200131git2194dc2 +- Updated to swift-5.1.4-RELEASE +* Wed Jan 29 2020 Ron Olson 5.1-0.17.20200128gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-28-a +* Tue Jan 28 2020 Ron Olson 5.1-0.16.20200127gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Sat Jan 25 2020 Ron Olson 5.1-0.15.20200124gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-24-a and added patches to + handle the cstdint header not being implicitly included +* Fri Jan 24 2020 Ron Olson 5.1-0.14.20200123gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-23-a +* Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a +* Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-19-a +* Sat Jan 18 2020 Ron Olson 5.1-0.11.20200117gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Sun Jan 12 2020 Ron Olson 5.1-0.10.20200111gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-11-a +* Sat Jan 11 2020 Ron Olson 5.1-0.9.20200110gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-10-a +* Fri Jan 10 2020 Ron Olson 5.1-0.8.20200109gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Wed Jan 08 2020 Ron Olson 5.1-0.7.20200107git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-07-a * Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a * Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 diff --git a/swift.patch b/swift.patch deleted file mode 100644 index 80cc2c8..0000000 --- a/swift.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini ---- swift-orig/utils/build-presets.ini 2020-02-10 23:48:46.000000000 -0600 -+++ swift/utils/build-presets.ini 2020-02-13 20:40:30.123310629 -0600 -@@ -527,7 +527,6 @@ - release - assertions - --build-swift-stdlib-unittest-extra - - # We run the OS X tests and validation tests. - test -diff -Naur swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py ---- swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-10 23:48:46.000000000 -0600 -+++ swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-13 20:22:27.615497246 -0600 -@@ -12,7 +12,7 @@ - - from argparse import ArgumentError - --import diagnostics -+from . import diagnostics - - from .targets import StdlibDeploymentTarget - From 1f337de528be8fea2f5326d61230ae6b09426102 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 13 Mar 2020 21:37:59 -0500 Subject: [PATCH 049/152] Updated to Swift 5.1.5 --- .gitignore | 1 + build-setup.patch | 21 +-- implicit_fallthru.patch | 112 +++++++++++++ ...on-3-2.patch => linux-tests-python-3.patch | 17 +- llvm.patch | 20 ++- python3-2.patch => python3.patch | 157 ++++++++++-------- sourcekit-2.patch | 0 sourcekit.patch | 20 +++ sources | 27 +-- swift-lang.spec | 101 +++++++---- swift.patch | 23 --- 11 files changed, 329 insertions(+), 170 deletions(-) create mode 100644 implicit_fallthru.patch rename linux-tests-python-3-2.patch => linux-tests-python-3.patch (53%) rename python3-2.patch => python3.patch (72%) delete mode 100644 sourcekit-2.patch create mode 100644 sourcekit.patch delete mode 100644 swift.patch diff --git a/.gitignore b/.gitignore index d86b377..eef5596 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /release-61-2.tar.gz /sourcekit-lsp.tar.gz /swift-syntax.tar.gz +/cmake-3.16.5.tar.gz diff --git a/build-setup.patch b/build-setup.patch index 0308c3f..65101d0 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,6 +1,6 @@ ---- swift/utils/build-presets.ini.orig 2020-01-30 19:54:07.528043218 -0600 -+++ swift/utils/build-presets.ini 2020-01-30 19:55:11.580461138 -0600 -@@ -741,7 +741,6 @@ +--- swift/utils/build-presets.ini.orig 2020-03-12 16:04:54.935355266 -0500 ++++ swift/utils/build-presets.ini 2020-03-12 16:05:14.714144269 -0500 +@@ -745,7 +745,6 @@ dash-dash @@ -8,15 +8,12 @@ install-swift install-lldb install-llbuild -@@ -755,11 +754,6 @@ - build-swift-static-sdk-overlay - build-swift-stdlib-unittest-extra +@@ -762,7 +761,7 @@ + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out --# Executes the lit tests for the installable package that is created --# Assumes the swift-integration-tests repo is checked out -- -test-installable-package -- - # Build the benchmarks against the toolchain. - toolchain-benchmarks ++#test-installable-package + # Path to the root of the installation filesystem. + install-destdir=%(install_destdir)s diff --git a/implicit_fallthru.patch b/implicit_fallthru.patch new file mode 100644 index 0000000..abcec31 --- /dev/null +++ b/implicit_fallthru.patch @@ -0,0 +1,112 @@ +diff -Naur swift-corelibs-libdispatch-orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c +--- swift-corelibs-libdispatch-orig/src/event/event_epoll.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/event/event_epoll.c 2020-03-11 16:06:21.182865901 -0500 +@@ -174,6 +174,9 @@ + } + case EVFILT_WRITE: + filter = EVFILT_READ; ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case EVFILT_READ: + if (fstat(fd, &sb) < 0) { + return NULL; +diff -Naur swift-corelibs-libdispatch-orig/src/io.c swift-corelibs-libdispatch/src/io.c +--- swift-corelibs-libdispatch-orig/src/io.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/io.c 2020-03-11 16:08:45.344481709 -0500 +@@ -2086,11 +2086,17 @@ + case DISPATCH_OP_DELIVER: + flags = DOP_DEFAULT; + // Fall through ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_OP_DELIVER_AND_COMPLETE: + flags = (flags != DOP_DEFAULT) ? DOP_DELIVER | DOP_NO_EMPTY : + DOP_DEFAULT; + _dispatch_operation_deliver_data(op, flags); + // Fall through ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_OP_COMPLETE: + if (flags != DOP_DEFAULT) { + _dispatch_stream_complete_operation(stream, op); +@@ -2103,6 +2109,9 @@ + case DISPATCH_OP_COMPLETE_RESUME: + _dispatch_stream_complete_operation(stream, op); + // Fall through ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_OP_RESUME: + if (_dispatch_stream_operation_avail(stream)) { + stream->source_running = true; +diff -Naur swift-corelibs-libdispatch-orig/src/semaphore.c swift-corelibs-libdispatch/src/semaphore.c +--- swift-corelibs-libdispatch-orig/src/semaphore.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/semaphore.c 2020-03-11 16:10:04.319558171 -0500 +@@ -118,6 +118,9 @@ + } + // Fall through and try to undo what the fast path did to + // dsema->dsema_value ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_TIME_NOW: + orig = dsema->dsema_value; + while (orig < 0) { +@@ -128,6 +131,9 @@ + } + // Another thread called semaphore_signal(). + // Fall through and drain the wakeup. ++ #if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case DISPATCH_TIME_FOREVER: + _dispatch_sema4_wait(&dsema->dsema_sema); + break; +diff -Naur swift-corelibs-libdispatch-orig/src/shims/lock.c swift-corelibs-libdispatch/src/shims/lock.c +--- swift-corelibs-libdispatch-orig/src/shims/lock.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/shims/lock.c 2020-03-11 16:10:55.045534383 -0500 +@@ -428,8 +428,17 @@ + continue; + } + /* FALLTHROUGH */ ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case ETIMEDOUT: ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case EFAULT: ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case EWOULDBLOCK: + return errno; + default: +diff -Naur swift-corelibs-libdispatch-orig/src/transform.c swift-corelibs-libdispatch/src/transform.c +--- swift-corelibs-libdispatch-orig/src/transform.c 2019-07-31 17:58:26.000000000 -0500 ++++ swift-corelibs-libdispatch/src/transform.c 2020-03-11 16:11:47.034560632 -0500 +@@ -781,11 +781,20 @@ + case 1: + *ptr++ = '='; // c + *ptr++ = '='; // d ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case 2: + *ptr++ = '='; // e ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case 3: + *ptr++ = '='; // f + *ptr++ = '='; // g ++#if __clang_major__ >= 10 ++ __attribute__((fallthrough)); ++ #endif + case 4: + *ptr++ = '='; // h + break; diff --git a/linux-tests-python-3-2.patch b/linux-tests-python-3.patch similarity index 53% rename from linux-tests-python-3-2.patch rename to linux-tests-python-3.patch index 45a1bb6..e64c644 100644 --- a/linux-tests-python-3-2.patch +++ b/linux-tests-python-3.patch @@ -1,6 +1,5 @@ -diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py ---- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py 2019-10-07 17:57:28.000000000 -0500 -+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2020-01-29 14:05:33.991180706 -0600 +--- swift-integration-tests/test-snapshot-binaries/linux_load_commands.py.orig 2019-07-22 18:29:09.865242157 -0500 ++++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2019-07-22 18:29:36.655204752 -0500 @@ -85,12 +85,12 @@ numberOfLinesSeen = 0 @@ -34,15 +33,3 @@ diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_comman sys.exit(0) if __name__ == "__main__": -diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py ---- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py 2019-10-07 17:57:28.000000000 -0500 -+++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py 2020-01-29 18:35:26.953725332 -0600 -@@ -136,7 +136,7 @@ - - skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync'] - p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE) -- out, _ = p.communicate(lsp.script) -+ out, _ = p.communicate(lsp.script.encode()) - print(out) - print('') - diff --git a/llvm.patch b/llvm.patch index b9f70d5..406e33c 100644 --- a/llvm.patch +++ b/llvm.patch @@ -1,11 +1,19 @@ ---- llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h.orig 2020-01-29 10:02:44.222689214 -0600 -+++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-29 10:03:02.007354450 -0600 -@@ -16,6 +16,8 @@ - #include "llvm/Demangle/DemangleConfig.h" +diff -Naur llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h +--- llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2019-12-12 22:11:12.000000000 -0600 ++++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-23 11:01:29.173281217 -0600 +@@ -4,6 +4,8 @@ + #include "llvm/Demangle/Compiler.h" #include "llvm/Demangle/StringView.h" #include +#include +#include - namespace llvm { - namespace itanium_demangle { + class OutputStream; + +@@ -599,4 +601,4 @@ + } // namespace ms_demangle + } // namespace llvm + +-#endif +\ No newline at end of file ++#endif diff --git a/python3-2.patch b/python3.patch similarity index 72% rename from python3-2.patch rename to python3.patch index 1feab4f..a65c0f4 100644 --- a/python3-2.patch +++ b/python3.patch @@ -1,14 +1,46 @@ +diff -Naur swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb swift/stdlib/public/core/FloatingPointTypes.swift.gyb +--- swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-22 11:22:17.049551459 -0500 +@@ -13,8 +13,8 @@ + import SwiftShims + + %{ +-from SwiftIntTypes import all_integer_types +-from SwiftFloatingPointTypes import all_floating_point_types ++import SwiftIntTypes ++import SwiftFloatingPointTypes + + # + # Utility code for later in this template +@@ -27,7 +27,7 @@ + builtinIntLiteralBits = 2048 + }% + +-% for self_type in all_floating_point_types(): ++% for self_type in SwiftFloatingPointTypes.all_floating_point_types(): + %{ + Self = self_type.stdlib_name + bits = self_type.bits +@@ -1650,7 +1650,7 @@ + } + } + +-% for src_type in all_floating_point_types(): ++% for src_type in SwiftFloatingPointTypes.all_floating_point_types(): + % srcBits = src_type.bits + % That = src_type.stdlib_name + diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb ---- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-29 13:23:24.851180231 -0600 +--- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-22 15:30:40.491317722 -0500 @@ -14,10 +14,9 @@ # Utility code for later in this template # -from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init -from SwiftFloatingPointTypes import getFtoIBounds -+import SwiftIntTypes -+import SwiftFloatingPointTypes ++import SwiftIntTypes ++import SwiftFloatingPointTypes -from string import maketrans, capitalize from itertools import chain @@ -31,8 +63,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub +% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) % if FloatType == 'Float80': - #if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64)) -@@ -1648,7 +1647,7 @@ + #if !os(Windows) && (arch(i386) || arch(x86_64)) +@@ -1651,7 +1650,7 @@ return Hasher._hash( seed: seed, bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), @@ -42,8 +74,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub } } diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb ---- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/Mirrors.swift.gyb 2020-01-29 13:27:07.425509032 -0600 +--- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/Mirrors.swift.gyb 2019-07-23 09:20:38.269152361 -0500 @@ -12,7 +12,7 @@ %{ @@ -63,14 +95,14 @@ diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/c if self_ty.is_signed: Types.append( (Self, '.int', 'Int64(self)') ) diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb ---- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-29 13:30:52.170919077 -0600 +--- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-22 15:30:52.516752476 -0500 @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// %{ -from SwiftIntTypes import all_integer_types -+import SwiftIntTypes ++import SwiftIntTypes word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 storagescalarCounts = [2,4,8,16,32,64] vectorscalarCounts = storagescalarCounts + [3] @@ -133,10 +165,10 @@ diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/ @frozen @_alignment(${bytes if bytes <= 16 else 16}) diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb ---- swift-orig/stdlib/public/core/Tuple.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/Tuple.swift.gyb 2020-01-29 13:32:22.287291260 -0600 +--- swift-orig/stdlib/public/core/Tuple.swift.gyb 2019-07-14 15:16:38.000000000 -0500 ++++ swift/stdlib/public/core/Tuple.swift.gyb 2019-07-17 20:54:45.400558556 -0500 @@ -111,7 +111,7 @@ - % equatableTypeParams = ", ".join(["{}: Equatable".format(c) for c in typeParams]) + % equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams]) % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) -% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) @@ -145,8 +177,8 @@ diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/cor /// Returns a Boolean value indicating whether the corresponding components of /// two tuples are equal. diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py ---- swift-orig/utils/gyb_sourcekit_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_sourcekit_support/__init__.py 2020-01-29 13:33:22.111521781 -0600 +--- swift-orig/utils/gyb_sourcekit_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_sourcekit_support/__init__.py 2019-07-18 14:19:45.668770778 -0500 @@ -14,9 +14,9 @@ # utils/gyb_sourcekit_support/ directory as a module. # @@ -161,8 +193,8 @@ diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_so def check_uid_duplication(): diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py ---- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/AttributeNodes.py 2020-01-29 13:34:03.265044624 -0600 +--- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/AttributeNodes.py 2019-07-18 12:34:20.708714660 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -172,8 +204,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb ATTRIBUTE_NODES = [ # token-list -> token? token-list? diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py ---- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-29 13:34:33.458161889 -0600 +--- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-18 12:34:20.711714774 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -183,8 +215,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/ AVAILABILITY_NODES = [ # availability-spec-list -> availability-entry availability-spec-list? diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py ---- swift-orig/utils/gyb_syntax_support/Child.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Child.py 2020-01-29 13:35:02.044219688 -0600 +--- swift-orig/utils/gyb_syntax_support/Child.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Child.py 2019-07-18 12:34:20.712714811 -0500 @@ -1,7 +1,7 @@ # flake8: noqa I201 -from Classification import classification_by_name @@ -197,8 +229,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_s class Child(object): diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py ---- swift-orig/utils/gyb_syntax_support/Classification.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Classification.py 2020-01-29 13:46:45.334244147 -0600 +--- swift-orig/utils/gyb_syntax_support/Classification.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Classification.py 2019-07-18 12:34:20.713714849 -0500 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -208,8 +240,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb class SyntaxClassification(object): diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py ---- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/CommonNodes.py 2020-01-29 13:47:02.390875308 -0600 +--- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/CommonNodes.py 2019-07-18 12:34:20.714714887 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -219,8 +251,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_sy COMMON_NODES = [ Node('Decl', kind='Syntax'), diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py ---- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/DeclNodes.py 2020-01-29 13:47:30.486914972 -0600 +--- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/DeclNodes.py 2019-07-18 12:34:20.716714963 -0500 @@ -1,6 +1,6 @@ # flake8: noqa I201 -from Child import Child @@ -231,8 +263,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_synt DECL_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py ---- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/ExprNodes.py 2020-01-29 13:47:47.095529555 -0600 +--- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/ExprNodes.py 2019-07-18 12:34:20.717715000 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -242,8 +274,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_synt EXPR_NODES = [ # An inout expression. diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py ---- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/GenericNodes.py 2020-01-29 13:48:04.737182368 -0600 +--- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/GenericNodes.py 2019-07-18 12:34:20.718715038 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -253,9 +285,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_s GENERIC_NODES = [ # generic-where-clause -> 'where' requirement-list diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py ---- swift-orig/utils/gyb_syntax_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/__init__.py 2020-01-29 13:52:03.762062110 -0600 -@@ -1,22 +1,22 @@ +--- swift-orig/utils/gyb_syntax_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/__init__.py 2019-07-18 12:34:33.973215999 -0500 +@@ -1,19 +1,19 @@ import textwrap -from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 -from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 @@ -264,48 +296,43 @@ diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_synta -from DeclNodes import DECL_NODES # noqa: I201 -from ExprNodes import EXPR_NODES # noqa: I201 -from GenericNodes import GENERIC_NODES # noqa: I201 +-from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 +from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 -+from . import Classification # noqa: I201 ++from . import Classification # noqa: I201 +from .CommonNodes import COMMON_NODES # noqa: I201 +from .DeclNodes import DECL_NODES # noqa: I201 +from .ExprNodes import EXPR_NODES # noqa: I201 +from .GenericNodes import GENERIC_NODES # noqa: I201 - --from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ get_serialization_code, \ verify_syntax_node_serialization_codes -from PatternNodes import PATTERN_NODES # noqa: I201 -from StmtNodes import STMT_NODES # noqa: I201 +-import Token +-from TypeNodes import TYPE_NODES # noqa: I201 +from .PatternNodes import PATTERN_NODES # noqa: I201 +from .StmtNodes import STMT_NODES # noqa: I201 - --import Token --from Trivia import TRIVIAS # noqa: I201 --from TypeNodes import TYPE_NODES # noqa: I201 +from . import Token -+from .Trivia import TRIVIAS # noqa: I201 +from .TypeNodes import TYPE_NODES # noqa: I201 # Re-export global constants diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py ---- swift-orig/utils/gyb_syntax_support/Node.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Node.py 2020-01-29 13:52:32.755139868 -0600 -@@ -1,7 +1,7 @@ +--- swift-orig/utils/gyb_syntax_support/Node.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Node.py 2019-07-18 12:34:20.722715189 -0500 +@@ -1,6 +1,6 @@ from __future__ import print_function import sys # noqa: I201 - -from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word +from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word def error(msg): diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py ---- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-29 13:52:58.148083796 -0600 +--- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-18 12:34:20.723715227 -0500 @@ -1,4 +1,4 @@ -from Node import error +from .Node import error @@ -313,8 +340,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/u SYNTAX_NODE_SERIALIZATION_CODES = { diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py ---- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/PatternNodes.py 2020-01-29 13:53:38.452582038 -0600 +--- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/PatternNodes.py 2019-07-18 12:34:20.724715265 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -324,8 +351,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_s PATTERN_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py ---- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/StmtNodes.py 2020-01-29 13:53:55.056199243 -0600 +--- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/StmtNodes.py 2019-07-18 12:34:20.726715341 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -335,8 +362,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_synt STMT_NODES = [ # continue-stmt -> 'continue' label? ';'? diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py ---- swift-orig/utils/gyb_syntax_support/Token.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Token.py 2020-01-29 13:54:12.720855888 -0600 +--- swift-orig/utils/gyb_syntax_support/Token.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Token.py 2019-07-18 12:34:20.727715378 -0500 @@ -1,6 +1,6 @@ -from Classification import classification_by_name -from Node import error # noqa: I201 @@ -348,8 +375,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_s class Token(object): diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py ---- swift-orig/utils/gyb_syntax_support/Trivia.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Trivia.py 2020-01-29 13:54:41.647931191 -0600 +--- swift-orig/utils/gyb_syntax_support/Trivia.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/Trivia.py 2019-07-18 14:22:04.074001913 -0500 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -359,8 +386,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_ class Trivia(object): diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py ---- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/TypeNodes.py 2020-01-29 13:55:07.952909024 -0600 +--- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/gyb_syntax_support/TypeNodes.py 2019-07-18 12:34:20.731715529 -0500 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -370,9 +397,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_synt TYPE_NODES = [ # simple-type-identifier -> identifier generic-argument-clause? diff -Naur swift-orig/utils/line-directive swift/utils/line-directive ---- swift-orig/utils/line-directive 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/line-directive 2020-01-29 13:57:12.829551057 -0600 -@@ -61,7 +61,7 @@ +--- swift-orig/utils/line-directive 2019-07-14 15:16:38.000000000 -0500 ++++ swift/utils/line-directive 2019-07-19 09:01:35.602482603 -0500 +@@ -60,7 +60,7 @@ def _make_line_map(target_filename, stream=None): """ @@ -381,7 +408,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> _make_line_map('box', ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) ... line 2 -@@ -95,7 +95,7 @@ +@@ -94,7 +94,7 @@ def map_line_to_source_file(target_filename, target_line_num): """ @@ -390,7 +417,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -145,7 +145,7 @@ +@@ -144,7 +144,7 @@ def map_line_from_source_file(source_filename, source_line_num, target_filename): """ @@ -399,7 +426,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -231,7 +231,7 @@ +@@ -230,7 +230,7 @@ def run(): """Simulate a couple of gyb-generated files diff --git a/sourcekit-2.patch b/sourcekit-2.patch deleted file mode 100644 index e69de29..0000000 diff --git a/sourcekit.patch b/sourcekit.patch new file mode 100644 index 0000000..96896f4 --- /dev/null +++ b/sourcekit.patch @@ -0,0 +1,20 @@ +--- sourcekit-lsp/Utilities/build-script-helper.py.orig 2019-10-29 09:41:43.052157614 -0500 ++++ sourcekit-lsp/Utilities/build-script-helper.py 2019-10-30 21:23:18.538560646 -0500 +@@ -15,7 +15,7 @@ + subprocess.check_call(cmd, env=env) + + def swiftpm_bin_path(swift_exec, swiftpm_args, env=None): +- swiftpm_args = filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args) ++ swiftpm_args = list(filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args)) + cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args + print(' '.join(cmd)) + return subprocess.check_output(cmd, env=env).strip() +@@ -56,7 +56,7 @@ + install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain) + + def install_binary(exe, source_dir, install_dir, toolchain): +- cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir] ++ cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir] + print(' '.join(cmd)) + subprocess.check_call(cmd) + diff --git a/sources b/sources index 3234b4c..9c8d30a 100644 --- a/sources +++ b/sources @@ -1,14 +1,15 @@ -SHA512 (cmark.tar.gz) = 55d21acf4693982d4fbbcafcc39f6d9442ae9fa1aab75d3f7ebb5e327e9a2862f3fc5c9a638764e1bf592f65dcb60c43cd1a89e65f928e813f7630bcb360935d -SHA512 (corelibs-foundation.tar.gz) = ccd2b51f6541f23beb7eca1de3ba21a155bf21dacd5f5ce9135fd506e68bc92de3c365eaeea4fd0821f7cd306f13277b888407cc9681512db077a6fe016b816b -SHA512 (corelibs-libdispatch.tar.gz) = 08c8f6114a93207bd75cbb3c88cc032b37e04f872777b661ca13d38a33dadbef93a652f95f439e0f21d4e614dc18bda9c372f5593b2292593d277c139c3df800 -SHA512 (corelibs-xctest.tar.gz) = 1d03de8d5ec5e1caf2732df55ac4c8be4f62eb4fd99f2b5601ea378f265cab61c7b02d8f99dcbfeb2c615a09aa24defab34ad679637b82c18f17afa90cdcb027 -SHA512 (indexstore-db.tar.gz) = f5fef16e255aecef7d8cf9492740003686e841c064328e437e21e36c81f8ec5dca5144577ad08234b90366ccb2716dd775ac994ccfeced0f3cf669029c6b7450 -SHA512 (llbuild.tar.gz) = d19952c7aa68cf613c3b8ec1bc519fe22650ab40671f57dfe9bb22c0f77c66babf4603e72c046517396c19ad458a6ed3b0103d10ab068f70cfabc9f554eea68c -SHA512 (llvm-project.tar.gz) = 8469e27de4518e4651afa4b3a8acf75ea9398aadd56f55c35664127b626cc7ef865375a90a6a8367831fb6e773d732cdd119693938ccd58274a39f1dc66108df -SHA512 (package-manager.tar.gz) = f8678112a235c76ddfdf67b6c98a2c288a50e0c8cf3cbf4e467e66ac9489aad72cb29f85d408f59923c94dfd3c9b23b7806535fb53f71ebf2da5038dbd7a2f98 +SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 +SHA512 (cmark.tar.gz) = 279c96a0de7700c46d58482f500247445238bd3266f81dccef5ad785756cb82667f41dcf1f207a5e69064f8d4514011ca0eb5ba98565e120bba591a4e144d31b +SHA512 (corelibs-foundation.tar.gz) = 1801a624c19585bff8aebe3362ecc5d6f638331303e24ce592dc28418bf667a0e20dcd525e3ff1840258c9cc67c9254d5478436c18da24f7e5c60411fece149f +SHA512 (corelibs-libdispatch.tar.gz) = fab701b5e4b32b03decea1df4561b2ae65afbf7cd82d64768e77aa4907a179374fab4f5a4f81bda6bb490087eabdd2113988ec44424b14744ee0de2c94b96318 +SHA512 (corelibs-xctest.tar.gz) = 857fef0f6e681e563625a5f8f01072b5cd4c89af81ac7c919a5552b2a6f692fa06314d5d93289c6521273bfbbcfb1b619a1c79dffbb24f5a291e16d63cf3b0d9 +SHA512 (indexstore-db.tar.gz) = 7a260272ed309517b4c0878dcfb91db7826651934658632248e9719fe46811b8346b3c57c045f63cbedd15c5c0f5f829464c94f6d7c165b70ed0f418e4150e4a +SHA512 (llbuild.tar.gz) = 5f88dae0f1e76d7c27012b3237f4b7009a5da669dfc2569dc1bac8f9152279f6d2a5b9bf54ec5f844d64c841c0ab4c408835e3de8915f144ddacdcff2afa0575 +SHA512 (llvm-project.tar.gz) = ba88f86a57b6390e8a900620b0453dd61ca9c896cd2067e9415627087220b39a067801586e3e4fc0cfef21dca76e31c130ef9df05a2ddf0ada855fb79f66d228 +SHA512 (package-manager.tar.gz) = 1536f097960b3626060a3d07701d8dddb515862fa805285f9501a5cf3210b77276dac82525f9dc473532b97dd8e2e5287dec72ea4e6129b2cdc7f874d95915fe SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 72029a0df8330d19a393633cd8b49d1d887b2c8a89515360c5109003a0d645cc03a85ccdf701ce286f37cac204ce3b9b553611c7e59fe9045d79cbb494efd73d -SHA512 (swift-integration-tests.tar.gz) = a194b44d87bca94bcb9091f2849fd065acd3f12a0c95cb5ff4f0095886f649b529e8bf1e1380820cfdf28f4a1b4a03004350f3310c5b71436826553b14b8e17e -SHA512 (swift-syntax.tar.gz) = a04c7693a1816e9397c32c23a56d2d9bbd76688cf26f50202004fc5ab17aa6bc91659cb21a97e46a3e71a76afdcbc9b8d0b56faa4b709dff5e6f51c7534fc923 -SHA512 (swift-xcode-playground-support.tar.gz) = 93a7f5fc0d3cac4a096c540342860860d874f72a7064e4cd536500822a51f37da30988a628c9d3ffdc7a407af7004781c33b1606e9da070a5602b02b0364f405 -SHA512 (swift.tar.gz) = 55a04991c90425a953cf34b77c1f477a1a8d75c9ee038174e38b979cbbd226ad75751941c8ce0cd03b5676b294e70445f742127503a7f26bdb5a1b9b911734e1 +SHA512 (sourcekit-lsp.tar.gz) = 9a1abe05795641519f68d58056933d3dd035cf6287652f08f29e632dd5c25966d7f92e64360715bd1f32ac29a7dd6137b0620b0e168dd33768b464b8baa08493 +SHA512 (swift-integration-tests.tar.gz) = 3e581c1d77d8eff71a8c51865cc425e6b6c28cd9c182f9f156d8d908b32c0f76163eac524f7c549c112cc068f945d15edd0be6d4f4b6899026272f03de96c887 +SHA512 (swift-syntax.tar.gz) = 05ee1e89aeb2db56e01cabb29bc6f53da29b9feb669ec0563f4ee9561afb61e40a5d2a24f121601b8afc7a9082864eec73d3fb72f00a570c000693d7db31e9ca +SHA512 (swift-xcode-playground-support.tar.gz) = ff5eb6c97ab7a1d0fabc08c01aebc876abbbc4a79fc437f8286deae7b9c248bd702fbb60217c1b53d5eecb18b096c68662e154d94c105400d6acc2ad72c176e6 +SHA512 (swift.tar.gz) = a5976a8edf2495168f0ba7c090af69ef0ef754ccfdf785a28b32c976eb4bc9e94d0c1022000ec50131b37b58ea8993aae8f095abf0d6b4028ea9fcabfd2e845a diff --git a/swift-lang.spec b/swift-lang.spec index 54fbda6..5806d43 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,16 +1,17 @@ %global debug_package %{nil} -%global swifttag 5.2-DEVELOPMENT-SNAPSHOT-2020-02-19-a +%global swifttag 5.1.5-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.1.4-RELEASE -%global swiftgithash 998f2de -%global swiftgitdate 20200219 +%global swiftsyntax 5.1.5-RELEASE +%global swiftgithash 30c042c +%global swiftgitdate 20200305 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* +%global cmake_version 3.16.5 Name: swift-lang -Version: 5.2 -Release: 0.7.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.1.5 +Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -30,26 +31,26 @@ Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz Source14: swift-lang.conf Source15: swift-lang-runtime.conf +Source16: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: change-lldb-location.patch Patch1: build-setup.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: swift-unwrapped.patch -Patch5: python3-2.patch -Patch6: linux-tests-python-3-2.patch +Patch5: python3.patch +Patch6: linux-tests-python-3.patch Patch7: lldb_python38_platform.patch -Patch8: sourcekit-2.patch +Patch8: sourcekit.patch Patch9: compiler-rt-sanitizer.patch Patch10: build-setup-s390x.patch Patch11: sourcekit-loc.patch Patch12: glibcpthread.patch -Patch13: swift.patch -Patch14: llvm.patch -Patch15: indexstore.patch +Patch13: llvm.patch +Patch14: indexstore.patch +Patch15: implicit_fallthru.patch BuildRequires: clang -BuildRequires: cmake BuildRequires: swig BuildRequires: pkgconfig BuildRequires: perl-podlators @@ -68,6 +69,7 @@ BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build BuildRequires: make +BuildRequires: openssl-devel Requires: glibc-devel Requires: clang @@ -103,6 +105,14 @@ Runtime libraries for Swift programs %prep + +# First we handle our own CMake (sigh) +%setup -q -c -n cmake -a 16 +mkdir cmake-build +cd cmake-build +../cmake-%{cmake_version}/bootstrap && make + +# Now continue on with Swift... %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named @@ -156,12 +166,12 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger -#%patch4 -p0 +%patch4 -p0 # Python 3 is the new default so we need to make the python code work with it %patch5 -p0 %patch6 -p0 -#%patch7 -p0 - already in the sources ... patch not needed at all :) +%patch7 -p0 %patch8 -p0 # New in Clang 9 is an assertion error of an array declared with a negative size @@ -173,13 +183,11 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 %patch12 -p0 -# -# 5.2 patches -# +# Fixed STL no longer implicitly including %patch13 -p0 - -# implicit include of cstdint %patch14 -p0 + +# Implicit fallthrough warning treated as error in Clang 10 %patch15 -p0 @@ -190,6 +198,9 @@ export VERBOSE=1 mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH +# And for CMake, which we built first +export PATH=$PWD/../cmake/cmake-build/bin:$PATH + # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -234,11 +245,13 @@ ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cpp mkdir -p %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb ln -fs libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb/libIndexStore.so -cp %{_builddir}/usr/lib/liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldb.so.7.0.0svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn +cp %{_builddir}/usr/lib/liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn ln -fs liblldb.so.7svn %{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.7svn %{buildroot}/usr/lib/swift-lldb +ln -fs liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift cp %{_builddir}/usr/lib/libBlocksRuntime.so %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libdispatch.so %{buildroot}/usr/lib/swift-lldb @@ -312,20 +325,36 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a -* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a -* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a -* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a -* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a -* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a -* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a +* Tue Mar 10 2020 Ron Olson 5.1.5-0.1.20200305git30c042c +- Updated to swift-5.1.5-RELEASE and added building the 3.16 version of CMake + to work around issues with 3.17 +* Mon Feb 17 2020 Ron Olson 5.1.4-0.2.20200131git2194dc2 +- Added patch to handle warning-as-error using Clang 10 +* Fri Jan 31 2020 Ron Olson 5.1.4-0.1.20200131git2194dc2 +- Updated to swift-5.1.4-RELEASE +* Wed Jan 29 2020 Ron Olson 5.1-0.17.20200128gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-28-a +* Tue Jan 28 2020 Ron Olson 5.1-0.16.20200127gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Sat Jan 25 2020 Ron Olson 5.1-0.15.20200124gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-24-a and added patches to + handle the cstdint header not being implicitly included +* Fri Jan 24 2020 Ron Olson 5.1-0.14.20200123gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-23-a +* Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a +* Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-19-a +* Sat Jan 18 2020 Ron Olson 5.1-0.11.20200117gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Sun Jan 12 2020 Ron Olson 5.1-0.10.20200111gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-11-a +* Sat Jan 11 2020 Ron Olson 5.1-0.9.20200110gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-10-a +* Fri Jan 10 2020 Ron Olson 5.1-0.8.20200109gite45437e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Wed Jan 08 2020 Ron Olson 5.1-0.7.20200107git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-07-a * Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a * Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 diff --git a/swift.patch b/swift.patch deleted file mode 100644 index 80cc2c8..0000000 --- a/swift.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini ---- swift-orig/utils/build-presets.ini 2020-02-10 23:48:46.000000000 -0600 -+++ swift/utils/build-presets.ini 2020-02-13 20:40:30.123310629 -0600 -@@ -527,7 +527,6 @@ - release - assertions - --build-swift-stdlib-unittest-extra - - # We run the OS X tests and validation tests. - test -diff -Naur swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py ---- swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-10 23:48:46.000000000 -0600 -+++ swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-13 20:22:27.615497246 -0600 -@@ -12,7 +12,7 @@ - - from argparse import ArgumentError - --import diagnostics -+from . import diagnostics - - from .targets import StdlibDeploymentTarget - From 77c58eb5264640366d48fdba1523a34bb48a29d0 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 9 Apr 2020 20:31:51 -0500 Subject: [PATCH 050/152] Updated to Swift 5.2.1-RELEASE --- build-setup-s390x.patch | 15 - build-setup.patch | 21 +- change-lldb-location.patch | 20 -- clangloc.patch | 16 - compiler-rt-fuzzer.patch | 4 +- compiler-rt-sanitizer.patch | 11 - implicit_fallthru.patch | 112 ------- ...on-3.patch => linux-tests-python-3-2.patch | 17 +- lldb_python38_platform.patch | 21 -- llvm.patch | 20 +- python3.patch => python3-2.patch | 157 ++++------ sourcekit-loc.patch | 34 -- sourcekit.patch | 20 -- sources | 26 +- swift-lang-runtime.conf | 1 - swift-lang.conf | 1 - swift-lang.spec | 294 +++++------------- swift-unwrapped.patch | 20 -- swift.patch | 23 ++ 19 files changed, 210 insertions(+), 623 deletions(-) delete mode 100644 build-setup-s390x.patch delete mode 100644 change-lldb-location.patch delete mode 100644 clangloc.patch delete mode 100644 compiler-rt-sanitizer.patch delete mode 100644 implicit_fallthru.patch rename linux-tests-python-3.patch => linux-tests-python-3-2.patch (53%) delete mode 100644 lldb_python38_platform.patch rename python3.patch => python3-2.patch (72%) delete mode 100644 sourcekit-loc.patch delete mode 100644 sourcekit.patch delete mode 100644 swift-lang-runtime.conf delete mode 100644 swift-lang.conf delete mode 100644 swift-unwrapped.patch create mode 100644 swift.patch diff --git a/build-setup-s390x.patch b/build-setup-s390x.patch deleted file mode 100644 index c4ad610..0000000 --- a/build-setup-s390x.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2019-11-25 18:30:46.968790036 +0000 -+++ swift/utils/build-presets.ini 2019-11-25 18:31:56.158790036 +0000 -@@ -740,12 +740,10 @@ - llbuild - swiftpm - xctest --libicu - libcxx - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild diff --git a/build-setup.patch b/build-setup.patch index 65101d0..0308c3f 100644 --- a/build-setup.patch +++ b/build-setup.patch @@ -1,6 +1,6 @@ ---- swift/utils/build-presets.ini.orig 2020-03-12 16:04:54.935355266 -0500 -+++ swift/utils/build-presets.ini 2020-03-12 16:05:14.714144269 -0500 -@@ -745,7 +745,6 @@ +--- swift/utils/build-presets.ini.orig 2020-01-30 19:54:07.528043218 -0600 ++++ swift/utils/build-presets.ini 2020-01-30 19:55:11.580461138 -0600 +@@ -741,7 +741,6 @@ dash-dash @@ -8,12 +8,15 @@ install-swift install-lldb install-llbuild -@@ -762,7 +761,7 @@ - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out +@@ -755,11 +754,6 @@ + build-swift-static-sdk-overlay + build-swift-stdlib-unittest-extra +-# Executes the lit tests for the installable package that is created +-# Assumes the swift-integration-tests repo is checked out +- -test-installable-package -+#test-installable-package +- + # Build the benchmarks against the toolchain. + toolchain-benchmarks - # Path to the root of the installation filesystem. - install-destdir=%(install_destdir)s diff --git a/change-lldb-location.patch b/change-lldb-location.patch deleted file mode 100644 index 3d324e7..0000000 --- a/change-lldb-location.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/clangloc.patch b/clangloc.patch deleted file mode 100644 index c7012a4..0000000 --- a/clangloc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp.orig 2019-06-25 14:34:32.837621023 -0500 -+++ lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp 2019-06-26 16:03:32.304254695 -0500 -@@ -54,11 +54,11 @@ - static const llvm::StringRef kResourceDirSuffixes[] = { - // LLVM.org's build of LLDB uses the clang resource directory placed - // in $install_dir/lib{,64}/clang/$clang_version. -- "lib" CLANG_LIBDIR_SUFFIX "/clang/" CLANG_VERSION_STRING, -+ "/swift" "/clang/" CLANG_VERSION_STRING, - // swift-lldb uses the clang resource directory copied from swift, which - // by default is placed in $install_dir/lib{,64}/lldb/clang. LLDB places - // it there, so we use LLDB_LIBDIR_SUFFIX. -- "lib" LLDB_LIBDIR_SUFFIX "/lldb/clang", -+ "/swift" "/clang", - }; - - for (const auto &Suffix : kResourceDirSuffixes) { diff --git a/compiler-rt-fuzzer.patch b/compiler-rt-fuzzer.patch index b0e779a..19575b7 100644 --- a/compiler-rt-fuzzer.patch +++ b/compiler-rt-fuzzer.patch @@ -1,5 +1,5 @@ ---- compiler-rt/lib/fuzzer/FuzzerDriver.cpp.orig 2019-02-13 14:24:24.239239031 -0600 -+++ compiler-rt/lib/fuzzer/FuzzerDriver.cpp 2019-02-13 14:28:18.525530281 -0600 +--- llvm-project/compiler-rt/lib/fuzzer/FuzzerDriver.cpp.orig 2019-02-13 14:24:24.239239031 -0600 ++++ llvm-project/compiler-rt/lib/fuzzer/FuzzerDriver.cpp 2019-02-13 14:28:18.525530281 -0600 @@ -248,13 +248,16 @@ Command Cmd(Args); Cmd.removeFlag("jobs"); diff --git a/compiler-rt-sanitizer.patch b/compiler-rt-sanitizer.patch deleted file mode 100644 index bf8df64..0000000 --- a/compiler-rt-sanitizer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2019-10-30 12:10:54.591060832 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-10-30 12:11:56.483063580 -0500 -@@ -1131,7 +1131,7 @@ - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); - #if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) - /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ --CHECK_SIZE_AND_OFFSET(ipc_perm, mode); -+/* CHECK_SIZE_AND_OFFSET(ipc_perm, mode); */ /* Error with clang 9.0.0 */ - #endif - - CHECK_TYPE_SIZE(shmid_ds); diff --git a/implicit_fallthru.patch b/implicit_fallthru.patch deleted file mode 100644 index abcec31..0000000 --- a/implicit_fallthru.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -Naur swift-corelibs-libdispatch-orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c ---- swift-corelibs-libdispatch-orig/src/event/event_epoll.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/event/event_epoll.c 2020-03-11 16:06:21.182865901 -0500 -@@ -174,6 +174,9 @@ - } - case EVFILT_WRITE: - filter = EVFILT_READ; -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case EVFILT_READ: - if (fstat(fd, &sb) < 0) { - return NULL; -diff -Naur swift-corelibs-libdispatch-orig/src/io.c swift-corelibs-libdispatch/src/io.c ---- swift-corelibs-libdispatch-orig/src/io.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/io.c 2020-03-11 16:08:45.344481709 -0500 -@@ -2086,11 +2086,17 @@ - case DISPATCH_OP_DELIVER: - flags = DOP_DEFAULT; - // Fall through -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_OP_DELIVER_AND_COMPLETE: - flags = (flags != DOP_DEFAULT) ? DOP_DELIVER | DOP_NO_EMPTY : - DOP_DEFAULT; - _dispatch_operation_deliver_data(op, flags); - // Fall through -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_OP_COMPLETE: - if (flags != DOP_DEFAULT) { - _dispatch_stream_complete_operation(stream, op); -@@ -2103,6 +2109,9 @@ - case DISPATCH_OP_COMPLETE_RESUME: - _dispatch_stream_complete_operation(stream, op); - // Fall through -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_OP_RESUME: - if (_dispatch_stream_operation_avail(stream)) { - stream->source_running = true; -diff -Naur swift-corelibs-libdispatch-orig/src/semaphore.c swift-corelibs-libdispatch/src/semaphore.c ---- swift-corelibs-libdispatch-orig/src/semaphore.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/semaphore.c 2020-03-11 16:10:04.319558171 -0500 -@@ -118,6 +118,9 @@ - } - // Fall through and try to undo what the fast path did to - // dsema->dsema_value -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_TIME_NOW: - orig = dsema->dsema_value; - while (orig < 0) { -@@ -128,6 +131,9 @@ - } - // Another thread called semaphore_signal(). - // Fall through and drain the wakeup. -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_TIME_FOREVER: - _dispatch_sema4_wait(&dsema->dsema_sema); - break; -diff -Naur swift-corelibs-libdispatch-orig/src/shims/lock.c swift-corelibs-libdispatch/src/shims/lock.c ---- swift-corelibs-libdispatch-orig/src/shims/lock.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/shims/lock.c 2020-03-11 16:10:55.045534383 -0500 -@@ -428,8 +428,17 @@ - continue; - } - /* FALLTHROUGH */ -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case ETIMEDOUT: -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case EFAULT: -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case EWOULDBLOCK: - return errno; - default: -diff -Naur swift-corelibs-libdispatch-orig/src/transform.c swift-corelibs-libdispatch/src/transform.c ---- swift-corelibs-libdispatch-orig/src/transform.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/transform.c 2020-03-11 16:11:47.034560632 -0500 -@@ -781,11 +781,20 @@ - case 1: - *ptr++ = '='; // c - *ptr++ = '='; // d -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case 2: - *ptr++ = '='; // e -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case 3: - *ptr++ = '='; // f - *ptr++ = '='; // g -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case 4: - *ptr++ = '='; // h - break; diff --git a/linux-tests-python-3.patch b/linux-tests-python-3-2.patch similarity index 53% rename from linux-tests-python-3.patch rename to linux-tests-python-3-2.patch index e64c644..45a1bb6 100644 --- a/linux-tests-python-3.patch +++ b/linux-tests-python-3-2.patch @@ -1,5 +1,6 @@ ---- swift-integration-tests/test-snapshot-binaries/linux_load_commands.py.orig 2019-07-22 18:29:09.865242157 -0500 -+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2019-07-22 18:29:36.655204752 -0500 +diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py +--- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py 2019-10-07 17:57:28.000000000 -0500 ++++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2020-01-29 14:05:33.991180706 -0600 @@ -85,12 +85,12 @@ numberOfLinesSeen = 0 @@ -33,3 +34,15 @@ sys.exit(0) if __name__ == "__main__": +diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py +--- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py 2019-10-07 17:57:28.000000000 -0500 ++++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py 2020-01-29 18:35:26.953725332 -0600 +@@ -136,7 +136,7 @@ + + skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync'] + p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE) +- out, _ = p.communicate(lsp.script) ++ out, _ = p.communicate(lsp.script.encode()) + print(out) + print('') + diff --git a/lldb_python38_platform.patch b/lldb_python38_platform.patch deleted file mode 100644 index 3408269..0000000 --- a/lldb_python38_platform.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lldb/scripts/Python/finishSwigPythonLLDB.py.orig 2019-09-09 10:19:48.545053827 -0500 -+++ lldb/scripts/Python/finishSwigPythonLLDB.py 2019-09-09 10:28:59.121109016 -0500 -@@ -673,8 +673,16 @@ - - from distutils.sysconfig import get_python_lib - if platform.system() == 'Linux': -- if platform.linux_distribution()[0] == 'Fedora': -- dbg.dump_text("Platform is Fedora Linux") -+ linux_distro = '' -+ # platform.linux_distribution() is not available in -+ # Python >= 3.8 -+ if sys.version_info[0] >= 3 and sys.version_info[1] >= 8: -+ from distro import linux_distribution -+ linux_distro = linux_distribution()[0] -+ else: -+ linux_distro = platform.linux_distribution()[0] -+ if linux_distro == 'Fedora' or linux_distro == 'Red Hat Enterprise Linux' or linux_distro == 'CentOS Linux': -+ dbg.dump_text("Platform is Fedora Linux or Red Hat Enterprise Linux or CentOS Linux") - # On Fedora the installation gets split into lib and lib64, - # which prevents building lldb from completing successfully. - return get_python_lib(False, False, vstrPythonInstallDir) diff --git a/llvm.patch b/llvm.patch index 406e33c..b9f70d5 100644 --- a/llvm.patch +++ b/llvm.patch @@ -1,19 +1,11 @@ -diff -Naur llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h ---- llvm-project-orig/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2019-12-12 22:11:12.000000000 -0600 -+++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-23 11:01:29.173281217 -0600 -@@ -4,6 +4,8 @@ - #include "llvm/Demangle/Compiler.h" +--- llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h.orig 2020-01-29 10:02:44.222689214 -0600 ++++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-29 10:03:02.007354450 -0600 +@@ -16,6 +16,8 @@ + #include "llvm/Demangle/DemangleConfig.h" #include "llvm/Demangle/StringView.h" #include +#include +#include - class OutputStream; - -@@ -599,4 +601,4 @@ - } // namespace ms_demangle - } // namespace llvm - --#endif -\ No newline at end of file -+#endif + namespace llvm { + namespace itanium_demangle { diff --git a/python3.patch b/python3-2.patch similarity index 72% rename from python3.patch rename to python3-2.patch index a65c0f4..1feab4f 100644 --- a/python3.patch +++ b/python3-2.patch @@ -1,46 +1,14 @@ -diff -Naur swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb swift/stdlib/public/core/FloatingPointTypes.swift.gyb ---- swift-orig/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/FloatingPointTypes.swift.gyb 2019-07-22 11:22:17.049551459 -0500 -@@ -13,8 +13,8 @@ - import SwiftShims - - %{ --from SwiftIntTypes import all_integer_types --from SwiftFloatingPointTypes import all_floating_point_types -+import SwiftIntTypes -+import SwiftFloatingPointTypes - - # - # Utility code for later in this template -@@ -27,7 +27,7 @@ - builtinIntLiteralBits = 2048 - }% - --% for self_type in all_floating_point_types(): -+% for self_type in SwiftFloatingPointTypes.all_floating_point_types(): - %{ - Self = self_type.stdlib_name - bits = self_type.bits -@@ -1650,7 +1650,7 @@ - } - } - --% for src_type in all_floating_point_types(): -+% for src_type in SwiftFloatingPointTypes.all_floating_point_types(): - % srcBits = src_type.bits - % That = src_type.stdlib_name - diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb ---- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2019-07-22 15:30:40.491317722 -0500 +--- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-29 13:23:24.851180231 -0600 @@ -14,10 +14,9 @@ # Utility code for later in this template # -from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init -from SwiftFloatingPointTypes import getFtoIBounds -+import SwiftIntTypes -+import SwiftFloatingPointTypes ++import SwiftIntTypes ++import SwiftFloatingPointTypes -from string import maketrans, capitalize from itertools import chain @@ -63,8 +31,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub +% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) % if FloatType == 'Float80': - #if !os(Windows) && (arch(i386) || arch(x86_64)) -@@ -1651,7 +1650,7 @@ + #if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64)) +@@ -1648,7 +1647,7 @@ return Hasher._hash( seed: seed, bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), @@ -74,8 +42,8 @@ diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/pub } } diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb ---- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/Mirrors.swift.gyb 2019-07-23 09:20:38.269152361 -0500 +--- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/Mirrors.swift.gyb 2020-01-29 13:27:07.425509032 -0600 @@ -12,7 +12,7 @@ %{ @@ -95,14 +63,14 @@ diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/c if self_ty.is_signed: Types.append( (Self, '.int', 'Int64(self)') ) diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb ---- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2019-07-22 15:30:52.516752476 -0500 +--- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-29 13:30:52.170919077 -0600 @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// %{ -from SwiftIntTypes import all_integer_types -+import SwiftIntTypes ++import SwiftIntTypes word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 storagescalarCounts = [2,4,8,16,32,64] vectorscalarCounts = storagescalarCounts + [3] @@ -165,10 +133,10 @@ diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/ @frozen @_alignment(${bytes if bytes <= 16 else 16}) diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb ---- swift-orig/stdlib/public/core/Tuple.swift.gyb 2019-07-14 15:16:38.000000000 -0500 -+++ swift/stdlib/public/core/Tuple.swift.gyb 2019-07-17 20:54:45.400558556 -0500 +--- swift-orig/stdlib/public/core/Tuple.swift.gyb 2020-01-24 01:22:05.000000000 -0600 ++++ swift/stdlib/public/core/Tuple.swift.gyb 2020-01-29 13:32:22.287291260 -0600 @@ -111,7 +111,7 @@ - % equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams]) + % equatableTypeParams = ", ".join(["{}: Equatable".format(c) for c in typeParams]) % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) -% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) @@ -177,8 +145,8 @@ diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/cor /// Returns a Boolean value indicating whether the corresponding components of /// two tuples are equal. diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py ---- swift-orig/utils/gyb_sourcekit_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_sourcekit_support/__init__.py 2019-07-18 14:19:45.668770778 -0500 +--- swift-orig/utils/gyb_sourcekit_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_sourcekit_support/__init__.py 2020-01-29 13:33:22.111521781 -0600 @@ -14,9 +14,9 @@ # utils/gyb_sourcekit_support/ directory as a module. # @@ -193,8 +161,8 @@ diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_so def check_uid_duplication(): diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py ---- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/AttributeNodes.py 2019-07-18 12:34:20.708714660 -0500 +--- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/AttributeNodes.py 2020-01-29 13:34:03.265044624 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -204,8 +172,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb ATTRIBUTE_NODES = [ # token-list -> token? token-list? diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py ---- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2019-07-18 12:34:20.711714774 -0500 +--- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-29 13:34:33.458161889 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -215,8 +183,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/ AVAILABILITY_NODES = [ # availability-spec-list -> availability-entry availability-spec-list? diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py ---- swift-orig/utils/gyb_syntax_support/Child.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Child.py 2019-07-18 12:34:20.712714811 -0500 +--- swift-orig/utils/gyb_syntax_support/Child.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Child.py 2020-01-29 13:35:02.044219688 -0600 @@ -1,7 +1,7 @@ # flake8: noqa I201 -from Classification import classification_by_name @@ -229,8 +197,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_s class Child(object): diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py ---- swift-orig/utils/gyb_syntax_support/Classification.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Classification.py 2019-07-18 12:34:20.713714849 -0500 +--- swift-orig/utils/gyb_syntax_support/Classification.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Classification.py 2020-01-29 13:46:45.334244147 -0600 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -240,8 +208,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb class SyntaxClassification(object): diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py ---- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/CommonNodes.py 2019-07-18 12:34:20.714714887 -0500 +--- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/CommonNodes.py 2020-01-29 13:47:02.390875308 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -251,8 +219,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_sy COMMON_NODES = [ Node('Decl', kind='Syntax'), diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py ---- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/DeclNodes.py 2019-07-18 12:34:20.716714963 -0500 +--- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/DeclNodes.py 2020-01-29 13:47:30.486914972 -0600 @@ -1,6 +1,6 @@ # flake8: noqa I201 -from Child import Child @@ -263,8 +231,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_synt DECL_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py ---- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/ExprNodes.py 2019-07-18 12:34:20.717715000 -0500 +--- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/ExprNodes.py 2020-01-29 13:47:47.095529555 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -274,8 +242,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_synt EXPR_NODES = [ # An inout expression. diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py ---- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/GenericNodes.py 2019-07-18 12:34:20.718715038 -0500 +--- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/GenericNodes.py 2020-01-29 13:48:04.737182368 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -285,9 +253,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_s GENERIC_NODES = [ # generic-where-clause -> 'where' requirement-list diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py ---- swift-orig/utils/gyb_syntax_support/__init__.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/__init__.py 2019-07-18 12:34:33.973215999 -0500 -@@ -1,19 +1,19 @@ +--- swift-orig/utils/gyb_syntax_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/__init__.py 2020-01-29 13:52:03.762062110 -0600 +@@ -1,22 +1,22 @@ import textwrap -from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 -from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 @@ -296,43 +264,48 @@ diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_synta -from DeclNodes import DECL_NODES # noqa: I201 -from ExprNodes import EXPR_NODES # noqa: I201 -from GenericNodes import GENERIC_NODES # noqa: I201 --from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 +from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 -+from . import Classification # noqa: I201 ++from . import Classification # noqa: I201 +from .CommonNodes import COMMON_NODES # noqa: I201 +from .DeclNodes import DECL_NODES # noqa: I201 +from .ExprNodes import EXPR_NODES # noqa: I201 +from .GenericNodes import GENERIC_NODES # noqa: I201 + +-from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ +from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ get_serialization_code, \ verify_syntax_node_serialization_codes -from PatternNodes import PATTERN_NODES # noqa: I201 -from StmtNodes import STMT_NODES # noqa: I201 --import Token --from TypeNodes import TYPE_NODES # noqa: I201 +from .PatternNodes import PATTERN_NODES # noqa: I201 +from .StmtNodes import STMT_NODES # noqa: I201 + +-import Token +-from Trivia import TRIVIAS # noqa: I201 +-from TypeNodes import TYPE_NODES # noqa: I201 +from . import Token ++from .Trivia import TRIVIAS # noqa: I201 +from .TypeNodes import TYPE_NODES # noqa: I201 # Re-export global constants diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py ---- swift-orig/utils/gyb_syntax_support/Node.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Node.py 2019-07-18 12:34:20.722715189 -0500 -@@ -1,6 +1,6 @@ +--- swift-orig/utils/gyb_syntax_support/Node.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Node.py 2020-01-29 13:52:32.755139868 -0600 +@@ -1,7 +1,7 @@ from __future__ import print_function import sys # noqa: I201 + -from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word +from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word def error(msg): diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py ---- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2019-07-18 12:34:20.723715227 -0500 +--- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-29 13:52:58.148083796 -0600 @@ -1,4 +1,4 @@ -from Node import error +from .Node import error @@ -340,8 +313,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/u SYNTAX_NODE_SERIALIZATION_CODES = { diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py ---- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/PatternNodes.py 2019-07-18 12:34:20.724715265 -0500 +--- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/PatternNodes.py 2020-01-29 13:53:38.452582038 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -351,8 +324,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_s PATTERN_NODES = [ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py ---- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/StmtNodes.py 2019-07-18 12:34:20.726715341 -0500 +--- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/StmtNodes.py 2020-01-29 13:53:55.056199243 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -362,8 +335,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_synt STMT_NODES = [ # continue-stmt -> 'continue' label? ';'? diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py ---- swift-orig/utils/gyb_syntax_support/Token.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Token.py 2019-07-18 12:34:20.727715378 -0500 +--- swift-orig/utils/gyb_syntax_support/Token.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Token.py 2020-01-29 13:54:12.720855888 -0600 @@ -1,6 +1,6 @@ -from Classification import classification_by_name -from Node import error # noqa: I201 @@ -375,8 +348,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_s class Token(object): diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py ---- swift-orig/utils/gyb_syntax_support/Trivia.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/Trivia.py 2019-07-18 14:22:04.074001913 -0500 +--- swift-orig/utils/gyb_syntax_support/Trivia.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/Trivia.py 2020-01-29 13:54:41.647931191 -0600 @@ -1,5 +1,5 @@ -from Node import error -from kinds import lowercase_first_word # noqa: I201 @@ -386,8 +359,8 @@ diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_ class Trivia(object): diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py ---- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/gyb_syntax_support/TypeNodes.py 2019-07-18 12:34:20.731715529 -0500 +--- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/gyb_syntax_support/TypeNodes.py 2020-01-29 13:55:07.952909024 -0600 @@ -1,5 +1,5 @@ -from Child import Child -from Node import Node # noqa: I201 @@ -397,9 +370,9 @@ diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_synt TYPE_NODES = [ # simple-type-identifier -> identifier generic-argument-clause? diff -Naur swift-orig/utils/line-directive swift/utils/line-directive ---- swift-orig/utils/line-directive 2019-07-14 15:16:38.000000000 -0500 -+++ swift/utils/line-directive 2019-07-19 09:01:35.602482603 -0500 -@@ -60,7 +60,7 @@ +--- swift-orig/utils/line-directive 2020-01-24 01:22:05.000000000 -0600 ++++ swift/utils/line-directive 2020-01-29 13:57:12.829551057 -0600 +@@ -61,7 +61,7 @@ def _make_line_map(target_filename, stream=None): """ @@ -408,7 +381,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> _make_line_map('box', ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) ... line 2 -@@ -94,7 +94,7 @@ +@@ -95,7 +95,7 @@ def map_line_to_source_file(target_filename, target_line_num): """ @@ -417,7 +390,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -144,7 +144,7 @@ +@@ -145,7 +145,7 @@ def map_line_from_source_file(source_filename, source_line_num, target_filename): """ @@ -426,7 +399,7 @@ diff -Naur swift-orig/utils/line-directive swift/utils/line-directive >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open >>> # the file for a second time if delete=True. Therefore, we have to >>> # manually handle closing and deleting this file to allow us to open -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ def run(): """Simulate a couple of gyb-generated files diff --git a/sourcekit-loc.patch b/sourcekit-loc.patch deleted file mode 100644 index 06bf428..0000000 --- a/sourcekit-loc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- sourcekit-lsp/Sources/SKCore/Toolchain.swift.orig 2019-12-07 13:28:15.316371656 -0600 -+++ sourcekit-lsp/Sources/SKCore/Toolchain.swift 2019-12-07 19:25:39.784513174 -0600 -@@ -127,12 +127,12 @@ - - var foundAny = false - -- let clangPath = binPath.appending(component: "clang") -+ let clangPath = AbsolutePath("/usr/libexec/swift-lldb/clang") - if fs.isExecutableFile(clangPath) { - self.clang = clangPath - foundAny = true - } -- let clangdPath = binPath.appending(component: "clangd") -+ let clangdPath = AbsolutePath("/usr/libexec/swift-lldb/clangd") - if fs.isExecutableFile(clangdPath) { - self.clangd = clangdPath - foundAny = true -@@ -152,14 +152,14 @@ - self.sourcekitd = sourcekitdPath - foundAny = true - } else { -- let sourcekitdPath = libPath.appending(component: "libsourcekitdInProc.\(dylibExt)") -+ let sourcekitdPath = AbsolutePath("/usr/lib/swift-lldb/libsourcekitdInProc.so") - if fs.isFile(sourcekitdPath) { - self.sourcekitd = sourcekitdPath - foundAny = true - } - } - -- let libIndexStore = libPath.appending(components: "libIndexStore.\(dylibExt)") -+ let libIndexStore = AbsolutePath("/usr/lib/swift-lldb/libIndexStore.so") - if fs.isFile(libIndexStore) { - self.libIndexStore = libIndexStore - foundAny = true diff --git a/sourcekit.patch b/sourcekit.patch deleted file mode 100644 index 96896f4..0000000 --- a/sourcekit.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sourcekit-lsp/Utilities/build-script-helper.py.orig 2019-10-29 09:41:43.052157614 -0500 -+++ sourcekit-lsp/Utilities/build-script-helper.py 2019-10-30 21:23:18.538560646 -0500 -@@ -15,7 +15,7 @@ - subprocess.check_call(cmd, env=env) - - def swiftpm_bin_path(swift_exec, swiftpm_args, env=None): -- swiftpm_args = filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args) -+ swiftpm_args = list(filter(lambda arg: arg != '-v' and arg != '--verbose', swiftpm_args)) - cmd = [swift_exec, 'build', '--show-bin-path'] + swiftpm_args - print(' '.join(cmd)) - return subprocess.check_output(cmd, env=env).strip() -@@ -56,7 +56,7 @@ - install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain) - - def install_binary(exe, source_dir, install_dir, toolchain): -- cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir] -+ cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir] - print(' '.join(cmd)) - subprocess.check_call(cmd) - diff --git a/sources b/sources index 9c8d30a..3291aa9 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 279c96a0de7700c46d58482f500247445238bd3266f81dccef5ad785756cb82667f41dcf1f207a5e69064f8d4514011ca0eb5ba98565e120bba591a4e144d31b -SHA512 (corelibs-foundation.tar.gz) = 1801a624c19585bff8aebe3362ecc5d6f638331303e24ce592dc28418bf667a0e20dcd525e3ff1840258c9cc67c9254d5478436c18da24f7e5c60411fece149f -SHA512 (corelibs-libdispatch.tar.gz) = fab701b5e4b32b03decea1df4561b2ae65afbf7cd82d64768e77aa4907a179374fab4f5a4f81bda6bb490087eabdd2113988ec44424b14744ee0de2c94b96318 -SHA512 (corelibs-xctest.tar.gz) = 857fef0f6e681e563625a5f8f01072b5cd4c89af81ac7c919a5552b2a6f692fa06314d5d93289c6521273bfbbcfb1b619a1c79dffbb24f5a291e16d63cf3b0d9 -SHA512 (indexstore-db.tar.gz) = 7a260272ed309517b4c0878dcfb91db7826651934658632248e9719fe46811b8346b3c57c045f63cbedd15c5c0f5f829464c94f6d7c165b70ed0f418e4150e4a -SHA512 (llbuild.tar.gz) = 5f88dae0f1e76d7c27012b3237f4b7009a5da669dfc2569dc1bac8f9152279f6d2a5b9bf54ec5f844d64c841c0ab4c408835e3de8915f144ddacdcff2afa0575 -SHA512 (llvm-project.tar.gz) = ba88f86a57b6390e8a900620b0453dd61ca9c896cd2067e9415627087220b39a067801586e3e4fc0cfef21dca76e31c130ef9df05a2ddf0ada855fb79f66d228 -SHA512 (package-manager.tar.gz) = 1536f097960b3626060a3d07701d8dddb515862fa805285f9501a5cf3210b77276dac82525f9dc473532b97dd8e2e5287dec72ea4e6129b2cdc7f874d95915fe +SHA512 (cmark.tar.gz) = c1c31dadebb7e97ffbcf451e2964ab8593ab9048713b4aa102b87720a3f72b2b2bc7eedf4988cd7194dff930bfb27a0a3b34b4f5fd81e2d5d6f6cbd727d43282 +SHA512 (corelibs-foundation.tar.gz) = fca965045dcdb68c3038ddfab658cf2c26d84bcda8d29607538e583854858cf8b42c1bf55c2ca5d1d242c29666e23b0dba1f92da219b468112740681f26f0298 +SHA512 (corelibs-libdispatch.tar.gz) = 6180ee085e667e4990c1b93ec506eb623c871f95e3eca38e5545c84ff258a22f2deaa9b86e640ba668ad5a0f56e36ec06b06ea5f23f060b6c25b6e0fd929a03d +SHA512 (corelibs-xctest.tar.gz) = 840b56e7fa983af8207730590aeaf326c6264ffa1dff5366745498f6525bd9293e714dba96709b57a76fb52b094235d23f8eb46823c4ed97e7fb5e01120ede56 +SHA512 (indexstore-db.tar.gz) = 9c2a2e506e31d1531a45cd5c83e12510e1c48df0617360d6d721ae12c1c24a23ce4313d186766ee376ab4b8976521b9deb0a5adbefdc7f4e9cf9b57b68b2ac55 +SHA512 (llbuild.tar.gz) = 866526aa8c2a7b831b26aac067266cf579850508f3650a67042c84066283bcc6b8b8ad8021a0c1a1376f89a5407de5a3dccb264215a26afd91e19b35dbd4fd57 +SHA512 (llvm-project.tar.gz) = 137d004affab5239eaf89d06cd3b45fabe33ba0f7f930926204e15042e19f3ba9a77a394f71208521a7a6bced68f7ae1553bdff70676adfa81f5a0946d7eb2ca +SHA512 (package-manager.tar.gz) = 9bef9631ace2f09e7de40864316bb2440d0becc04ef7f5a03c58cb3f4189f60aedb72d870d84926b76fcfea9c3b53ae230ef2415138c07e5ae1f1bfe988a0f76 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 9a1abe05795641519f68d58056933d3dd035cf6287652f08f29e632dd5c25966d7f92e64360715bd1f32ac29a7dd6137b0620b0e168dd33768b464b8baa08493 -SHA512 (swift-integration-tests.tar.gz) = 3e581c1d77d8eff71a8c51865cc425e6b6c28cd9c182f9f156d8d908b32c0f76163eac524f7c549c112cc068f945d15edd0be6d4f4b6899026272f03de96c887 -SHA512 (swift-syntax.tar.gz) = 05ee1e89aeb2db56e01cabb29bc6f53da29b9feb669ec0563f4ee9561afb61e40a5d2a24f121601b8afc7a9082864eec73d3fb72f00a570c000693d7db31e9ca -SHA512 (swift-xcode-playground-support.tar.gz) = ff5eb6c97ab7a1d0fabc08c01aebc876abbbc4a79fc437f8286deae7b9c248bd702fbb60217c1b53d5eecb18b096c68662e154d94c105400d6acc2ad72c176e6 -SHA512 (swift.tar.gz) = a5976a8edf2495168f0ba7c090af69ef0ef754ccfdf785a28b32c976eb4bc9e94d0c1022000ec50131b37b58ea8993aae8f095abf0d6b4028ea9fcabfd2e845a +SHA512 (sourcekit-lsp.tar.gz) = 8cc17cac6156f706d1e7a4daa0d8da4c10ddec36d268c94ec6ba82d9a6a1ba610308276dfb679cc1737ff684e634cf406e1b8636e50b2de96e12ee1a20a35bad +SHA512 (swift-integration-tests.tar.gz) = 1b641b0eb2ed219609716f689ec97d1982ac7b92b06ecc3b58cf5b4b703aa569387d9d2c035a6d09f2c6c17f8a897e0f6a711eac05d9f0c1071d9c8db46e248f +SHA512 (swift-syntax.tar.gz) = 937105f4f5483d6f049ad630192ab7dc9d3b01275d5fff9791b5994729b29edbface365335f5d2ec9aa7186bb728e3ec600015649b80e28ba02b114809c13913 +SHA512 (swift-xcode-playground-support.tar.gz) = acaeee1c578281f145a0a0e3abba2415e83de4628534aeae88f1d29c63fe71da59474cb427436cefa4664b75a2bd18aac868dcc7c62625749a94a1c0c1040a09 +SHA512 (swift.tar.gz) = fbf69731423f0e0c871d09c079dda4652114bc26b46fa31393c157c2c05568e7f972bdc951fd0f159745d3313bef5644a6eadf56a2403be41cb0d87dbeacb961 diff --git a/swift-lang-runtime.conf b/swift-lang-runtime.conf deleted file mode 100644 index d19930a..0000000 --- a/swift-lang-runtime.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/swift/linux diff --git a/swift-lang.conf b/swift-lang.conf deleted file mode 100644 index ce1b5b2..0000000 --- a/swift-lang.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/swift-lldb diff --git a/swift-lang.spec b/swift-lang.spec index 5806d43..aad418a 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,17 +1,16 @@ %global debug_package %{nil} -%global swifttag 5.1.5-RELEASE +%global swifttag 5.2.1-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.1.5-RELEASE -%global swiftgithash 30c042c -%global swiftgitdate 20200305 +%global swiftsyntax 5.2.1-RELEASE +%global swiftgithash 2e3b1b3 +%global swiftgitdate 20200331 %global swiftbuild swift-source -%global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* %global cmake_version 3.16.5 Name: swift-lang -Version: 5.1.5 -Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -29,26 +28,16 @@ Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.g Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz -Source14: swift-lang.conf -Source15: swift-lang-runtime.conf -Source16: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz +Source16: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz -Patch0: change-lldb-location.patch -Patch1: build-setup.patch -Patch2: clangloc.patch -Patch3: compiler-rt-fuzzer.patch -Patch4: swift-unwrapped.patch -Patch5: python3.patch -Patch6: linux-tests-python-3.patch -Patch7: lldb_python38_platform.patch -Patch8: sourcekit.patch -Patch9: compiler-rt-sanitizer.patch -Patch10: build-setup-s390x.patch -Patch11: sourcekit-loc.patch -Patch12: glibcpthread.patch -Patch13: llvm.patch -Patch14: indexstore.patch -Patch15: implicit_fallthru.patch +Patch0: build-setup.patch +Patch1: compiler-rt-fuzzer.patch +Patch2: python3-2.patch +Patch3: linux-tests-python-3-2.patch +Patch4: glibcpthread.patch +Patch5: swift.patch +Patch6: llvm.patch +Patch7: indexstore.patch BuildRequires: clang BuildRequires: swig @@ -70,14 +59,17 @@ BuildRequires: libicu-devel BuildRequires: ninja-build BuildRequires: make BuildRequires: openssl-devel +BuildRequires: /usr/bin/pathfix.py Requires: glibc-devel -Requires: clang +Requires: binutils-gold +Requires: gcc Requires: ncurses-devel Requires: ncurses-compat-libs -Requires: %{name}-runtime = %{version}-%{release} Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Obsoletes: %{name}-runtime < %{version}-%{release} ExclusiveArch: x86_64 aarch64 @@ -94,27 +86,16 @@ importantly, Swift is designed to make writing and maintaining correct programs easier for the developer. -%package runtime -Summary: Runtime files for Swift programs - -Provides: %{name}-runtime = %{version}-%{release} - - -%description runtime -Runtime libraries for Swift programs - - %prep -# First we handle our own CMake (sigh) +# Now we handle our own CMake (sigh) %setup -q -c -n cmake -a 16 mkdir cmake-build cd cmake-build ../cmake-%{cmake_version}/bootstrap && make -# Now continue on with Swift... -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -128,68 +109,39 @@ mv swift-package-manager-swift-%{swifttag} swiftpm mv swift-swift-%{swifttag} swift mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp - mv indexstore-db-swift-%{swifttag} indexstore-db mv llvm-project-swift-%{swifttag} llvm-project -# Apple did some reorganization of the various components and what -# used to be separate subprojects are now symlinks into llvm-project -ln -s llvm-project/llvm llvm -ln -s llvm-project/lldb lldb -ln -s llvm-project/libcxx libcxx -ln -s llvm-project/compiler-rt compiler-rt -ln -s llvm-project/clang-tools-extra clang-tools-extra -ln -s llvm-project/clang clang + # ICU mv icu-release-61-2 icu # Swift Syntax on its own release (sigh) mv swift-syntax-swift-%{swiftsyntax} swift-syntax -# This patch tells the Swift executable to look for its Swift-specific -# lldb executable in /usr/libexec/swift-lldb, not in the same directory -# as the swift executable (i.e. /usr/bin). +# Since we require ninja for building, there's no sense to rebuild it just for Swift %patch0 -p0 -# Since we require ninja for building, there's no sense to rebuild it just for Swift -%ifnarch s390x -%patch1 -p0 -%else -# Don't build ICU on s390x -%patch10 -p0 -%endif - -# This changes the location of where the headers and libs are to keep lldb happy -%patch2 -p0 - # Fixes an issue with using std::thread in a vector in compiler-rt -%patch3 -p0 +%patch1 -p0 -# Patch for handling optional issue with pthreads functions in Swift file -# in the package mananger -%patch4 -p0 - # Python 3 is the new default so we need to make the python code work with it -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 -%patch8 -p0 - -# New in Clang 9 is an assertion error of an array declared with a negative size -%patch9 -p0 - -# Changes locations where sourcekit-lsp looks for things -%patch11 -p0 +%patch2 -p0 +%patch3 -p0 # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 -%patch12 -p0 +%patch4 -p0 -# Fixed STL no longer implicitly including -%patch13 -p0 -%patch14 -p0 +# +# 5.2 patches +# +%patch5 -p0 -# Implicit fallthrough warning treated as error in Clang 10 -%patch15 -p0 +# implicit include of cstdint +%patch6 -p0 +%patch7 -p0 +# Fix python to python3 +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py %build export VERBOSE=1 @@ -206,118 +158,23 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil %install -mkdir -p %{buildroot}%{_libexecdir}/swift-lldb +mkdir -p %{buildroot}%{_libexecdir}/swift/ +cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}/usr/lib -install -m 0755 %{_builddir}/usr/bin/swift %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-build %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-build-tool %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-demangle %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-package %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-run %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-test %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/swift-api-digester %{buildroot}%{_bindir} -install -m 0644 %{_builddir}/usr/bin/swift-api-checker.py %{buildroot}%{_bindir} -ln -fs swift %{buildroot}/usr/bin/swift-autolink-extract -ln -fs swift %{buildroot}/usr/bin/swiftc -ln -fs swift %{buildroot}/usr/bin/swift-format - -install -m 0755 %{_builddir}/usr/bin/sourcekit-lsp %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/usr/bin/plutil %{buildroot}%{_bindir} - -install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb -install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb -install -m 0755 %{_builddir}/usr/bin/clangd %{buildroot}%{_libexecdir}/swift-lldb -install -m 0755 %{_builddir}/usr/bin/clang-7 %{buildroot}%{_libexecdir}/swift-lldb -# This is not a "real" clang, but an ersatz Swift version - placed here so it -# doesn't get in the way of the real one -ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang -ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang++ -ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cl -ln -fs clang-7 %{buildroot}%{_libexecdir}/swift-lldb/clang-cpp - -# Why /usr/lib instead of %{_libdir}? -# The Swift toolchain is *extermely* sensitive to locations of its files -# (for example, the need for the patch above in the prep section) and -# has "lib" hardcoded in many, many places throughout all the projects that -# 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/libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb -ln -fs libIndexStore.so.7svn %{buildroot}/usr/lib/swift-lldb/libIndexStore.so -cp %{_builddir}/usr/lib/liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldb.so.992.8.1svn %{buildroot}/usr/lib/swift-lldb/liblldb.so.7svn -ln -fs liblldb.so.7svn %{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.7svn %{buildroot}/usr/lib/swift-lldb -ln -fs liblldbIntelFeatures.so.7svn %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so -ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift -cp %{_builddir}/usr/lib/libBlocksRuntime.so %{buildroot}/usr/lib/swift-lldb -cp %{_builddir}/usr/lib/libdispatch.so %{buildroot}/usr/lib/swift-lldb - -mkdir -p %{buildroot}/usr/lib/swift -cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/usr/lib/swift -rm %{buildroot}/usr/lib/swift/clang -cp -r %{_builddir}/usr/lib/clang %{buildroot}/usr/lib/swift -ln -fs /usr/lib/swift/clang/7.0.0/include %{buildroot}/usr/lib/swift/clang/include -ln -fs /usr/lib/swift/clang/7.0.0/lib %{buildroot}/usr/lib/swift/clang/lib -ln -fs /usr/lib/swift/clang/7.0.0/share %{buildroot}/usr/lib/swift/clang/share -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/libFoundationXML.so -chmod 0755 %{buildroot}/usr/lib/swift/linux/libXCTest.so -chmod 0755 %{buildroot}/usr/lib/swift/linux/libFoundationNetworking.so -chmod 0755 %{buildroot}/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so -chmod 0755 %{buildroot}/usr/lib/swift/linux/libswiftRemoteMirror.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 - -mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ -install -m 0644 %{SOURCE14} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang.conf -install -m 0644 %{SOURCE15} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf - +ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift +ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc +ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp mkdir -p %{buildroot}%{_mandir}/man1 -install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1 +cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %files %license swift/LICENSE.txt -%{_bindir}/swift* -%{_mandir}/man1/* -/usr/lib/swift-lldb/ -/usr/lib/swift/Block/ -/usr/lib/swift/CoreFoundation/ -/usr/lib/swift/_InternalSwiftSyntaxParser/ -/usr/lib/swift/clang/ -/usr/lib/swift/dispatch/ -/usr/lib/swift/migrator/ -/usr/lib/swift/os/ -/usr/lib/swift/pm/ -/usr/lib/swift/shims/ -/usr/lib/swift_static/ -/usr/lib/swift/CFURLSessionInterface/ -/usr/lib/swift/CFXMLInterface/ -/usr/lib/swift/FrameworkABIBaseline/ -%{_libexecdir}/swift-lldb/ -%{_sysconfdir}/ld.so.conf.d/swift-lang.conf -%{_bindir}/plutil +%{_bindir}/swift +%{_bindir}/swiftc %{_bindir}/sourcekit-lsp - - -%files runtime -%dir /usr/lib/swift -/usr/lib/swift/linux/ -%ifarch aarch64 -/usr/lib/swift/linux/aarch64/ -%else -/usr/lib/swift/linux/x86_64/ -%endif -%{_sysconfdir}/ld.so.conf.d/swift-lang-runtime.conf +%{_mandir}/man1/swift.1.gz +%{_libexecdir}/swift/ %post -p /sbin/ldconfig @@ -325,36 +182,33 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog -* Tue Mar 10 2020 Ron Olson 5.1.5-0.1.20200305git30c042c -- Updated to swift-5.1.5-RELEASE and added building the 3.16 version of CMake - to work around issues with 3.17 -* Mon Feb 17 2020 Ron Olson 5.1.4-0.2.20200131git2194dc2 -- Added patch to handle warning-as-error using Clang 10 -* Fri Jan 31 2020 Ron Olson 5.1.4-0.1.20200131git2194dc2 -- Updated to swift-5.1.4-RELEASE -* Wed Jan 29 2020 Ron Olson 5.1-0.17.20200128gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-28-a -* Tue Jan 28 2020 Ron Olson 5.1-0.16.20200127gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-27-a -* Sat Jan 25 2020 Ron Olson 5.1-0.15.20200124gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-24-a and added patches to - handle the cstdint header not being implicitly included -* Fri Jan 24 2020 Ron Olson 5.1-0.14.20200123gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-23-a -* Wed Jan 22 2020 Ron Olson 5.1-0.13.20200121gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-21-a -* Mon Jan 20 2020 Ron Olson 5.1-0.12.20200119gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-19-a -* Sat Jan 18 2020 Ron Olson 5.1-0.11.20200117gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-17-a -* Sun Jan 12 2020 Ron Olson 5.1-0.10.20200111gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-11-a -* Sat Jan 11 2020 Ron Olson 5.1-0.9.20200110gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-10-a -* Fri Jan 10 2020 Ron Olson 5.1-0.8.20200109gite45437e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-09-a -* Wed Jan 08 2020 Ron Olson 5.1-0.7.20200107git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2020-01-07-a +* Mon Apr 06 2020 Ron Olson 5.2.1-1 +- Reorganized the package to place everything in a single location, + changed the versioning scheme, and removed a number of obsolete patches +* Wed Apr 01 2020 Ron Olson 5.2.1-0.1.20200331git2e3b1b3 +- Updated to swift-5.2.1-RELEASE +* Wed Mar 25 2020 Ron Olson 5.2-0.10.20200324git443e9a4 +- Updated to swift-5.2-RELEASE +* Thu Mar 12 2020 Ron Olson 5.2-0.9.20200311git33150e3 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-03-11-a and switched to + using patched version of cmake to get around issues building 5.2 with + 3.17 +* Fri Feb 28 2020 Ron Olson 5.2-0.8.20200227git33150e3 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-27-a +* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a +* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a +* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a +* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a * Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 - Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a * Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 diff --git a/swift-unwrapped.patch b/swift-unwrapped.patch deleted file mode 100644 index 0f88eb0..0000000 --- a/swift-unwrapped.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- swiftpm/Sources/Basic/Process.swift.orig 2019-03-13 14:27:25.426760197 -0500 -+++ swiftpm/Sources/Basic/Process.swift 2019-03-13 14:28:45.656837626 -0500 -@@ -327,7 +327,7 @@ - let devNull = strdup("/dev/null") - defer { free(devNull) } - // Open /dev/null as stdin. -- posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0) -+ posix_spawn_file_actions_addopen(&fileActions, 0, devNull!, O_RDONLY, 0) - - var outputPipe: [Int32] = [0, 0] - var stderrPipe: [Int32] = [0, 0] -@@ -350,7 +350,7 @@ - - let argv = CStringArray(arguments) - let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" })) -- let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray) -+ let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray) - - guard rv == 0 else { - throw SystemError.posix_spawn(rv, arguments) diff --git a/swift.patch b/swift.patch new file mode 100644 index 0000000..80cc2c8 --- /dev/null +++ b/swift.patch @@ -0,0 +1,23 @@ +diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini +--- swift-orig/utils/build-presets.ini 2020-02-10 23:48:46.000000000 -0600 ++++ swift/utils/build-presets.ini 2020-02-13 20:40:30.123310629 -0600 +@@ -527,7 +527,6 @@ + release + assertions + +-build-swift-stdlib-unittest-extra + + # We run the OS X tests and validation tests. + test +diff -Naur swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py +--- swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-10 23:48:46.000000000 -0600 ++++ swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-13 20:22:27.615497246 -0600 +@@ -12,7 +12,7 @@ + + from argparse import ArgumentError + +-import diagnostics ++from . import diagnostics + + from .targets import StdlibDeploymentTarget + From c1fa1a3943a06e432a987c85c2b2b9c7c9b5c682 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 9 Apr 2020 21:14:22 -0500 Subject: [PATCH 051/152] Merge didn't work properly, had extra patch in file --- swift-lang.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index c15869b..aad418a 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -143,10 +143,6 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py -# Implicit fallthrough warning treated as error in Clang 10 -%patch15 -p0 - - %build export VERBOSE=1 # We may not have /usr/bin/python, so we roll our own From 68c44522383e731af9e3e84379fd938f7ae1a6ac Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 12 Apr 2020 11:39:56 -0500 Subject: [PATCH 052/152] Updated to include s390x and specific requirement for F30 --- build-setup-s390x.patch | 32 +++++++++++++++++ ibm-identifier.patch | 11 ++++++ sources | 1 - swift-lang.spec | 78 ++++++++++++++++++++++------------------- 4 files changed, 84 insertions(+), 38 deletions(-) create mode 100644 build-setup-s390x.patch create mode 100644 ibm-identifier.patch diff --git a/build-setup-s390x.patch b/build-setup-s390x.patch new file mode 100644 index 0000000..83a723b --- /dev/null +++ b/build-setup-s390x.patch @@ -0,0 +1,32 @@ +--- swift/utils/build-presets.ini.orig 2020-04-11 22:32:29.178121900 +0000 ++++ swift/utils/build-presets.ini 2020-04-11 22:33:41.148121900 +0000 +@@ -736,18 +736,15 @@ + llbuild + swiftpm + xctest +-libicu + libcxx + + dash-dash + +-build-ninja + install-swift + install-lldb + install-llbuild + install-swiftpm + install-xctest +-install-libicu + install-prefix=/usr + install-libcxx + install-sourcekit-lsp +@@ -758,10 +755,8 @@ + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out + +-test-installable-package + + # Build the benchmarks against the toolchain. +-toolchain-benchmarks + + # Path to the root of the installation filesystem. + install-destdir=%(install_destdir)s diff --git a/ibm-identifier.patch b/ibm-identifier.patch new file mode 100644 index 0000000..8ed81c3 --- /dev/null +++ b/ibm-identifier.patch @@ -0,0 +1,11 @@ +--- swiftpm/Sources/Build/Triple.swift.orig 2020-04-11 19:16:00.451437120 +0000 ++++ swiftpm/Sources/Build/Triple.swift 2020-04-11 19:17:33.091437120 +0000 +@@ -135,7 +135,7 @@ + public static let x86_64Linux = try! Triple("x86_64-unknown-linux-gnu") + public static let i686Linux = try! Triple("i686-unknown-linux") + public static let ppc64leLinux = try! Triple("powerpc64le-unknown-linux") +- public static let s390xLinux = try! Triple("s390x-unknown-linux") ++ public static let s390xLinux = try! Triple("s390x-ibm-linux") + public static let arm64Linux = try! Triple("aarch64-unknown-linux-gnu") + public static let armLinux = try! Triple("armv7-unknown-linux-gnueabihf") + public static let armAndroid = try! Triple("armv7a-unknown-linux-androideabi") diff --git a/sources b/sources index 3291aa9..768a7ce 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 SHA512 (cmark.tar.gz) = c1c31dadebb7e97ffbcf451e2964ab8593ab9048713b4aa102b87720a3f72b2b2bc7eedf4988cd7194dff930bfb27a0a3b34b4f5fd81e2d5d6f6cbd727d43282 SHA512 (corelibs-foundation.tar.gz) = fca965045dcdb68c3038ddfab658cf2c26d84bcda8d29607538e583854858cf8b42c1bf55c2ca5d1d242c29666e23b0dba1f92da219b468112740681f26f0298 SHA512 (corelibs-libdispatch.tar.gz) = 6180ee085e667e4990c1b93ec506eb623c871f95e3eca38e5545c84ff258a22f2deaa9b86e640ba668ad5a0f56e36ec06b06ea5f23f060b6c25b6e0fd929a03d diff --git a/swift-lang.spec b/swift-lang.spec index aad418a..04269bc 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -5,40 +5,41 @@ %global swiftgithash 2e3b1b3 %global swiftgitdate 20200331 %global swiftbuild swift-source -%global cmake_version 3.16.5 -Name: swift-lang -Version: 5.2.1 -Release: 1%{?dist} -Summary: Apple's Swift programming language -License: ASL 2.0 and Unicode -URL: https://swift.org -Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz +Name: swift-lang +Version: 5.2.1 +Release: 1%{?dist} +Summary: Apple's Swift programming language +License: ASL 2.0 and Unicode +URL: https://swift.org +Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz -Source16: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: build-setup.patch Patch1: compiler-rt-fuzzer.patch Patch2: python3-2.patch Patch3: linux-tests-python-3-2.patch -Patch4: glibcpthread.patch -Patch5: swift.patch -Patch6: llvm.patch -Patch7: indexstore.patch +Patch4: glibcpthread.patch +Patch5: swift.patch +Patch6: llvm.patch +Patch7: indexstore.patch +Patch8: build-setup-s390x.patch +Patch9: ibm-identifier.patch +BuildRequires: cmake BuildRequires: clang BuildRequires: swig BuildRequires: pkgconfig @@ -57,21 +58,23 @@ BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build -BuildRequires: make -BuildRequires: openssl-devel BuildRequires: /usr/bin/pathfix.py -Requires: glibc-devel +Requires: glibc-devel +%if 0%{?fedora} >= 31 Requires: binutils-gold +%else +Requires: binutils +%endif Requires: gcc Requires: ncurses-devel Requires: ncurses-compat-libs -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Obsoletes: %{name}-runtime < %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Obsoletes: %{name}-runtime < %{version}-%{release} -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 s390x %description @@ -88,13 +91,6 @@ correct programs easier for the developer. %prep -# Now we handle our own CMake (sigh) -%setup -q -c -n cmake -a 16 -mkdir cmake-build -cd cmake-build -../cmake-%{cmake_version}/bootstrap && make - - %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is @@ -119,7 +115,12 @@ mv icu-release-61-2 icu mv swift-syntax-swift-%{swiftsyntax} swift-syntax # Since we require ninja for building, there's no sense to rebuild it just for Swift +%ifnarch s390x %patch0 -p0 +%else +# Couple other things for s390x +%patch8 -p0 +%endif # Fixes an issue with using std::thread in a vector in compiler-rt %patch1 -p0 @@ -140,6 +141,11 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax %patch6 -p0 %patch7 -p0 +# s390x-specific patches +%ifarch s390x +%patch9 -p0 +%endif + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py @@ -150,8 +156,6 @@ export VERBOSE=1 mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH -# And for CMake, which we built first -export PATH=$PWD/../cmake/cmake-build/bin:$PATH # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz From c12fd33d2e213bfc74f3644ee6606dc2ba87dec9 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 12 Apr 2020 11:50:41 -0500 Subject: [PATCH 053/152] Updated version number --- swift-lang.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 04269bc..cfbd7f9 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -9,7 +9,7 @@ Name: swift-lang Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -186,6 +186,8 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Sun Apr 12 2020 Ron Olson 5.2.1-2 +- Added s390x architecture and F30-specific requires * Mon Apr 06 2020 Ron Olson 5.2.1-1 - Reorganized the package to place everything in a single location, changed the versioning scheme, and removed a number of obsolete patches From f941d72e44f1899740d12901e71475db6306da5d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 12 Apr 2020 14:20:01 -0500 Subject: [PATCH 054/152] Added explicit CMake build back because the version in EPEL 8 is too old --- sources | 1 + swift-lang.spec | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 768a7ce..3291aa9 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ +SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 SHA512 (cmark.tar.gz) = c1c31dadebb7e97ffbcf451e2964ab8593ab9048713b4aa102b87720a3f72b2b2bc7eedf4988cd7194dff930bfb27a0a3b34b4f5fd81e2d5d6f6cbd727d43282 SHA512 (corelibs-foundation.tar.gz) = fca965045dcdb68c3038ddfab658cf2c26d84bcda8d29607538e583854858cf8b42c1bf55c2ca5d1d242c29666e23b0dba1f92da219b468112740681f26f0298 SHA512 (corelibs-libdispatch.tar.gz) = 6180ee085e667e4990c1b93ec506eb623c871f95e3eca38e5545c84ff258a22f2deaa9b86e640ba668ad5a0f56e36ec06b06ea5f23f060b6c25b6e0fd929a03d diff --git a/swift-lang.spec b/swift-lang.spec index cfbd7f9..5cb9cba 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -2,14 +2,12 @@ %global swifttag 5.2.1-RELEASE # Swift syntax seems to only be updated on major releases %global swiftsyntax 5.2.1-RELEASE -%global swiftgithash 2e3b1b3 -%global swiftgitdate 20200331 %global swiftbuild swift-source - +%global cmake_version 3.16.5 Name: swift-lang Version: 5.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -27,6 +25,7 @@ Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.g Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz +Source14: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: build-setup.patch Patch1: compiler-rt-fuzzer.patch @@ -39,7 +38,6 @@ Patch7: indexstore.patch Patch8: build-setup-s390x.patch Patch9: ibm-identifier.patch -BuildRequires: cmake BuildRequires: clang BuildRequires: swig BuildRequires: pkgconfig @@ -59,6 +57,8 @@ BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build BuildRequires: /usr/bin/pathfix.py +BuildRequires: make +BuildRequires: openssl-devel Requires: glibc-devel %if 0%{?fedora} >= 31 @@ -90,6 +90,14 @@ correct programs easier for the developer. %prep +# Now we build our own CMake because the one in EPEL8 is too old and +# we can safely build it for all platforms (though will add some time +# to the whole build process) +%setup -q -c -n cmake -a 14 +mkdir cmake-build +cd cmake-build +../cmake-%{cmake_version}/bootstrap && make + %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named @@ -156,6 +164,8 @@ export VERBOSE=1 mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH +# And for CMake, which we built first +export PATH=$PWD/../cmake/cmake-build/bin:$PATH # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -186,6 +196,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Sun Apr 12 2020 Ron Olson 5.2.1-3 +- Put CMake back as a build step because the version in EPEL 8 is too + old * Sun Apr 12 2020 Ron Olson 5.2.1-2 - Added s390x architecture and F30-specific requires * Mon Apr 06 2020 Ron Olson 5.2.1-1 From 160af0b806c0fa256de0d94cde05148b9b51d045 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 16 Apr 2020 08:55:25 -0500 Subject: [PATCH 055/152] Updated to Swift 5.2.2-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 10 ++++++---- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/sources b/sources index 3291aa9..83b7d0a 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = c1c31dadebb7e97ffbcf451e2964ab8593ab9048713b4aa102b87720a3f72b2b2bc7eedf4988cd7194dff930bfb27a0a3b34b4f5fd81e2d5d6f6cbd727d43282 -SHA512 (corelibs-foundation.tar.gz) = fca965045dcdb68c3038ddfab658cf2c26d84bcda8d29607538e583854858cf8b42c1bf55c2ca5d1d242c29666e23b0dba1f92da219b468112740681f26f0298 -SHA512 (corelibs-libdispatch.tar.gz) = 6180ee085e667e4990c1b93ec506eb623c871f95e3eca38e5545c84ff258a22f2deaa9b86e640ba668ad5a0f56e36ec06b06ea5f23f060b6c25b6e0fd929a03d -SHA512 (corelibs-xctest.tar.gz) = 840b56e7fa983af8207730590aeaf326c6264ffa1dff5366745498f6525bd9293e714dba96709b57a76fb52b094235d23f8eb46823c4ed97e7fb5e01120ede56 -SHA512 (indexstore-db.tar.gz) = 9c2a2e506e31d1531a45cd5c83e12510e1c48df0617360d6d721ae12c1c24a23ce4313d186766ee376ab4b8976521b9deb0a5adbefdc7f4e9cf9b57b68b2ac55 -SHA512 (llbuild.tar.gz) = 866526aa8c2a7b831b26aac067266cf579850508f3650a67042c84066283bcc6b8b8ad8021a0c1a1376f89a5407de5a3dccb264215a26afd91e19b35dbd4fd57 -SHA512 (llvm-project.tar.gz) = 137d004affab5239eaf89d06cd3b45fabe33ba0f7f930926204e15042e19f3ba9a77a394f71208521a7a6bced68f7ae1553bdff70676adfa81f5a0946d7eb2ca -SHA512 (package-manager.tar.gz) = 9bef9631ace2f09e7de40864316bb2440d0becc04ef7f5a03c58cb3f4189f60aedb72d870d84926b76fcfea9c3b53ae230ef2415138c07e5ae1f1bfe988a0f76 +SHA512 (cmark.tar.gz) = b7b53691557a672cc14b502071340c2c4cf53440ec89c08148f4f72d13d8907eae28b4c56258cbac6ad04b649cc6ac687be97972e17176d41c959de831d05ebc +SHA512 (corelibs-foundation.tar.gz) = 8eb47ef48f8638ad13b86baf645da2e5466efe4a076516bf85cb7dc972a3861619b3d4600e2cd07add0fb1a1aaa50d451b41ced7af0e7fcbcfeb4cb7b95afefd +SHA512 (corelibs-libdispatch.tar.gz) = fdb9f511e5ae5db740c8d590d41c57ca79bd7e638e8655ce5c597149d4b146571abf63ece748920020564bf8414455e3232822585274d49ad05107c93e5dd1ac +SHA512 (corelibs-xctest.tar.gz) = 14fa70d983a92de8681148284b949fdadd4c31f0dc216c3b5a0620e47e9029a656527a06cd88afc7b9f122dca013b06faf218fa9cde0669023c648f18ef923b5 +SHA512 (indexstore-db.tar.gz) = 9abb756171b59e116f824bda8a993582d4cf3ce84d418b33731a4da43f116fbc862ce5a40de1288febd993093c1a9cd364b15a2e281ce2858f660f74caefb599 +SHA512 (llbuild.tar.gz) = 2ae4f37a727da560cf701f5ad5f74210e0c7e96e23a5400ae1d680765966ed71ef0300819e936a7cd555427c49979b34010ccb7b6aa7c5d849b7e6b5bfbd57d1 +SHA512 (llvm-project.tar.gz) = 8c7fd5b69c741c2489ba6875da8b5acd77154acc4277abfdaf9aa9bfc69ab2a0b1e29fec9d152355eefbe63662067bd26e404432eff2953f9868b8e78bad67d1 +SHA512 (package-manager.tar.gz) = 9c48ae393782457c7149454258f8c72700a3117d43e680a8576c924b271993d76e538c3b020350ee6f9459cc2e5dcdc713224a0de1eec42822f87966a36b2dff SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 8cc17cac6156f706d1e7a4daa0d8da4c10ddec36d268c94ec6ba82d9a6a1ba610308276dfb679cc1737ff684e634cf406e1b8636e50b2de96e12ee1a20a35bad -SHA512 (swift-integration-tests.tar.gz) = 1b641b0eb2ed219609716f689ec97d1982ac7b92b06ecc3b58cf5b4b703aa569387d9d2c035a6d09f2c6c17f8a897e0f6a711eac05d9f0c1071d9c8db46e248f -SHA512 (swift-syntax.tar.gz) = 937105f4f5483d6f049ad630192ab7dc9d3b01275d5fff9791b5994729b29edbface365335f5d2ec9aa7186bb728e3ec600015649b80e28ba02b114809c13913 -SHA512 (swift-xcode-playground-support.tar.gz) = acaeee1c578281f145a0a0e3abba2415e83de4628534aeae88f1d29c63fe71da59474cb427436cefa4664b75a2bd18aac868dcc7c62625749a94a1c0c1040a09 -SHA512 (swift.tar.gz) = fbf69731423f0e0c871d09c079dda4652114bc26b46fa31393c157c2c05568e7f972bdc951fd0f159745d3313bef5644a6eadf56a2403be41cb0d87dbeacb961 +SHA512 (sourcekit-lsp.tar.gz) = c035f03e42b0e5fed051608c2e0b161e671d8cde20b1de36a28596209a98a67b6e9236170c375920c600d7db4382b7a1419632a8b307f41671f3a4c303a7dd04 +SHA512 (swift-integration-tests.tar.gz) = 04970d0037f747f921d94f4b767a8a30b4fd6432bdd9bf8490f096dc58076dc9995934fde43442bfef7f5d7f0316ab488af994f330d9d1803d79fca6c55bffa7 +SHA512 (swift-syntax.tar.gz) = b4a81c290a194473d86dc42811a3ebce483f76f785a4423ab3d80b4bedc67230f2688bb141b8860bc11a6ecda537c1b5559d341d2445cff05a315e069a53c50d +SHA512 (swift-xcode-playground-support.tar.gz) = 95181915c8c55eb7cf6442feb9e750a641f820598510b118d4199ad6ec4208a554078dd00585f6b549a8cecf76d020c785e591d6fd4ea6b250fe1aa74ef7940f +SHA512 (swift.tar.gz) = d1c178c00a47aa13679ba3ef2d11d0c7f2846fb1320ae6672e715deb0f3bf0d0977955cc01f0dee417d4d72b00c9026b3dbae5fd62e48dc3edcaf0dde65ca8c6 diff --git a/swift-lang.spec b/swift-lang.spec index 5cb9cba..72688aa 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global swifttag 5.2.1-RELEASE +%global swifttag 5.2.2-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.2.1-RELEASE +%global swiftsyntax 5.2.2-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 Name: swift-lang -Version: 5.2.1 -Release: 3%{?dist} +Version: 5.2.2 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -196,6 +196,8 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Wed Apr 15 2020 Ron Olson 5.2.2-1 +- Updated to swift-5.2.2-RELEASE * Sun Apr 12 2020 Ron Olson 5.2.1-3 - Put CMake back as a build step because the version in EPEL 8 is too old From ce5bdc54cc86c7ee99b1020789b6a203475ef447 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 18 Apr 2020 07:47:24 -0500 Subject: [PATCH 056/152] Added patch to handle sysctl.h being removed --- nosysctl.patch | 12 ++++++++++++ swift-lang.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 nosysctl.patch diff --git a/nosysctl.patch b/nosysctl.patch new file mode 100644 index 0000000..fec77d6 --- /dev/null +++ b/nosysctl.patch @@ -0,0 +1,12 @@ +--- ./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c.orig 2020-04-16 18:45:49.133260989 -0500 ++++ ./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-16 18:46:21.547420799 -0500 +@@ -17,9 +17,6 @@ + + #if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN + #include +-#if !TARGET_OS_ANDROID +-#include +-#endif + #include + #endif + diff --git a/swift-lang.spec b/swift-lang.spec index 72688aa..e0e71b4 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -37,6 +37,7 @@ Patch6: llvm.patch Patch7: indexstore.patch Patch8: build-setup-s390x.patch Patch9: ibm-identifier.patch +Patch10: nosysctl.patch BuildRequires: clang BuildRequires: swig @@ -154,6 +155,9 @@ mv swift-syntax-swift-%{swiftsyntax} swift-syntax %patch9 -p0 %endif +# sys/sysctl.h has been removed +%patch10 -p0 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py @@ -196,6 +200,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Fri Apr 17 2020 Ron Olson 5.2.2-2 +- Added patch to remove use of sys/sysctl.h as it was removed + in Rawhide (future F33) * Wed Apr 15 2020 Ron Olson 5.2.2-1 - Updated to swift-5.2.2-RELEASE * Sun Apr 12 2020 Ron Olson 5.2.1-3 From fc2fe0edad81ce90aff5ef4eef1b26e3104e5645 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 18 Apr 2020 13:07:16 -0500 Subject: [PATCH 057/152] Fixed sysctl patch --- nosysctl.patch | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nosysctl.patch b/nosysctl.patch index fec77d6..59151c5 100644 --- a/nosysctl.patch +++ b/nosysctl.patch @@ -1,12 +1,24 @@ ---- ./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c.orig 2020-04-16 18:45:49.133260989 -0500 -+++ ./swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-16 18:46:21.547420799 -0500 -@@ -17,9 +17,6 @@ +diff -Naur swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c +--- swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-03-18 02:25:12.000000000 -0500 ++++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-18 12:54:00.130921751 -0500 +@@ -17,7 +17,7 @@ #if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN #include -#if !TARGET_OS_ANDROID --#include --#endif - #include ++#if TARGET_OS_MAC || TARGET_OS_BSD + #include #endif + #include +diff -Naur swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +--- swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-03-18 02:25:12.000000000 -0500 ++++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-18 12:53:44.299349245 -0500 +@@ -27,7 +27,7 @@ + #if TARGET_OS_MAC || TARGET_OS_LINUX + #include +-#if !TARGET_OS_ANDROID ++#if TARGET_OS_MAC || TARGET_OS_LINUX + #include + #endif + #include From 26887eeca3523db6a4644be38859fdc74300cd17 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 18 Apr 2020 14:50:32 -0500 Subject: [PATCH 058/152] Fixed sysctl patch ... again --- nosysctl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nosysctl.patch b/nosysctl.patch index 59151c5..ce4546c 100644 --- a/nosysctl.patch +++ b/nosysctl.patch @@ -18,7 +18,7 @@ diff -Naur swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle #if TARGET_OS_MAC || TARGET_OS_LINUX #include -#if !TARGET_OS_ANDROID -+#if TARGET_OS_MAC || TARGET_OS_LINUX ++#if TARGET_OS_MAC || TARGET_OS_BSD #include #endif #include From 09a193b388f5479e4cf81fbf5846e54aa340a06b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 1 May 2020 09:15:49 -0500 Subject: [PATCH 059/152] Updated to Swift 5.2.3-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 12 +++++++----- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/sources b/sources index 83b7d0a..7bbd88b 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = b7b53691557a672cc14b502071340c2c4cf53440ec89c08148f4f72d13d8907eae28b4c56258cbac6ad04b649cc6ac687be97972e17176d41c959de831d05ebc -SHA512 (corelibs-foundation.tar.gz) = 8eb47ef48f8638ad13b86baf645da2e5466efe4a076516bf85cb7dc972a3861619b3d4600e2cd07add0fb1a1aaa50d451b41ced7af0e7fcbcfeb4cb7b95afefd -SHA512 (corelibs-libdispatch.tar.gz) = fdb9f511e5ae5db740c8d590d41c57ca79bd7e638e8655ce5c597149d4b146571abf63ece748920020564bf8414455e3232822585274d49ad05107c93e5dd1ac -SHA512 (corelibs-xctest.tar.gz) = 14fa70d983a92de8681148284b949fdadd4c31f0dc216c3b5a0620e47e9029a656527a06cd88afc7b9f122dca013b06faf218fa9cde0669023c648f18ef923b5 -SHA512 (indexstore-db.tar.gz) = 9abb756171b59e116f824bda8a993582d4cf3ce84d418b33731a4da43f116fbc862ce5a40de1288febd993093c1a9cd364b15a2e281ce2858f660f74caefb599 -SHA512 (llbuild.tar.gz) = 2ae4f37a727da560cf701f5ad5f74210e0c7e96e23a5400ae1d680765966ed71ef0300819e936a7cd555427c49979b34010ccb7b6aa7c5d849b7e6b5bfbd57d1 -SHA512 (llvm-project.tar.gz) = 8c7fd5b69c741c2489ba6875da8b5acd77154acc4277abfdaf9aa9bfc69ab2a0b1e29fec9d152355eefbe63662067bd26e404432eff2953f9868b8e78bad67d1 -SHA512 (package-manager.tar.gz) = 9c48ae393782457c7149454258f8c72700a3117d43e680a8576c924b271993d76e538c3b020350ee6f9459cc2e5dcdc713224a0de1eec42822f87966a36b2dff +SHA512 (cmark.tar.gz) = 8625514a7146599c03f7c72e8618de872d4ff6c36d5674944e6f4e622a6e8445e5de0f5eac144dfe76b25da43265e9d69faa768308ff82193217d4d00fb0aebe +SHA512 (corelibs-foundation.tar.gz) = 50bdc837f07256b3163b6a6df4c4c47980f8d73fd99c455dc92061ea6e881b6dffefea4398d5ccce4c56e8a4bbebf52b43000dda4923d9f2e7213fc2bf2a853a +SHA512 (corelibs-libdispatch.tar.gz) = 33c46249d39153d7af814fabb7c3ccffb1d52b0b7997822ca8667c899c593bb89397a79b0c71820d57a62ff04afa4891141c59eadea4ec6d8e58b57f32b6828f +SHA512 (corelibs-xctest.tar.gz) = 31e15ab31ebbf0203072bf7e7ef2a9e3a4fe4273ee840eeb71bdc7434bfbc4f36fbc768125967cd50249b406842118eff80dfefc3b1021e7bcd3fb3eff978922 +SHA512 (indexstore-db.tar.gz) = 25b07bad32aae1731ab928c2796177a1304373d872fe467bd2b6583142b17233456302ec465cf017c96d01826b62c09dcb70dfb853c92e251f893df4fa316bb3 +SHA512 (llbuild.tar.gz) = a2ad5adf8455903b1e1e0493f2d5e9f353b3f5bec4aef923991a1d558c7cae38837216d71f91a329b18b21a99444e98c73e93b3445868e38559aba071f517fa5 +SHA512 (llvm-project.tar.gz) = 14395c3d3ceb36581c22c056b82f4b85293d2523ca54c6b4e4d2797d847b369917218f2f317b198eaa4fe18106439f37567ee9303307b7095b14433c6d81e46c +SHA512 (package-manager.tar.gz) = 6b4d865ec75725def0b065012dc5302d27a5f8e32452047fcada79bb92cfbdc2af5d5e47979bedf466461a3c26b55f5a093e81b92289024e5ecdcdbcc9184c78 SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = c035f03e42b0e5fed051608c2e0b161e671d8cde20b1de36a28596209a98a67b6e9236170c375920c600d7db4382b7a1419632a8b307f41671f3a4c303a7dd04 -SHA512 (swift-integration-tests.tar.gz) = 04970d0037f747f921d94f4b767a8a30b4fd6432bdd9bf8490f096dc58076dc9995934fde43442bfef7f5d7f0316ab488af994f330d9d1803d79fca6c55bffa7 -SHA512 (swift-syntax.tar.gz) = b4a81c290a194473d86dc42811a3ebce483f76f785a4423ab3d80b4bedc67230f2688bb141b8860bc11a6ecda537c1b5559d341d2445cff05a315e069a53c50d -SHA512 (swift-xcode-playground-support.tar.gz) = 95181915c8c55eb7cf6442feb9e750a641f820598510b118d4199ad6ec4208a554078dd00585f6b549a8cecf76d020c785e591d6fd4ea6b250fe1aa74ef7940f -SHA512 (swift.tar.gz) = d1c178c00a47aa13679ba3ef2d11d0c7f2846fb1320ae6672e715deb0f3bf0d0977955cc01f0dee417d4d72b00c9026b3dbae5fd62e48dc3edcaf0dde65ca8c6 +SHA512 (sourcekit-lsp.tar.gz) = 29c3c92ac95820732e6a92005ae30075f25db77c8bfe301b589d5966ae49302ad3ab6aa6c3b0c97ed5c05f789d2b557d238145e83e4fe9207cd6bab3c1568dae +SHA512 (swift-integration-tests.tar.gz) = 09b3400b2fc269637a77a8a6fc1c5ac0953f5392fd218f24ce0a87fb59bdd881dff100ffb098aeed663d53c699ba8d00b35e925e6af948ef3d4d15a141ea4a28 +SHA512 (swift-syntax.tar.gz) = ca535e981357f0dfc005f1ad1e9db169e5a3704fe94e88008f73c91312ea35911bb1de70965576b0cbb241cce28dd389fbecc7c9027991bfb14cd5bcd0dba62f +SHA512 (swift-xcode-playground-support.tar.gz) = 426e4c224b1554690d34d10768759237cd90ebf1c1b149620cd1527d659e693f069d713da4070cdd1bd153d5dbafbec1a3e5a46e14042043b53a23ac9a9d3ca9 +SHA512 (swift.tar.gz) = 7cda51b628fb2328b869c8cc025fe4b7a0a4b1231bf55503d9e45215f2dc2808951a70c1383bd78bab4a7b24b34fcd382398f5585180c5b8798a1fa878e84f0a diff --git a/swift-lang.spec b/swift-lang.spec index e0e71b4..079aa25 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global swifttag 5.2.2-RELEASE +%global swifttag 5.2.3-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.2.2-RELEASE +%global swiftsyntax 5.2.3-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 Name: swift-lang -Version: 5.2.2 -Release: 2%{?dist} +Version: 5.2.3 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -75,7 +75,7 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} Obsoletes: %{name}-runtime < %{version}-%{release} -ExclusiveArch: x86_64 aarch64 s390x +ExclusiveArch: x86_64 aarch64 %description @@ -200,6 +200,8 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Wed Apr 29 2020 Ron Olson 5.2.3-1 +- Updated to swift-5.2.3-RELEASE * Fri Apr 17 2020 Ron Olson 5.2.2-2 - Added patch to remove use of sys/sysctl.h as it was removed in Rawhide (future F33) From 637c2bb9af1eb1be338913402753a7334d34a4b6 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 22 May 2020 09:55:47 -0500 Subject: [PATCH 060/152] Updated to swift-5.2.4-RELEASE --- sources | 26 ++++++------- swift-lang.spec | 98 ++++++++++++++++++++++++------------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/sources b/sources index 7bbd88b..7d09177 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 8625514a7146599c03f7c72e8618de872d4ff6c36d5674944e6f4e622a6e8445e5de0f5eac144dfe76b25da43265e9d69faa768308ff82193217d4d00fb0aebe -SHA512 (corelibs-foundation.tar.gz) = 50bdc837f07256b3163b6a6df4c4c47980f8d73fd99c455dc92061ea6e881b6dffefea4398d5ccce4c56e8a4bbebf52b43000dda4923d9f2e7213fc2bf2a853a -SHA512 (corelibs-libdispatch.tar.gz) = 33c46249d39153d7af814fabb7c3ccffb1d52b0b7997822ca8667c899c593bb89397a79b0c71820d57a62ff04afa4891141c59eadea4ec6d8e58b57f32b6828f -SHA512 (corelibs-xctest.tar.gz) = 31e15ab31ebbf0203072bf7e7ef2a9e3a4fe4273ee840eeb71bdc7434bfbc4f36fbc768125967cd50249b406842118eff80dfefc3b1021e7bcd3fb3eff978922 -SHA512 (indexstore-db.tar.gz) = 25b07bad32aae1731ab928c2796177a1304373d872fe467bd2b6583142b17233456302ec465cf017c96d01826b62c09dcb70dfb853c92e251f893df4fa316bb3 -SHA512 (llbuild.tar.gz) = a2ad5adf8455903b1e1e0493f2d5e9f353b3f5bec4aef923991a1d558c7cae38837216d71f91a329b18b21a99444e98c73e93b3445868e38559aba071f517fa5 -SHA512 (llvm-project.tar.gz) = 14395c3d3ceb36581c22c056b82f4b85293d2523ca54c6b4e4d2797d847b369917218f2f317b198eaa4fe18106439f37567ee9303307b7095b14433c6d81e46c -SHA512 (package-manager.tar.gz) = 6b4d865ec75725def0b065012dc5302d27a5f8e32452047fcada79bb92cfbdc2af5d5e47979bedf466461a3c26b55f5a093e81b92289024e5ecdcdbcc9184c78 -SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 29c3c92ac95820732e6a92005ae30075f25db77c8bfe301b589d5966ae49302ad3ab6aa6c3b0c97ed5c05f789d2b557d238145e83e4fe9207cd6bab3c1568dae -SHA512 (swift-integration-tests.tar.gz) = 09b3400b2fc269637a77a8a6fc1c5ac0953f5392fd218f24ce0a87fb59bdd881dff100ffb098aeed663d53c699ba8d00b35e925e6af948ef3d4d15a141ea4a28 +SHA512 (cmark.tar.gz) = 270c7db870e4e00158afafe8c21a91638ac87c85ae6c559361ecd8917078fe4b675a8d4d725a7174b6cc66208918f0ce55fbfab75e2104aaf008918e2287a5e1 +SHA512 (corelibs-foundation.tar.gz) = 64c4bb98b8dedaa9f1ff1b8e6af3e97267a49f074f7a80cb790f73c8072c1fc0e7c300c60e2e02e8faff4e8cae8113b37c22c2b7783fbf2c7bc1329daaa429e0 +SHA512 (corelibs-libdispatch.tar.gz) = f39f7b0858c1c4b04aee0b84f6a4bbbf1233a8631cb5a396e645b8c8826c310b2f7d7f47b6ee71bc2887a5ca558752b891e041a94a31c6f11527cca2fe004fb1 +SHA512 (corelibs-xctest.tar.gz) = dc7900d315518c7fabf30e5159c9ffe76550a91efa4c74cb25e7df3c956c8c0c98abd61897d0c6b84dbadc2208c3368f37fbe45beafc0021e7266acb17f7d67d +SHA512 (indexstore-db.tar.gz) = b0a9c7b63d1702f16562636fa799fbab34d51fa27efb966d284559bfa7af90bf2992e76f1a956f8ea6937e2ca0667d1fc2564a2188eb311cb753034bfc4c6686 +SHA512 (llbuild.tar.gz) = 0af847c3ca73abea6f660cb9ff06e1ac613f8210de8730730eb526bd4fcddd698daaee43fd0434c07ad17a30a2c4ba5d6ff901f41a0f6e16cd854fe8e73b717f +SHA512 (llvm-project.tar.gz) = 24a4d58ffaa4b9eb5613bf2b12b8cec2491c1e70e5bd4cbd12a814b837fe46afb078bbc7d0fc888aa623a3f9b9adbba2df9c35eaf12d14ccc70ac28a5256f449 +SHA512 (package-manager.tar.gz) = dbedccfbdbb3920773eeee89eb9b9face307828cf314f8269d3e9ed74dec7f3903ddc080cc69c6e456699798d17dce8036d5670a2134f1eb463ff06341df06bd +SHA512 (release-61-2.tar.gz) = 5b0182a0142f9768457e893c05c95fab4ff1b769e9918792b0c8f19d8cdf367104c85e526897f33fd02150ef6c5bb716edf5ac73487c5b894de8ed9e79a97f7b +SHA512 (sourcekit-lsp.tar.gz) = 3c0a74e66cc64c5ba299ab85f50781c3867bb4c641ef68066306829581fef3b291bb8e3830689aacee4be9e8a685476371bb13b891809baa115b7e6423e2a5a0 +SHA512 (swift-integration-tests.tar.gz) = 4f308b357c9028cbc3149bf2cdfe0b29a94417f9b772a775d7d76a6a5a3adc89314977b00d07b9ddc0270b91ab29d39cf7411389f4aac79259e1aaa7872fe189 SHA512 (swift-syntax.tar.gz) = ca535e981357f0dfc005f1ad1e9db169e5a3704fe94e88008f73c91312ea35911bb1de70965576b0cbb241cce28dd389fbecc7c9027991bfb14cd5bcd0dba62f -SHA512 (swift-xcode-playground-support.tar.gz) = 426e4c224b1554690d34d10768759237cd90ebf1c1b149620cd1527d659e693f069d713da4070cdd1bd153d5dbafbec1a3e5a46e14042043b53a23ac9a9d3ca9 -SHA512 (swift.tar.gz) = 7cda51b628fb2328b869c8cc025fe4b7a0a4b1231bf55503d9e45215f2dc2808951a70c1383bd78bab4a7b24b34fcd382398f5585180c5b8798a1fa878e84f0a +SHA512 (swift-xcode-playground-support.tar.gz) = 3871eddcb2287762fc1cc3df11a1cabf03ac10405e053bfee7d4984fa8afe48dc864557f4d117b1cd57bc6ad0276cd163e49cf8886b1fd0e32375f86e0ed751d +SHA512 (swift.tar.gz) = 7b2f368b2722b505a33a6965a9531221952f42d07ff37cff73d0454f1f566e557d43dc3904f4715c036181ca4ccb9be38d12ff23607ffb44ffa3a962d62da361 diff --git a/swift-lang.spec b/swift-lang.spec index 079aa25..528cf29 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,43 +1,43 @@ %global debug_package %{nil} -%global swifttag 5.2.3-RELEASE +%global swifttag 5.2.4-RELEASE # Swift syntax seems to only be updated on major releases -%global swiftsyntax 5.2.3-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 +%global swiftsyntax 5.2.3-RELEASE -Name: swift-lang -Version: 5.2.3 -Release: 1%{?dist} -Summary: Apple's Swift programming language -License: ASL 2.0 and Unicode -URL: https://swift.org -Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz -Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz -Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz -Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz -Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz -Source14: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz +Name: swift-lang +Version: 5.2.4 +Release: 1%{?dist} +Summary: Apple's Swift programming language +License: ASL 2.0 and Unicode +URL: https://swift.org +Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz +Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz +Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz +Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz +Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz +Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz +Source14: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz -Patch0: build-setup.patch -Patch1: compiler-rt-fuzzer.patch -Patch2: python3-2.patch -Patch3: linux-tests-python-3-2.patch -Patch4: glibcpthread.patch -Patch5: swift.patch -Patch6: llvm.patch -Patch7: indexstore.patch -Patch8: build-setup-s390x.patch -Patch9: ibm-identifier.patch -Patch10: nosysctl.patch +Patch0: build-setup.patch +Patch1: compiler-rt-fuzzer.patch +Patch2: python3-2.patch +Patch3: linux-tests-python-3-2.patch +Patch4: glibcpthread.patch +Patch5: swift.patch +Patch6: llvm.patch +Patch7: indexstore.patch +Patch8: build-setup-s390x.patch +Patch9: ibm-identifier.patch +Patch10: nosysctl.patch BuildRequires: clang BuildRequires: swig @@ -46,7 +46,7 @@ BuildRequires: perl-podlators BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel -BuildRequires: python3-distro +BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel @@ -57,25 +57,25 @@ BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build -BuildRequires: /usr/bin/pathfix.py +BuildRequires: /usr/bin/pathfix.py BuildRequires: make BuildRequires: openssl-devel -Requires: glibc-devel +Requires: glibc-devel %if 0%{?fedora} >= 31 -Requires: binutils-gold +Requires: binutils-gold %else -Requires: binutils +Requires: binutils %endif -Requires: gcc -Requires: ncurses-devel -Requires: ncurses-compat-libs +Requires: gcc +Requires: ncurses-devel +Requires: ncurses-compat-libs -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Obsoletes: %{name}-runtime < %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +Obsoletes: %{name}-runtime < %{version}-%{release} -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 %description @@ -116,13 +116,11 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp mv indexstore-db-swift-%{swifttag} indexstore-db mv llvm-project-swift-%{swifttag} llvm-project +mv swift-syntax-swift-%{swiftsyntax} swift-syntax # ICU mv icu-release-61-2 icu -# Swift Syntax on its own release (sigh) -mv swift-syntax-swift-%{swiftsyntax} swift-syntax - # Since we require ninja for building, there's no sense to rebuild it just for Swift %ifnarch s390x %patch0 -p0 @@ -200,6 +198,8 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Wed May 20 2020 Ron Olson 5.2.4-1 +- Updated to swift-5.2.4-RELEASE * Wed Apr 29 2020 Ron Olson 5.2.3-1 - Updated to swift-5.2.3-RELEASE * Fri Apr 17 2020 Ron Olson 5.2.2-2 From 0c4e5ed2dc26c22136146ee2c7b54a5eda74b16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:51:20 +0200 Subject: [PATCH 061/152] Rebuilt for Python 3.9 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 528cf29..6b72c2c 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -198,6 +198,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Tue May 26 2020 Miro Hrončok - 5.2.4-2 +- Rebuilt for Python 3.9 + * Wed May 20 2020 Ron Olson 5.2.4-1 - Updated to swift-5.2.4-RELEASE * Wed Apr 29 2020 Ron Olson 5.2.3-1 From 9b525a2d23df7fe8be450d997323348ab8e3baa4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:52:16 +0000 Subject: [PATCH 062/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 6b72c2c..cf5e201 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -198,6 +198,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 5.2.4-2 - Rebuilt for Python 3.9 From cddcabc3919fcac4e4288c281d6ded46963681fc Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 11 Aug 2020 17:04:31 -0500 Subject: [PATCH 063/152] Updated to Swift 5.2.5 --- sources | 28 ++++++++++++++-------------- swift-lang.spec | 15 +++++++-------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sources b/sources index 7d09177..47a2a7b 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 270c7db870e4e00158afafe8c21a91638ac87c85ae6c559361ecd8917078fe4b675a8d4d725a7174b6cc66208918f0ce55fbfab75e2104aaf008918e2287a5e1 -SHA512 (corelibs-foundation.tar.gz) = 64c4bb98b8dedaa9f1ff1b8e6af3e97267a49f074f7a80cb790f73c8072c1fc0e7c300c60e2e02e8faff4e8cae8113b37c22c2b7783fbf2c7bc1329daaa429e0 -SHA512 (corelibs-libdispatch.tar.gz) = f39f7b0858c1c4b04aee0b84f6a4bbbf1233a8631cb5a396e645b8c8826c310b2f7d7f47b6ee71bc2887a5ca558752b891e041a94a31c6f11527cca2fe004fb1 -SHA512 (corelibs-xctest.tar.gz) = dc7900d315518c7fabf30e5159c9ffe76550a91efa4c74cb25e7df3c956c8c0c98abd61897d0c6b84dbadc2208c3368f37fbe45beafc0021e7266acb17f7d67d -SHA512 (indexstore-db.tar.gz) = b0a9c7b63d1702f16562636fa799fbab34d51fa27efb966d284559bfa7af90bf2992e76f1a956f8ea6937e2ca0667d1fc2564a2188eb311cb753034bfc4c6686 -SHA512 (llbuild.tar.gz) = 0af847c3ca73abea6f660cb9ff06e1ac613f8210de8730730eb526bd4fcddd698daaee43fd0434c07ad17a30a2c4ba5d6ff901f41a0f6e16cd854fe8e73b717f -SHA512 (llvm-project.tar.gz) = 24a4d58ffaa4b9eb5613bf2b12b8cec2491c1e70e5bd4cbd12a814b837fe46afb078bbc7d0fc888aa623a3f9b9adbba2df9c35eaf12d14ccc70ac28a5256f449 -SHA512 (package-manager.tar.gz) = dbedccfbdbb3920773eeee89eb9b9face307828cf314f8269d3e9ed74dec7f3903ddc080cc69c6e456699798d17dce8036d5670a2134f1eb463ff06341df06bd -SHA512 (release-61-2.tar.gz) = 5b0182a0142f9768457e893c05c95fab4ff1b769e9918792b0c8f19d8cdf367104c85e526897f33fd02150ef6c5bb716edf5ac73487c5b894de8ed9e79a97f7b -SHA512 (sourcekit-lsp.tar.gz) = 3c0a74e66cc64c5ba299ab85f50781c3867bb4c641ef68066306829581fef3b291bb8e3830689aacee4be9e8a685476371bb13b891809baa115b7e6423e2a5a0 -SHA512 (swift-integration-tests.tar.gz) = 4f308b357c9028cbc3149bf2cdfe0b29a94417f9b772a775d7d76a6a5a3adc89314977b00d07b9ddc0270b91ab29d39cf7411389f4aac79259e1aaa7872fe189 -SHA512 (swift-syntax.tar.gz) = ca535e981357f0dfc005f1ad1e9db169e5a3704fe94e88008f73c91312ea35911bb1de70965576b0cbb241cce28dd389fbecc7c9027991bfb14cd5bcd0dba62f -SHA512 (swift-xcode-playground-support.tar.gz) = 3871eddcb2287762fc1cc3df11a1cabf03ac10405e053bfee7d4984fa8afe48dc864557f4d117b1cd57bc6ad0276cd163e49cf8886b1fd0e32375f86e0ed751d -SHA512 (swift.tar.gz) = 7b2f368b2722b505a33a6965a9531221952f42d07ff37cff73d0454f1f566e557d43dc3904f4715c036181ca4ccb9be38d12ff23607ffb44ffa3a962d62da361 +SHA512 (cmark.tar.gz) = a203871f3eb2e5fc7711466da574c7f24d08c32a56568a566fd9fc823a51f8c4241d5b93aad004862cc83410962f97fed275e098192f3a9afe4311a5f9e38197 +SHA512 (corelibs-foundation.tar.gz) = d75fb66841878b4a2cd41d04f19ed647b08715770d396e779b2cb7da9e63ed107ee9c48943472900ff43d3af6f19e341c248fa07714222cf58866047384adf62 +SHA512 (corelibs-libdispatch.tar.gz) = 0cfd719a98605e6e1ef407d01741656277bdb574f97e7f5caf0380ab1da7b7198887b2c2301a9711d292f4a7dc70e80692100d465d345acb82a5e8a9e8280e26 +SHA512 (corelibs-xctest.tar.gz) = a1c4c07a594e0c7c7348f0c7fc4a30858bb4cba8b4109e39c47dedd5671c910ad27c75a8818454d5e3defd0876237f6ce9a0447dd1a71e983c571d6f8c3f8586 +SHA512 (indexstore-db.tar.gz) = 67a17f91850931c075f0f412071fddda5df0c2389b4701f835ca22fd2aced36357b3cf75545ea3f0108cda833deb26fc6e4510e368209e7ce7a53e82f9b33fe1 +SHA512 (llbuild.tar.gz) = ca91a96a25624cf19b741fdc5dc909424aa6e71c4445a07450e1880fb721aff01b0bbcd94f34a11de663fa8811d105d07b277729ead00bc33e6181bbcbf67cb8 +SHA512 (llvm-project.tar.gz) = 157373299065aba8caa074d5d77c5a1e864da0c14cf783ad891cb70e5e03752f413011353a3e88d4fdfced16f177293973c543b9325dc9fdea10725ea401bd88 +SHA512 (package-manager.tar.gz) = 3a0271e1ea67b280253c5859a7535530e471454eeb639e2a2141ff020c453ca0e8b3bfa3273498f3258fb21b9e972ff761ff7516e036daf35de12059dddaf3de +SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 +SHA512 (sourcekit-lsp.tar.gz) = 28e7bcdabaeb81a00c19aadd74574b8254736e6fb9626fbe070eb1b9f8e62e1fcda1c7cba8427df966d4d2b358669313b8c3cc71223141c2288cc6e56cb827d9 +SHA512 (swift-integration-tests.tar.gz) = d8822305c98912d1fe7e4c20cade9c59d145f830b5c4d60b48b587d9078263b9fa98ee107c15580bdcfe7bb3c2a3322563b68549e01644cc5cb881bc3ef57dcd +SHA512 (swift-syntax.tar.gz) = db765b93ce7d05b5377789aec9db6c9ef4f971e7cecd87cc5bf2f8d9e10780eea324a92b8d86eced7a8357a416ff8f3540bcd5ba8e6fd7f91ce37cccb305da65 +SHA512 (swift-xcode-playground-support.tar.gz) = a3744cca2d19512880f931e2fc23bc2186b7c20a11b9a2b165b89a89cb889fe949776da4478fdbddbbb95cfb26649bacff2c825be935bce383b718fda8adb949 +SHA512 (swift.tar.gz) = 60aff05eb6a8d71bd87ffdf0781dd7440ece8fff961f8676117cd6e520731a393519e7bf64d4ca14d54d109604424b33d89e3c9624d384d451f7fbd48863b886 diff --git a/swift-lang.spec b/swift-lang.spec index cf5e201..08fb13d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.2.4-RELEASE +%global swifttag 5.2.5-RELEASE # Swift syntax seems to only be updated on major releases %global swiftbuild swift-source %global cmake_version 3.16.5 -%global swiftsyntax 5.2.3-RELEASE Name: swift-lang -Version: 5.2.4 -Release: 3%{?dist} +Version: 5.2.5 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -24,7 +23,7 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag} Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz -Source13: https://github.com/apple/swift-syntax/archive/swift-%{swiftsyntax}.zip#/swift-syntax.tar.gz +Source13: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz Source14: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: build-setup.patch @@ -116,7 +115,7 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp mv indexstore-db-swift-%{swifttag} indexstore-db mv llvm-project-swift-%{swifttag} llvm-project -mv swift-syntax-swift-%{swiftsyntax} swift-syntax +mv swift-syntax-swift-%{swifttag} swift-syntax # ICU mv icu-release-61-2 icu @@ -198,12 +197,12 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Mon Aug 10 2020 Ron Olson 5.2.5-1 +- Updated to swift-5.2.5-RELEASE * Wed Jul 29 2020 Fedora Release Engineering - 5.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue May 26 2020 Miro Hrončok - 5.2.4-2 - Rebuilt for Python 3.9 - * Wed May 20 2020 Ron Olson 5.2.4-1 - Updated to swift-5.2.4-RELEASE * Wed Apr 29 2020 Ron Olson 5.2.3-1 From 5b6b41a5d4b162f3da8d93609cc4dba6c5e4768d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 18 Sep 2020 22:33:45 -0500 Subject: [PATCH 064/152] Updated to Swift 5.3-RELEASE --- .gitignore | 1 + build-setup.patch | 22 --- ibm-identifier.patch | 11 -- llvm-indexstore.patch | 17 ++ llvm.patch | 11 -- nosysctl.patch | 14 +- python3-2.patch | 410 ---------------------------------------- sources | 28 +-- swift-build-setup.patch | 24 +++ swift-lang.spec | 54 +++--- swift.patch | 23 --- 11 files changed, 90 insertions(+), 525 deletions(-) delete mode 100644 build-setup.patch delete mode 100644 ibm-identifier.patch create mode 100644 llvm-indexstore.patch delete mode 100644 llvm.patch delete mode 100644 python3-2.patch create mode 100644 swift-build-setup.patch delete mode 100644 swift.patch diff --git a/.gitignore b/.gitignore index eef5596..b0b806f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /sourcekit-lsp.tar.gz /swift-syntax.tar.gz /cmake-3.16.5.tar.gz +/release-67-1.tar.gz diff --git a/build-setup.patch b/build-setup.patch deleted file mode 100644 index 0308c3f..0000000 --- a/build-setup.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2020-01-30 19:54:07.528043218 -0600 -+++ swift/utils/build-presets.ini 2020-01-30 19:55:11.580461138 -0600 -@@ -741,7 +741,6 @@ - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild -@@ -755,11 +754,6 @@ - build-swift-static-sdk-overlay - build-swift-stdlib-unittest-extra - --# Executes the lit tests for the installable package that is created --# Assumes the swift-integration-tests repo is checked out -- --test-installable-package -- - # Build the benchmarks against the toolchain. - toolchain-benchmarks - diff --git a/ibm-identifier.patch b/ibm-identifier.patch deleted file mode 100644 index 8ed81c3..0000000 --- a/ibm-identifier.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swiftpm/Sources/Build/Triple.swift.orig 2020-04-11 19:16:00.451437120 +0000 -+++ swiftpm/Sources/Build/Triple.swift 2020-04-11 19:17:33.091437120 +0000 -@@ -135,7 +135,7 @@ - public static let x86_64Linux = try! Triple("x86_64-unknown-linux-gnu") - public static let i686Linux = try! Triple("i686-unknown-linux") - public static let ppc64leLinux = try! Triple("powerpc64le-unknown-linux") -- public static let s390xLinux = try! Triple("s390x-unknown-linux") -+ public static let s390xLinux = try! Triple("s390x-ibm-linux") - public static let arm64Linux = try! Triple("aarch64-unknown-linux-gnu") - public static let armLinux = try! Triple("armv7-unknown-linux-gnueabihf") - public static let armAndroid = try! Triple("armv7a-unknown-linux-androideabi") diff --git a/llvm-indexstore.patch b/llvm-indexstore.patch new file mode 100644 index 0000000..fac4669 --- /dev/null +++ b/llvm-indexstore.patch @@ -0,0 +1,17 @@ +--- llvm-project/clang/include/indexstore/indexstore.h.orig 2020-08-30 20:56:38.552235207 -0500 ++++ llvm-project/clang/include/indexstore/indexstore.h 2020-08-30 20:58:02.746863308 -0500 +@@ -98,9 +98,11 @@ + + #define INDEXSTORE_OPTIONS_ATTRS INDEXSTORE_OPEN_ENUM_ATTR INDEXSTORE_FLAG_ENUM_ATTR + +-#if defined(__has_extension) +-#if __has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum) +-# define INDEXSTORE_OPTIONS(_type, _name) enum INDEXSTORE_OPTIONS_ATTRS _name : _type _name; enum INDEXSTORE_OPTIONS_ATTRS _name : _type ++#if __has_feature(objc_fixed_enum) ++#ifdef __cplusplus ++# define INDEXSTORE_OPTIONS(_type, _name) enum INDEXSTORE_OPTIONS_ATTRS _name : _type ++#else ++# define INDEXSTORE_OPTIONS(_type, _name) enum _name : _type; typedef enum _name _name; enum INDEXSTORE_OPTIONS_ATTRS _name : _type + #endif + #endif + diff --git a/llvm.patch b/llvm.patch deleted file mode 100644 index b9f70d5..0000000 --- a/llvm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h.orig 2020-01-29 10:02:44.222689214 -0600 -+++ llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h 2020-01-29 10:03:02.007354450 -0600 -@@ -16,6 +16,8 @@ - #include "llvm/Demangle/DemangleConfig.h" - #include "llvm/Demangle/StringView.h" - #include -+#include -+#include - - namespace llvm { - namespace itanium_demangle { diff --git a/nosysctl.patch b/nosysctl.patch index ce4546c..a93e565 100644 --- a/nosysctl.patch +++ b/nosysctl.patch @@ -1,6 +1,6 @@ -diff -Naur swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c ---- swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-03-18 02:25:12.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-18 12:54:00.130921751 -0500 +diff -Naur ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c +--- ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-19 22:20:35.000000000 -0500 ++++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-24 21:29:34.742564898 -0500 @@ -17,7 +17,7 @@ #if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN @@ -10,12 +10,12 @@ diff -Naur swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle #include #endif #include -diff -Naur swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c ---- swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-03-18 02:25:12.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-18 12:53:44.299349245 -0500 +diff -Naur ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c +--- ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-19 22:20:35.000000000 -0500 ++++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-24 21:30:07.201669760 -0500 @@ -27,7 +27,7 @@ - #if TARGET_OS_MAC || TARGET_OS_LINUX + #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD #include -#if !TARGET_OS_ANDROID +#if TARGET_OS_MAC || TARGET_OS_BSD diff --git a/python3-2.patch b/python3-2.patch deleted file mode 100644 index 1feab4f..0000000 --- a/python3-2.patch +++ /dev/null @@ -1,410 +0,0 @@ -diff -Naur swift-orig/stdlib/public/core/IntegerTypes.swift.gyb swift/stdlib/public/core/IntegerTypes.swift.gyb ---- swift-orig/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/IntegerTypes.swift.gyb 2020-01-29 13:23:24.851180231 -0600 -@@ -14,10 +14,9 @@ - # Utility code for later in this template - # - --from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init --from SwiftFloatingPointTypes import getFtoIBounds -+import SwiftIntTypes -+import SwiftFloatingPointTypes - --from string import maketrans, capitalize - from itertools import chain - - # Number of bits in the Builtin.Word type -@@ -1064,7 +1063,7 @@ - //===--- Concrete FixedWidthIntegers --------------------------------------===// - //===----------------------------------------------------------------------===// - --% for self_type in all_integer_types(word_bits): -+% for self_type in SwiftIntTypes.all_integer_types(word_bits): - % bits = self_type.bits - % signed = self_type.is_signed - % BuiltinName = self_type.builtin_name -@@ -1125,7 +1124,7 @@ - - % for (FloatType, FloatBits) in [ - % ('Float', 32), ('Double', 64), ('Float80', 80)]: --% (lower, upper) = getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) -+% (lower, upper) = SwiftFloatingPointTypes.getFtoIBounds(floatBits=FloatBits, intBits=int(bits), signed=signed) - - % if FloatType == 'Float80': - #if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64)) -@@ -1648,7 +1647,7 @@ - return Hasher._hash( - seed: seed, - bytes: UInt64(truncatingIfNeeded: ${U}${Self}(_value)), -- count: ${bits / 8}) -+ count: ${bits // 8}) - % end - } - } -diff -Naur swift-orig/stdlib/public/core/Mirrors.swift.gyb swift/stdlib/public/core/Mirrors.swift.gyb ---- swift-orig/stdlib/public/core/Mirrors.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/Mirrors.swift.gyb 2020-01-29 13:27:07.425509032 -0600 -@@ -12,7 +12,7 @@ - - %{ - --from SwiftIntTypes import all_integer_types -+import SwiftIntTypes - - # Number of bits in the Builtin.Word type - word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 -@@ -26,7 +26,7 @@ - ('Unicode.Scalar', '.uInt', 'UInt64(self)'), - ] - --for self_ty in all_integer_types(word_bits): -+for self_ty in SwiftIntTypes.all_integer_types(word_bits): - Self = self_ty.stdlib_name - if self_ty.is_signed: - Types.append( (Self, '.int', 'Int64(self)') ) -diff -Naur swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb swift/stdlib/public/core/SIMDVectorTypes.swift.gyb ---- swift-orig/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/SIMDVectorTypes.swift.gyb 2020-01-29 13:30:52.170919077 -0600 -@@ -11,7 +11,7 @@ - //===----------------------------------------------------------------------===// - - %{ --from SwiftIntTypes import all_integer_types -+import SwiftIntTypes - word_bits = int(CMAKE_SIZEOF_VOID_P) * 8 - storagescalarCounts = [2,4,8,16,32,64] - vectorscalarCounts = storagescalarCounts + [3] -@@ -90,17 +90,17 @@ - % if n >= 4: - /// Creates a new vector from two half-length vectors. - @_transparent -- public init(lowHalf: SIMD${n/2}, highHalf: SIMD${n/2}) { -+ public init(lowHalf: SIMD${n//2}, highHalf: SIMD${n//2}) { - self.init() - self.lowHalf = lowHalf - self.highHalf = highHalf - } - --% for (half,indx) in [('low','i'), ('high',str(n/2)+'+i'), ('even','2*i'), ('odd','2*i+1')]: -+% for (half,indx) in [('low','i'), ('high',str(n//2)+'+i'), ('even','2*i'), ('odd','2*i+1')]: - /// A half-length vector made up of the ${half} elements of the vector. -- public var ${half}Half: SIMD${n/2} { -+ public var ${half}Half: SIMD${n//2} { - @inlinable get { -- var result = SIMD${n/2}() -+ var result = SIMD${n//2}() - for i in result.indices { result[i] = self[${indx}] } - return result - } -@@ -159,7 +159,7 @@ - public var debugDescription: String { - return "SIMD${n}<\(Scalar.self)>(${', '.join(map(lambda c: - '\\(self['+ str(c) + '])', -- xrange(n)))})" -+ range(n)))})" - } - } - -@@ -203,7 +203,7 @@ - } - } - --%for self_type in all_integer_types(word_bits): -+%for self_type in SwiftIntTypes.all_integer_types(word_bits): - % Self = self_type.stdlib_name - % BuiltinName = self_type.builtin_name - % Mask = Self if self_type.is_signed else self_type.get_opposite_signedness().stdlib_name -@@ -212,7 +212,7 @@ - public typealias SIMDMaskScalar = ${Mask} - - % for n in storagescalarCounts: --% bytes = n * self_type.bits / 8 -+% bytes = n * self_type.bits // 8 - /// Storage for a vector of ${spelledNumbers[n]} integers. - @frozen - @_alignment(${bytes if bytes <= 16 else 16}) -@@ -257,7 +257,7 @@ - public typealias SIMDMaskScalar = Int${bits} - - % for n in storagescalarCounts: --% bytes = n * bits / 8 -+% bytes = n * bits // 8 - /// Storage for a vector of ${spelledNumbers[n]} floating-point values. - @frozen - @_alignment(${bytes if bytes <= 16 else 16}) -diff -Naur swift-orig/stdlib/public/core/Tuple.swift.gyb swift/stdlib/public/core/Tuple.swift.gyb ---- swift-orig/stdlib/public/core/Tuple.swift.gyb 2020-01-24 01:22:05.000000000 -0600 -+++ swift/stdlib/public/core/Tuple.swift.gyb 2020-01-29 13:32:22.287291260 -0600 -@@ -111,7 +111,7 @@ - % equatableTypeParams = ", ".join(["{}: Equatable".format(c) for c in typeParams]) - - % originalTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity)))) --% greaterTuple = "(\"a\", {})".format(", ".join(map(str, range(1, arity - 1) + [arity]))) -+% greaterTuple = "(\"a\", {})".format(", ".join(map(str, list(range(1, arity - 1)) + [arity]))) - - /// Returns a Boolean value indicating whether the corresponding components of - /// two tuples are equal. -diff -Naur swift-orig/utils/gyb_sourcekit_support/__init__.py swift/utils/gyb_sourcekit_support/__init__.py ---- swift-orig/utils/gyb_sourcekit_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_sourcekit_support/__init__.py 2020-01-29 13:33:22.111521781 -0600 -@@ -14,9 +14,9 @@ - # utils/gyb_sourcekit_support/ directory as a module. - # - # ---------------------------------------------------------------------------- --from UIDs import UID_KEYS --from UIDs import UID_KINDS --from UIDs import UID_REQUESTS -+from .UIDs import UID_KEYS -+from .UIDs import UID_KINDS -+from .UIDs import UID_REQUESTS - - - def check_uid_duplication(): -diff -Naur swift-orig/utils/gyb_syntax_support/AttributeNodes.py swift/utils/gyb_syntax_support/AttributeNodes.py ---- swift-orig/utils/gyb_syntax_support/AttributeNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/AttributeNodes.py 2020-01-29 13:34:03.265044624 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - ATTRIBUTE_NODES = [ - # token-list -> token? token-list? -diff -Naur swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py swift/utils/gyb_syntax_support/AvailabilityNodes.py ---- swift-orig/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/AvailabilityNodes.py 2020-01-29 13:34:33.458161889 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - AVAILABILITY_NODES = [ - # availability-spec-list -> availability-entry availability-spec-list? -diff -Naur swift-orig/utils/gyb_syntax_support/Child.py swift/utils/gyb_syntax_support/Child.py ---- swift-orig/utils/gyb_syntax_support/Child.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Child.py 2020-01-29 13:35:02.044219688 -0600 -@@ -1,7 +1,7 @@ - # flake8: noqa I201 --from Classification import classification_by_name --from Token import SYNTAX_TOKEN_MAP --from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word -+from .Classification import classification_by_name -+from .Token import SYNTAX_TOKEN_MAP -+from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word - - - class Child(object): -diff -Naur swift-orig/utils/gyb_syntax_support/Classification.py swift/utils/gyb_syntax_support/Classification.py ---- swift-orig/utils/gyb_syntax_support/Classification.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Classification.py 2020-01-29 13:46:45.334244147 -0600 -@@ -1,5 +1,5 @@ --from Node import error --from kinds import lowercase_first_word # noqa: I201 -+from .Node import error -+from .kinds import lowercase_first_word # noqa: I201 - - - class SyntaxClassification(object): -diff -Naur swift-orig/utils/gyb_syntax_support/CommonNodes.py swift/utils/gyb_syntax_support/CommonNodes.py ---- swift-orig/utils/gyb_syntax_support/CommonNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/CommonNodes.py 2020-01-29 13:47:02.390875308 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - COMMON_NODES = [ - Node('Decl', kind='Syntax'), -diff -Naur swift-orig/utils/gyb_syntax_support/DeclNodes.py swift/utils/gyb_syntax_support/DeclNodes.py ---- swift-orig/utils/gyb_syntax_support/DeclNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/DeclNodes.py 2020-01-29 13:47:30.486914972 -0600 -@@ -1,6 +1,6 @@ - # flake8: noqa I201 --from Child import Child --from Node import Node -+from .Child import Child -+from .Node import Node - - - DECL_NODES = [ -diff -Naur swift-orig/utils/gyb_syntax_support/ExprNodes.py swift/utils/gyb_syntax_support/ExprNodes.py ---- swift-orig/utils/gyb_syntax_support/ExprNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/ExprNodes.py 2020-01-29 13:47:47.095529555 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - EXPR_NODES = [ - # An inout expression. -diff -Naur swift-orig/utils/gyb_syntax_support/GenericNodes.py swift/utils/gyb_syntax_support/GenericNodes.py ---- swift-orig/utils/gyb_syntax_support/GenericNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/GenericNodes.py 2020-01-29 13:48:04.737182368 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - GENERIC_NODES = [ - # generic-where-clause -> 'where' requirement-list -diff -Naur swift-orig/utils/gyb_syntax_support/__init__.py swift/utils/gyb_syntax_support/__init__.py ---- swift-orig/utils/gyb_syntax_support/__init__.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/__init__.py 2020-01-29 13:52:03.762062110 -0600 -@@ -1,22 +1,22 @@ - import textwrap --from AttributeNodes import ATTRIBUTE_NODES # noqa: I201 --from AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 --import Classification # noqa: I201 --from CommonNodes import COMMON_NODES # noqa: I201 --from DeclNodes import DECL_NODES # noqa: I201 --from ExprNodes import EXPR_NODES # noqa: I201 --from GenericNodes import GENERIC_NODES # noqa: I201 -+from .AttributeNodes import ATTRIBUTE_NODES # noqa: I201 -+from .AvailabilityNodes import AVAILABILITY_NODES # noqa: I201 -+from . import Classification # noqa: I201 -+from .CommonNodes import COMMON_NODES # noqa: I201 -+from .DeclNodes import DECL_NODES # noqa: I201 -+from .ExprNodes import EXPR_NODES # noqa: I201 -+from .GenericNodes import GENERIC_NODES # noqa: I201 - --from NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ -+from .NodeSerializationCodes import SYNTAX_NODE_SERIALIZATION_CODES, \ - get_serialization_code, \ - verify_syntax_node_serialization_codes - --from PatternNodes import PATTERN_NODES # noqa: I201 --from StmtNodes import STMT_NODES # noqa: I201 -+from .PatternNodes import PATTERN_NODES # noqa: I201 -+from .StmtNodes import STMT_NODES # noqa: I201 - --import Token --from Trivia import TRIVIAS # noqa: I201 --from TypeNodes import TYPE_NODES # noqa: I201 -+from . import Token -+from .Trivia import TRIVIAS # noqa: I201 -+from .TypeNodes import TYPE_NODES # noqa: I201 - - - # Re-export global constants -diff -Naur swift-orig/utils/gyb_syntax_support/Node.py swift/utils/gyb_syntax_support/Node.py ---- swift-orig/utils/gyb_syntax_support/Node.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Node.py 2020-01-29 13:52:32.755139868 -0600 -@@ -1,7 +1,7 @@ - from __future__ import print_function - import sys # noqa: I201 - --from kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word -+from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word - - - def error(msg): -diff -Naur swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py swift/utils/gyb_syntax_support/NodeSerializationCodes.py ---- swift-orig/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/NodeSerializationCodes.py 2020-01-29 13:52:58.148083796 -0600 -@@ -1,4 +1,4 @@ --from Node import error -+from .Node import error - - - SYNTAX_NODE_SERIALIZATION_CODES = { -diff -Naur swift-orig/utils/gyb_syntax_support/PatternNodes.py swift/utils/gyb_syntax_support/PatternNodes.py ---- swift-orig/utils/gyb_syntax_support/PatternNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/PatternNodes.py 2020-01-29 13:53:38.452582038 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - PATTERN_NODES = [ - -diff -Naur swift-orig/utils/gyb_syntax_support/StmtNodes.py swift/utils/gyb_syntax_support/StmtNodes.py ---- swift-orig/utils/gyb_syntax_support/StmtNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/StmtNodes.py 2020-01-29 13:53:55.056199243 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - STMT_NODES = [ - # continue-stmt -> 'continue' label? ';'? -diff -Naur swift-orig/utils/gyb_syntax_support/Token.py swift/utils/gyb_syntax_support/Token.py ---- swift-orig/utils/gyb_syntax_support/Token.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Token.py 2020-01-29 13:54:12.720855888 -0600 -@@ -1,6 +1,6 @@ --from Classification import classification_by_name --from Node import error # noqa: I201 --from kinds import lowercase_first_word # noqa: I201 -+from .Classification import classification_by_name -+from .Node import error # noqa: I201 -+from .kinds import lowercase_first_word # noqa: I201 - - - class Token(object): -diff -Naur swift-orig/utils/gyb_syntax_support/Trivia.py swift/utils/gyb_syntax_support/Trivia.py ---- swift-orig/utils/gyb_syntax_support/Trivia.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/Trivia.py 2020-01-29 13:54:41.647931191 -0600 -@@ -1,5 +1,5 @@ --from Node import error --from kinds import lowercase_first_word # noqa: I201 -+from .Node import error -+from .kinds import lowercase_first_word # noqa: I201 - - - class Trivia(object): -diff -Naur swift-orig/utils/gyb_syntax_support/TypeNodes.py swift/utils/gyb_syntax_support/TypeNodes.py ---- swift-orig/utils/gyb_syntax_support/TypeNodes.py 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/gyb_syntax_support/TypeNodes.py 2020-01-29 13:55:07.952909024 -0600 -@@ -1,5 +1,5 @@ --from Child import Child --from Node import Node # noqa: I201 -+from .Child import Child -+from .Node import Node # noqa: I201 - - TYPE_NODES = [ - # simple-type-identifier -> identifier generic-argument-clause? -diff -Naur swift-orig/utils/line-directive swift/utils/line-directive ---- swift-orig/utils/line-directive 2020-01-24 01:22:05.000000000 -0600 -+++ swift/utils/line-directive 2020-01-29 13:57:12.829551057 -0600 -@@ -61,7 +61,7 @@ - - def _make_line_map(target_filename, stream=None): - """ -- >>> from StringIO import StringIO -+ >>> from io import StringIO - >>> _make_line_map('box', - ... StringIO('''// ###sourceLocation(file: "foo.bar", line: 3) - ... line 2 -@@ -95,7 +95,7 @@ - - def map_line_to_source_file(target_filename, target_line_num): - """ -- >>> from tempfile import * -+ >>> from .tempfile import * - >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open - >>> # the file for a second time if delete=True. Therefore, we have to - >>> # manually handle closing and deleting this file to allow us to open -@@ -145,7 +145,7 @@ - def map_line_from_source_file(source_filename, source_line_num, - target_filename): - """ -- >>> from tempfile import * -+ >>> from .tempfile import * - >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open - >>> # the file for a second time if delete=True. Therefore, we have to - >>> # manually handle closing and deleting this file to allow us to open -@@ -231,7 +231,7 @@ - def run(): - """Simulate a couple of gyb-generated files - -- >>> from tempfile import * -+ >>> from .tempfile import * - >>> # On Windows, the name of a NamedTemporaryFile cannot be used to open - >>> # the file for a second time if delete=True. Therefore, we have to - >>> # manually handle closing and deleting this file to allow us to open diff --git a/sources b/sources index 47a2a7b..785548d 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = a203871f3eb2e5fc7711466da574c7f24d08c32a56568a566fd9fc823a51f8c4241d5b93aad004862cc83410962f97fed275e098192f3a9afe4311a5f9e38197 -SHA512 (corelibs-foundation.tar.gz) = d75fb66841878b4a2cd41d04f19ed647b08715770d396e779b2cb7da9e63ed107ee9c48943472900ff43d3af6f19e341c248fa07714222cf58866047384adf62 -SHA512 (corelibs-libdispatch.tar.gz) = 0cfd719a98605e6e1ef407d01741656277bdb574f97e7f5caf0380ab1da7b7198887b2c2301a9711d292f4a7dc70e80692100d465d345acb82a5e8a9e8280e26 -SHA512 (corelibs-xctest.tar.gz) = a1c4c07a594e0c7c7348f0c7fc4a30858bb4cba8b4109e39c47dedd5671c910ad27c75a8818454d5e3defd0876237f6ce9a0447dd1a71e983c571d6f8c3f8586 -SHA512 (indexstore-db.tar.gz) = 67a17f91850931c075f0f412071fddda5df0c2389b4701f835ca22fd2aced36357b3cf75545ea3f0108cda833deb26fc6e4510e368209e7ce7a53e82f9b33fe1 -SHA512 (llbuild.tar.gz) = ca91a96a25624cf19b741fdc5dc909424aa6e71c4445a07450e1880fb721aff01b0bbcd94f34a11de663fa8811d105d07b277729ead00bc33e6181bbcbf67cb8 -SHA512 (llvm-project.tar.gz) = 157373299065aba8caa074d5d77c5a1e864da0c14cf783ad891cb70e5e03752f413011353a3e88d4fdfced16f177293973c543b9325dc9fdea10725ea401bd88 -SHA512 (package-manager.tar.gz) = 3a0271e1ea67b280253c5859a7535530e471454eeb639e2a2141ff020c453ca0e8b3bfa3273498f3258fb21b9e972ff761ff7516e036daf35de12059dddaf3de -SHA512 (release-61-2.tar.gz) = 9c277f95694ef2b65da0c435ef580f85ec5ac425bca0d3cac82167d32ac6dbcd00a4411def7a7dd0c16786943b498486716b2ed5b353f19c4a499e8e1529fbf2 -SHA512 (sourcekit-lsp.tar.gz) = 28e7bcdabaeb81a00c19aadd74574b8254736e6fb9626fbe070eb1b9f8e62e1fcda1c7cba8427df966d4d2b358669313b8c3cc71223141c2288cc6e56cb827d9 -SHA512 (swift-integration-tests.tar.gz) = d8822305c98912d1fe7e4c20cade9c59d145f830b5c4d60b48b587d9078263b9fa98ee107c15580bdcfe7bb3c2a3322563b68549e01644cc5cb881bc3ef57dcd -SHA512 (swift-syntax.tar.gz) = db765b93ce7d05b5377789aec9db6c9ef4f971e7cecd87cc5bf2f8d9e10780eea324a92b8d86eced7a8357a416ff8f3540bcd5ba8e6fd7f91ce37cccb305da65 -SHA512 (swift-xcode-playground-support.tar.gz) = a3744cca2d19512880f931e2fc23bc2186b7c20a11b9a2b165b89a89cb889fe949776da4478fdbddbbb95cfb26649bacff2c825be935bce383b718fda8adb949 -SHA512 (swift.tar.gz) = 60aff05eb6a8d71bd87ffdf0781dd7440ece8fff961f8676117cd6e520731a393519e7bf64d4ca14d54d109604424b33d89e3c9624d384d451f7fbd48863b886 +SHA512 (cmark.tar.gz) = 75834190177c95123f582e9eb35339d66b2b0aa8c5d31c528efde9554f0def94e3cc81f1211f091795e4ba9aac71f90ef082d3b363549ae78454d722ae78404b +SHA512 (corelibs-foundation.tar.gz) = 2292c8bc7ec49bef6b7b694cb5cbc49808a7460e49f795d5381826941e5b8241bf1b12cc869868aebe0cb8ed81fab8d6c614095e044c60d394595d11cf5e3203 +SHA512 (corelibs-libdispatch.tar.gz) = 9d6dd163a86a9e97d30cea0a268ccf06cee846f7a140722ccb4e73d01a716207be1ab7209ff51f0246fd2fbba43329e4c079fdc2bff991fd0e2c22364dd95cbc +SHA512 (corelibs-xctest.tar.gz) = b763c4a31e5ad0da4930b89c6093b29f22884fa6f890a4e322124c7a91d4dc2fafe90d322dffd6b7d7e1f606e03c8b33dfd9276ab1c3427145e3d5491070b274 +SHA512 (indexstore-db.tar.gz) = 7b57bb47f8651926b54e90e448db99addc4128ba808b2786b907713d5264df8fdf873bec95b146326bb001b58bfad92b5bccc0ef50161adc591512c925daac23 +SHA512 (llbuild.tar.gz) = f5ae7d4918144a890726ad76c1adb9a20a36460411b7b5d7c6305b6b4862aadb47304846a9c1a49f839b851ca82bdede36ca0d621a82ba9fb1876ea6be79e356 +SHA512 (llvm-project.tar.gz) = d2adb502cf11bb5894e05f20759d9c42af966f9577424fcd0b5db07d509040288e803bacde17c1e366623f8be65573802f528dd586c716a6393a608943343528 +SHA512 (package-manager.tar.gz) = d9511bf98f677ebba4c321e107861e032eaeb7f9950335201895acfbcb13ffaa4c9fcfbadac4aae7712ae9218b3f085aede9295740d14e9a9d8c07e02b853c9c +SHA512 (release-67-1.tar.gz) = 1b7b9b908f914a84c59f248f9d9fd5d0e72df3d9742ded10466af866d587aef410341361a6a8ba70ce1b7e99be15cedca271639e0f7d8589c968e6df0ee6ea97 +SHA512 (sourcekit-lsp.tar.gz) = 58af4e577133a65268daeed22cbbe827234be62319e5f6c6e8efb0760b3cdeac10308c55b7858b7e9f0190b0642f8cf62fce403abbc8274bd9399e84852fd8bf +SHA512 (swift-integration-tests.tar.gz) = ffdda011ce2d961a6e7182121cf52e4b2f461babc2340dae64fff5aed000d5f5f3b7a0039f01668ab1538580601c3ac3962745d80b4d7d2f227d4728b6961d1d +SHA512 (swift-syntax.tar.gz) = ba4964e22562600abdd36b01084b8bbf98b396d960d7e14ff0ead7a709c70d91fc37022a3356a41cf915ce450d35a4b5b595b838527aa0eb42a1a201c83cbcfc +SHA512 (swift-xcode-playground-support.tar.gz) = 760a3aaccd0a7587802991e98b650e1ab82cd56b45f99f787688f87020b66924a09e3032943cd7455804aa7f60a2c04f46c8184d331ea605658f473092fc8279 +SHA512 (swift.tar.gz) = 835ee9fc7689d7d9b92eda3d2458025409e574e86cdd59e4cb0e200e3d900ced26c8cf71ccbf02965989591deac9bbe43411a42947a7e47f371289cb84e42f35 diff --git a/swift-build-setup.patch b/swift-build-setup.patch new file mode 100644 index 0000000..4480202 --- /dev/null +++ b/swift-build-setup.patch @@ -0,0 +1,24 @@ +diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini +--- swift-orig/utils/build-presets.ini 2020-04-21 15:42:23.000000000 -0500 ++++ swift/utils/build-presets.ini 2020-04-23 09:55:05.038603369 -0500 +@@ -789,7 +789,6 @@ + + dash-dash + +-build-ninja + install-swift + install-lldb + install-llbuild +@@ -801,12 +800,7 @@ + install-sourcekit-lsp + build-swift-static-stdlib + build-swift-static-sdk-overlay +-build-swift-stdlib-unittest-extra + +-# Executes the lit tests for the installable package that is created +-# Assumes the swift-integration-tests repo is checked out +- +-test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks diff --git a/swift-lang.spec b/swift-lang.spec index 08fb13d..bed47f9 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,15 +1,17 @@ %global debug_package %{nil} -%global swifttag 5.2.5-RELEASE -# Swift syntax seems to only be updated on major releases +%global swifttag 5.3-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 +%global icu_version 67-1 + Name: swift-lang -Version: 5.2.5 +Version: 5.3 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org + Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz @@ -22,26 +24,21 @@ Source8: https://github.com/apple/swift-xcode-playground-support/archive/ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/unicode-org/icu/archive/release-61-2.tar.gz +Source12: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz Source13: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz Source14: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz -Patch0: build-setup.patch +Patch0: swift-build-setup.patch Patch1: compiler-rt-fuzzer.patch -Patch2: python3-2.patch Patch3: linux-tests-python-3-2.patch Patch4: glibcpthread.patch -Patch5: swift.patch -Patch6: llvm.patch +Patch6: nosysctl.patch Patch7: indexstore.patch Patch8: build-setup-s390x.patch -Patch9: ibm-identifier.patch -Patch10: nosysctl.patch +Patch9: llvm-indexstore.patch BuildRequires: clang BuildRequires: swig -BuildRequires: pkgconfig -BuildRequires: perl-podlators BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel @@ -50,15 +47,18 @@ BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel BuildRequires: libblocksruntime-static -BuildRequires: libatomic-static BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: ninja-build +BuildRequires: perl-podlators +BuildRequires: python3-six +BuildRequires: python27 BuildRequires: /usr/bin/pathfix.py BuildRequires: make BuildRequires: openssl-devel +BuildRequires: cmake Requires: glibc-devel %if 0%{?fedora} >= 31 @@ -74,6 +74,7 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} Obsoletes: %{name}-runtime < %{version}-%{release} + ExclusiveArch: x86_64 aarch64 @@ -90,6 +91,7 @@ correct programs easier for the developer. %prep +%if 0%{?el8} # Now we build our own CMake because the one in EPEL8 is too old and # we can safely build it for all platforms (though will add some time # to the whole build process) @@ -97,7 +99,7 @@ correct programs easier for the developer. mkdir cmake-build cd cmake-build ../cmake-%{cmake_version}/bootstrap && make - +%endif %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 # The Swift build script requires directories to be named @@ -118,7 +120,7 @@ mv llvm-project-swift-%{swifttag} llvm-project mv swift-syntax-swift-%{swifttag} swift-syntax # ICU -mv icu-release-61-2 icu +mv icu-release-%{icu_version} icu # Since we require ninja for building, there's no sense to rebuild it just for Swift %ifnarch s390x @@ -132,31 +134,23 @@ mv icu-release-61-2 icu %patch1 -p0 # Python 3 is the new default so we need to make the python code work with it -%patch2 -p0 %patch3 -p0 # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 %patch4 -p0 -# -# 5.2 patches -# -%patch5 -p0 +# sys/sysctl.h has been removed +%patch6 -p0 # implicit include of cstdint -%patch6 -p0 %patch7 -p0 -# s390x-specific patches -%ifarch s390x +# Issue with enum declaration building with Clang 11 %patch9 -p0 -%endif - -# sys/sysctl.h has been removed -%patch10 -p0 # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize %build export VERBOSE=1 @@ -165,8 +159,10 @@ export VERBOSE=1 mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH +%if 0%{?el8} # And for CMake, which we built first export PATH=$PWD/../cmake/cmake-build/bin:$PATH +%endif # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -197,12 +193,16 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Mon Sep 17 2020 Ron Olson 5.3-1 +- Updated to swift-5.3-RELEASE * Mon Aug 10 2020 Ron Olson 5.2.5-1 - Updated to swift-5.2.5-RELEASE * Wed Jul 29 2020 Fedora Release Engineering - 5.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 5.2.4-2 - Rebuilt for Python 3.9 + * Wed May 20 2020 Ron Olson 5.2.4-1 - Updated to swift-5.2.4-RELEASE * Wed Apr 29 2020 Ron Olson 5.2.3-1 diff --git a/swift.patch b/swift.patch deleted file mode 100644 index 80cc2c8..0000000 --- a/swift.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini ---- swift-orig/utils/build-presets.ini 2020-02-10 23:48:46.000000000 -0600 -+++ swift/utils/build-presets.ini 2020-02-13 20:40:30.123310629 -0600 -@@ -527,7 +527,6 @@ - release - assertions - --build-swift-stdlib-unittest-extra - - # We run the OS X tests and validation tests. - test -diff -Naur swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py ---- swift-orig/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-10 23:48:46.000000000 -0600 -+++ swift/utils/swift_build_support/swift_build_support/host_specific_configuration.py 2020-02-13 20:22:27.615497246 -0600 -@@ -12,7 +12,7 @@ - - from argparse import ArgumentError - --import diagnostics -+from . import diagnostics - - from .targets import StdlibDeploymentTarget - From 5401212c883d688d74db0accc0156873794288a6 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sun, 15 Nov 2020 09:07:17 -0600 Subject: [PATCH 065/152] Updated to swift-5.3.1-RELEASE --- oldamd.patch | 24 ++++++++++++++++++++++++ sources | 26 +++++++++++++------------- swift-lang.spec | 12 +++++++++--- 3 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 oldamd.patch diff --git a/oldamd.patch b/oldamd.patch new file mode 100644 index 0000000..a2e9ed8 --- /dev/null +++ b/oldamd.patch @@ -0,0 +1,24 @@ +diff -Naur ./swift-orig/cmake/modules/AddSwift.cmake ./swift/cmake/modules/AddSwift.cmake +--- ./swift-orig/cmake/modules/AddSwift.cmake 2020-10-28 15:44:53.000000000 -0500 ++++ ./swift/cmake/modules/AddSwift.cmake 2020-10-31 08:57:43.088514376 -0500 +@@ -356,7 +356,7 @@ + if("${CFLAGS_SDK}" STREQUAL "LINUX") + if(${CFLAGS_ARCH} STREQUAL x86_64) + # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic +- list(APPEND result "-march=core2") ++ list(APPEND result "-mcx16") + endif() + endif() + +diff -Naur ./swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake ./swift/stdlib/cmake/modules/AddSwiftStdlib.cmake +--- ./swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake 2020-10-28 15:44:53.000000000 -0500 ++++ ./swift/stdlib/cmake/modules/AddSwiftStdlib.cmake 2020-10-31 08:58:34.788036005 -0500 +@@ -287,7 +287,7 @@ + if("${CFLAGS_SDK}" STREQUAL "LINUX") + if(${CFLAGS_ARCH} STREQUAL x86_64) + # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic +- list(APPEND result "-march=core2") ++ list(APPEND result "-mcx16") + endif() + endif() + diff --git a/sources b/sources index 785548d..712e6a4 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 75834190177c95123f582e9eb35339d66b2b0aa8c5d31c528efde9554f0def94e3cc81f1211f091795e4ba9aac71f90ef082d3b363549ae78454d722ae78404b -SHA512 (corelibs-foundation.tar.gz) = 2292c8bc7ec49bef6b7b694cb5cbc49808a7460e49f795d5381826941e5b8241bf1b12cc869868aebe0cb8ed81fab8d6c614095e044c60d394595d11cf5e3203 -SHA512 (corelibs-libdispatch.tar.gz) = 9d6dd163a86a9e97d30cea0a268ccf06cee846f7a140722ccb4e73d01a716207be1ab7209ff51f0246fd2fbba43329e4c079fdc2bff991fd0e2c22364dd95cbc -SHA512 (corelibs-xctest.tar.gz) = b763c4a31e5ad0da4930b89c6093b29f22884fa6f890a4e322124c7a91d4dc2fafe90d322dffd6b7d7e1f606e03c8b33dfd9276ab1c3427145e3d5491070b274 -SHA512 (indexstore-db.tar.gz) = 7b57bb47f8651926b54e90e448db99addc4128ba808b2786b907713d5264df8fdf873bec95b146326bb001b58bfad92b5bccc0ef50161adc591512c925daac23 -SHA512 (llbuild.tar.gz) = f5ae7d4918144a890726ad76c1adb9a20a36460411b7b5d7c6305b6b4862aadb47304846a9c1a49f839b851ca82bdede36ca0d621a82ba9fb1876ea6be79e356 -SHA512 (llvm-project.tar.gz) = d2adb502cf11bb5894e05f20759d9c42af966f9577424fcd0b5db07d509040288e803bacde17c1e366623f8be65573802f528dd586c716a6393a608943343528 -SHA512 (package-manager.tar.gz) = d9511bf98f677ebba4c321e107861e032eaeb7f9950335201895acfbcb13ffaa4c9fcfbadac4aae7712ae9218b3f085aede9295740d14e9a9d8c07e02b853c9c +SHA512 (cmark.tar.gz) = a1529cc518f878adfd6fd7a44450b6dc89aa395e5715e0d35f8256521ab924f8da47e2f8bbbd1182ae36436f1953fa5fed18c107a8c530bffdb9d03728908419 +SHA512 (corelibs-foundation.tar.gz) = 4f0474ccb8502a24985b2f314332323f32740b6127f3669c6c0b63d429589da377012595b53c9e242515df3ab436f67f7865f05eeec1486872796943ec79eddd +SHA512 (corelibs-libdispatch.tar.gz) = 96ea68c41a3e5460efe612cdea2277f34df38ca2896d78c89fed0edd65376bcd2f543263775aeee2f8ac6922864bcae9dceaa49fcc8142a61a82ec69f7288057 +SHA512 (corelibs-xctest.tar.gz) = 5a6d0aed7d03a78352c3496f12586d83e61339bf01d198bd49700a50400891495dfbae33c791316fd5ea14708c985ac5422af34b0af49a1b55d0133cfca79252 +SHA512 (indexstore-db.tar.gz) = 6763ded7b3925dbdc9ced715c73526cea96e311509842c9b94325bb87ca15832140a5af59534627f9d944cac967256d414d6bc50f2bef9b14d885fbe5d600006 +SHA512 (llbuild.tar.gz) = ba86f3429073e27ec2bb345b9b85b26a218f996c6e33d2045dcc7d98c13cbbb3dee55d2a12747250546602134daaa267ddc0944cd4d48aea02674c966ef0ab1f +SHA512 (llvm-project.tar.gz) = 2146ba56b6764902146c3b49b654e368444f9d6ebe2d6294bd505ae80899b53d00792ce25e77ae9ad1cbdb1c929faa04996e0b916b392df0271c0c8527c529e6 +SHA512 (package-manager.tar.gz) = d6ef21373389563b0bd021a61a93354345e1a43ed71d2f616b247a11ad03927c68bab345dbde9981dc8a4a1842e290a76e176ce9432651c5ddef18ac1dd6365e SHA512 (release-67-1.tar.gz) = 1b7b9b908f914a84c59f248f9d9fd5d0e72df3d9742ded10466af866d587aef410341361a6a8ba70ce1b7e99be15cedca271639e0f7d8589c968e6df0ee6ea97 -SHA512 (sourcekit-lsp.tar.gz) = 58af4e577133a65268daeed22cbbe827234be62319e5f6c6e8efb0760b3cdeac10308c55b7858b7e9f0190b0642f8cf62fce403abbc8274bd9399e84852fd8bf -SHA512 (swift-integration-tests.tar.gz) = ffdda011ce2d961a6e7182121cf52e4b2f461babc2340dae64fff5aed000d5f5f3b7a0039f01668ab1538580601c3ac3962745d80b4d7d2f227d4728b6961d1d -SHA512 (swift-syntax.tar.gz) = ba4964e22562600abdd36b01084b8bbf98b396d960d7e14ff0ead7a709c70d91fc37022a3356a41cf915ce450d35a4b5b595b838527aa0eb42a1a201c83cbcfc -SHA512 (swift-xcode-playground-support.tar.gz) = 760a3aaccd0a7587802991e98b650e1ab82cd56b45f99f787688f87020b66924a09e3032943cd7455804aa7f60a2c04f46c8184d331ea605658f473092fc8279 -SHA512 (swift.tar.gz) = 835ee9fc7689d7d9b92eda3d2458025409e574e86cdd59e4cb0e200e3d900ced26c8cf71ccbf02965989591deac9bbe43411a42947a7e47f371289cb84e42f35 +SHA512 (sourcekit-lsp.tar.gz) = 1ae05fca38626757adb32405994936bf13de3b8974d0609ed02fa7d3463615b271dd6002e01aebeddbc5751219b8e93c1e262bda54db6e851113b85757060a50 +SHA512 (swift-integration-tests.tar.gz) = 375172406bd07b4266ef1bc650de4b254dc532b64161a96d655a28b4062461683a57081bc41f0219f7926c49e928e71563dc04f0d0d3f7e0b2376c7c73c89c16 +SHA512 (swift-syntax.tar.gz) = 566e4707987c596a526b1dc85c5c2e673e21031a99952d49b31fd8672719d33cfd72ff3044fa2684b40b9bb85ba615ff8eeadf7dd963654e6db26c0678e2d498 +SHA512 (swift-xcode-playground-support.tar.gz) = 496b36eb21bd38f0f1f96b2dd381721a6d4ef413f218881b71a599cd9823d9c0a97a366f13ce1a1e2564b0696649197e01f7ec0c4d5b2fdb86d727fbb78f02f4 +SHA512 (swift.tar.gz) = 0abfa73b106fe22189808ff473fcd4e515db44acf7b1b71d9a83e5615572c3ac48f4e11d6d76e16ef04d59b94a022c80c819f516c50e29ffaf870db3d22fa32f diff --git a/swift-lang.spec b/swift-lang.spec index bed47f9..0f6748e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.3-RELEASE +%global swifttag 5.3.1-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 %global icu_version 67-1 Name: swift-lang -Version: 5.3 +Version: 5.3.1 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -36,6 +36,7 @@ Patch6: nosysctl.patch Patch7: indexstore.patch Patch8: build-setup-s390x.patch Patch9: llvm-indexstore.patch +Patch10: oldamd.patch BuildRequires: clang BuildRequires: swig @@ -148,6 +149,9 @@ mv icu-release-%{icu_version} icu # Issue with enum declaration building with Clang 11 %patch9 -p0 +# For older AMD processors +%patch10 -p0 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize @@ -193,7 +197,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog -* Mon Sep 17 2020 Ron Olson 5.3-1 +* Fri Nov 13 2020 Ron Olson 5.3.1-1 +- Updated to swift-5.3.1-RELEASE +* Thu Sep 17 2020 Ron Olson 5.3-1 - Updated to swift-5.3-RELEASE * Mon Aug 10 2020 Ron Olson 5.2.5-1 - Updated to swift-5.2.5-RELEASE From bb801367087b8ac83703d9ecfeba5382fa15ced0 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 4 Dec 2020 20:25:59 -0700 Subject: [PATCH 066/152] Fix missing #include for gcc-11 --- swift-lang-gcc11.patch | 13 +++++++++++++ swift-lang.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 swift-lang-gcc11.patch diff --git a/swift-lang-gcc11.patch b/swift-lang-gcc11.patch new file mode 100644 index 0000000..c68d05b --- /dev/null +++ b/swift-lang-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc b/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc +index dc6f93568..06f9e5e35 100644 +--- a/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc ++++ b/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc +@@ -12,6 +12,8 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + ++#include ++ + #include "benchmark_register.h" + + #ifndef BENCHMARK_OS_WINDOWS diff --git a/swift-lang.spec b/swift-lang.spec index 0f6748e..4e2557f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -37,6 +37,7 @@ Patch7: indexstore.patch Patch8: build-setup-s390x.patch Patch9: llvm-indexstore.patch Patch10: oldamd.patch +Patch11: %{name}-gcc11.patch BuildRequires: clang BuildRequires: swig @@ -152,6 +153,9 @@ mv icu-release-%{icu_version} icu # For older AMD processors %patch10 -p0 +# For gcc-11 +%patch11 -p1 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize @@ -197,6 +201,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Fri Dec 04 2020 Jeff Law 5.3.1-2 +- Fix missing #include for gcc-11 + * Fri Nov 13 2020 Ron Olson 5.3.1-1 - Updated to swift-5.3.1-RELEASE * Thu Sep 17 2020 Ron Olson 5.3-1 From d38882aaf62b2bfe671a75b95abbe65c2821738c Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 23 Dec 2020 08:36:43 -0600 Subject: [PATCH 067/152] Updated to Swift-5.3.2-RELEASE --- .gitignore | 1 + sources | 28 ++++++++++++++-------------- swift-lang.spec | 10 ++++++---- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b0b806f..ff06e18 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /swift-syntax.tar.gz /cmake-3.16.5.tar.gz /release-67-1.tar.gz +/release-68-2.tar.gz diff --git a/sources b/sources index 712e6a4..1e6ae39 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = a1529cc518f878adfd6fd7a44450b6dc89aa395e5715e0d35f8256521ab924f8da47e2f8bbbd1182ae36436f1953fa5fed18c107a8c530bffdb9d03728908419 -SHA512 (corelibs-foundation.tar.gz) = 4f0474ccb8502a24985b2f314332323f32740b6127f3669c6c0b63d429589da377012595b53c9e242515df3ab436f67f7865f05eeec1486872796943ec79eddd -SHA512 (corelibs-libdispatch.tar.gz) = 96ea68c41a3e5460efe612cdea2277f34df38ca2896d78c89fed0edd65376bcd2f543263775aeee2f8ac6922864bcae9dceaa49fcc8142a61a82ec69f7288057 -SHA512 (corelibs-xctest.tar.gz) = 5a6d0aed7d03a78352c3496f12586d83e61339bf01d198bd49700a50400891495dfbae33c791316fd5ea14708c985ac5422af34b0af49a1b55d0133cfca79252 -SHA512 (indexstore-db.tar.gz) = 6763ded7b3925dbdc9ced715c73526cea96e311509842c9b94325bb87ca15832140a5af59534627f9d944cac967256d414d6bc50f2bef9b14d885fbe5d600006 -SHA512 (llbuild.tar.gz) = ba86f3429073e27ec2bb345b9b85b26a218f996c6e33d2045dcc7d98c13cbbb3dee55d2a12747250546602134daaa267ddc0944cd4d48aea02674c966ef0ab1f -SHA512 (llvm-project.tar.gz) = 2146ba56b6764902146c3b49b654e368444f9d6ebe2d6294bd505ae80899b53d00792ce25e77ae9ad1cbdb1c929faa04996e0b916b392df0271c0c8527c529e6 -SHA512 (package-manager.tar.gz) = d6ef21373389563b0bd021a61a93354345e1a43ed71d2f616b247a11ad03927c68bab345dbde9981dc8a4a1842e290a76e176ce9432651c5ddef18ac1dd6365e -SHA512 (release-67-1.tar.gz) = 1b7b9b908f914a84c59f248f9d9fd5d0e72df3d9742ded10466af866d587aef410341361a6a8ba70ce1b7e99be15cedca271639e0f7d8589c968e6df0ee6ea97 -SHA512 (sourcekit-lsp.tar.gz) = 1ae05fca38626757adb32405994936bf13de3b8974d0609ed02fa7d3463615b271dd6002e01aebeddbc5751219b8e93c1e262bda54db6e851113b85757060a50 -SHA512 (swift-integration-tests.tar.gz) = 375172406bd07b4266ef1bc650de4b254dc532b64161a96d655a28b4062461683a57081bc41f0219f7926c49e928e71563dc04f0d0d3f7e0b2376c7c73c89c16 -SHA512 (swift-syntax.tar.gz) = 566e4707987c596a526b1dc85c5c2e673e21031a99952d49b31fd8672719d33cfd72ff3044fa2684b40b9bb85ba615ff8eeadf7dd963654e6db26c0678e2d498 -SHA512 (swift-xcode-playground-support.tar.gz) = 496b36eb21bd38f0f1f96b2dd381721a6d4ef413f218881b71a599cd9823d9c0a97a366f13ce1a1e2564b0696649197e01f7ec0c4d5b2fdb86d727fbb78f02f4 -SHA512 (swift.tar.gz) = 0abfa73b106fe22189808ff473fcd4e515db44acf7b1b71d9a83e5615572c3ac48f4e11d6d76e16ef04d59b94a022c80c819f516c50e29ffaf870db3d22fa32f +SHA512 (cmark.tar.gz) = d84cbf387d8d549278346c35334ebc571ca536a35327112dd44062365f24f659e861f4305a1c7f69e33e5a795da697a7b4b5d07c87bc4aa4bc3340e550a3975e +SHA512 (corelibs-foundation.tar.gz) = c15bfe556aeb4384286522b3180e2c748ccd815b388f161ce1dbc2e587f4f923c776620294fd09ba0561437bff84984f885748a4866d19355de1d301f89aee05 +SHA512 (corelibs-libdispatch.tar.gz) = b35decb1a2a19ec6c84df15f1673ec0d0b287cd34e78b357e5e62c8d3ea585ab5597419ce0108e56144eb64e21777065be88f0a6fd4a1f6683d201e344337cbf +SHA512 (corelibs-xctest.tar.gz) = 752c17165de5b60150bb9a5fabf1632a21e3794f9272b926e6809a4da89f791345242a16f961332374fa6be839865e34d070852263e185b5a726d14f428a0729 +SHA512 (indexstore-db.tar.gz) = c675e0a53a5c8f19ff95ed9bce3677ce24d8b9984b88f50be797857442da68f1a24b714d0329103b131189c48ba2e2c79feeabea6c9b11c57a17db4eb8097606 +SHA512 (llbuild.tar.gz) = 739a30af781d12fd127c19c9294e3471fc43e0353c0e016b97917fe02888e7faa62343176c82ac6df50ec7ab74a6c12b018ee10d2be6937eef5ed9a72ff9cff0 +SHA512 (llvm-project.tar.gz) = c1af19b3a54b5a94aefcb334965c7a21e4ac9cdd8baf6e4824528e5991eebd04932b05e6fca56c3bf35a78918e4d73731977e04c441561921430af0839731cf9 +SHA512 (package-manager.tar.gz) = 2219d44a6f26e112a4d8f2fb96a18acee0231c3622b097925b600e9b413b6695fde9cbc1357d0ca6f6a09eb15a56ac17e0b86672cda6cf193859b9a184952fc6 +SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae +SHA512 (sourcekit-lsp.tar.gz) = bf005d2e13189a9c1dde94af70755b22066cbb3093fa0446b030bbefb94e5d07cc28ac4da1e175f88cf436d00296403145803ddff20833a5112245e025da88b8 +SHA512 (swift-integration-tests.tar.gz) = 88836e8e843914c1810bb3d4d8d278eac6c25bd6b910dc51f5369fabc6d46f01f534f96c5817a7c11e438d41ca95a2f7c3f6c08db3ef406acb8998ebbbf652b0 +SHA512 (swift-syntax.tar.gz) = b49ca6df12397424ac372cd613ca6f76b0b9ed572084b254cc2abec63b0d8012af065165d051091c667816f911baf8ffea0043df3465c4dcd46aaffc8ffffcd5 +SHA512 (swift-xcode-playground-support.tar.gz) = 31b7997b3635b1e4adb882b98ad3b3922c5285301c81e02b902f63de4e4de005616e8b79cad1e98629a5fb5706f83f3496fe733a2f5051d361bb8f4152797462 +SHA512 (swift.tar.gz) = 2db000953cdb60c6a2c31db9fe835e295729fb0e05d51815b6486f1b245447a590adef037c3d8886869654185c76e023038fa96eb8a5420ad0636146819e41fc diff --git a/swift-lang.spec b/swift-lang.spec index 4e2557f..3386c93 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global swifttag 5.3.1-RELEASE +%global swifttag 5.3.2-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 -%global icu_version 67-1 +%global icu_version 68-2 Name: swift-lang -Version: 5.3.1 -Release: 2%{?dist} +Version: 5.3.2 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -201,6 +201,8 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Tue Dec 22 2020 Ron Olson 5.3.2-1 +- Updated to swift-5.3.2-RELEASE * Fri Dec 04 2020 Jeff Law 5.3.1-2 - Fix missing #include for gcc-11 From 38db9c1924d6777998714f0a7cb90ee85d61a4f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:24:10 +0000 Subject: [PATCH 068/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 3386c93..4b4233b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -201,6 +201,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 22 2020 Ron Olson 5.3.2-1 - Updated to swift-5.3.2-RELEASE * Fri Dec 04 2020 Jeff Law 5.3.1-2 From a462054082a6d255329378c9e7b0fb558b29d2bc Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 29 Jan 2021 18:57:50 -0600 Subject: [PATCH 069/152] Updated to swift-5.3.3-RELEASE --- sources | 26 +++++++++++++------------- swift-lang.spec | 9 +++++---- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sources b/sources index 1e6ae39..9a48519 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = d84cbf387d8d549278346c35334ebc571ca536a35327112dd44062365f24f659e861f4305a1c7f69e33e5a795da697a7b4b5d07c87bc4aa4bc3340e550a3975e -SHA512 (corelibs-foundation.tar.gz) = c15bfe556aeb4384286522b3180e2c748ccd815b388f161ce1dbc2e587f4f923c776620294fd09ba0561437bff84984f885748a4866d19355de1d301f89aee05 -SHA512 (corelibs-libdispatch.tar.gz) = b35decb1a2a19ec6c84df15f1673ec0d0b287cd34e78b357e5e62c8d3ea585ab5597419ce0108e56144eb64e21777065be88f0a6fd4a1f6683d201e344337cbf -SHA512 (corelibs-xctest.tar.gz) = 752c17165de5b60150bb9a5fabf1632a21e3794f9272b926e6809a4da89f791345242a16f961332374fa6be839865e34d070852263e185b5a726d14f428a0729 -SHA512 (indexstore-db.tar.gz) = c675e0a53a5c8f19ff95ed9bce3677ce24d8b9984b88f50be797857442da68f1a24b714d0329103b131189c48ba2e2c79feeabea6c9b11c57a17db4eb8097606 -SHA512 (llbuild.tar.gz) = 739a30af781d12fd127c19c9294e3471fc43e0353c0e016b97917fe02888e7faa62343176c82ac6df50ec7ab74a6c12b018ee10d2be6937eef5ed9a72ff9cff0 -SHA512 (llvm-project.tar.gz) = c1af19b3a54b5a94aefcb334965c7a21e4ac9cdd8baf6e4824528e5991eebd04932b05e6fca56c3bf35a78918e4d73731977e04c441561921430af0839731cf9 -SHA512 (package-manager.tar.gz) = 2219d44a6f26e112a4d8f2fb96a18acee0231c3622b097925b600e9b413b6695fde9cbc1357d0ca6f6a09eb15a56ac17e0b86672cda6cf193859b9a184952fc6 +SHA512 (cmark.tar.gz) = 1f74fe3b0dcdde00ac32c621f636992dbee9130e1d83e3ff4c59a68f877e64ec6df390f614d2e1b492aa1ae203601a508dcb4b75f2b3103d16c53d1e4222d936 +SHA512 (corelibs-foundation.tar.gz) = f22cc8a0aee5060b62974d6bbf9e209b3a4708d7176951165df34b1b9a05d6e20f02094b220fcda43a7e374e460184dd1280ea106c14f3cbe059cfb808520815 +SHA512 (corelibs-libdispatch.tar.gz) = b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909 +SHA512 (corelibs-xctest.tar.gz) = 888928be7e49f60c05492036e51fa985481779ea7ceeab8b1ec028c27e54a9eddfed6b4f05500c413d0795bd61b43727e2282b5b89ecd58135b1071a80fd04ca +SHA512 (indexstore-db.tar.gz) = 5bf66eaebac97f5f794f752cd06c154b007f7741775a51160aaccd599865c255026acebaee1483f9aa75b660a379f09e6d689e03fbd3fe0db61de92504a99670 +SHA512 (llbuild.tar.gz) = a3139a30d95e7215cb1e4500d052534abd7ca40446098013cddddace3c7bad60be4e164a3054842844a3f2796b9e16cfd06f0784ac8f5351a3c1922e5f8a9a0f +SHA512 (llvm-project.tar.gz) = 6dbaaa7f970b1c5a179fc0951592067f7885e50d3f04caa3a48f0d18d86f009b9609319edd3c2ea4ca4789bacd5ab32fdcb6019d6380fddd5bc43832ddec2432 +SHA512 (package-manager.tar.gz) = 2bb9b397046640ccdcab3fea296a6bee445079b4c47569b9e856cac40f6d5a96902b18683a8e3fa28f23915706ab799c1e90975e521c054328d621db11db1fb2 SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = bf005d2e13189a9c1dde94af70755b22066cbb3093fa0446b030bbefb94e5d07cc28ac4da1e175f88cf436d00296403145803ddff20833a5112245e025da88b8 -SHA512 (swift-integration-tests.tar.gz) = 88836e8e843914c1810bb3d4d8d278eac6c25bd6b910dc51f5369fabc6d46f01f534f96c5817a7c11e438d41ca95a2f7c3f6c08db3ef406acb8998ebbbf652b0 -SHA512 (swift-syntax.tar.gz) = b49ca6df12397424ac372cd613ca6f76b0b9ed572084b254cc2abec63b0d8012af065165d051091c667816f911baf8ffea0043df3465c4dcd46aaffc8ffffcd5 -SHA512 (swift-xcode-playground-support.tar.gz) = 31b7997b3635b1e4adb882b98ad3b3922c5285301c81e02b902f63de4e4de005616e8b79cad1e98629a5fb5706f83f3496fe733a2f5051d361bb8f4152797462 -SHA512 (swift.tar.gz) = 2db000953cdb60c6a2c31db9fe835e295729fb0e05d51815b6486f1b245447a590adef037c3d8886869654185c76e023038fa96eb8a5420ad0636146819e41fc +SHA512 (sourcekit-lsp.tar.gz) = fd777e0920f57c84baf215b34814822f3e980479939c07c4c22ea6dd7545971607272e93971ef8dbd395df268865a99c27e8ca3d000a60b66b5443b9085b493b +SHA512 (swift-integration-tests.tar.gz) = d1b4ca6a759406b78e70abfca8520a3a6a31a0f50c36d394daf47fedd7a70a9691cc7a52c50dbcb18e6bb00b5493fceab8c96dd5f92f0be894adcef3603ce6f0 +SHA512 (swift-syntax.tar.gz) = 0b1e0f8df787b78a8ce76087cdeae16c614564427503198c543e6761de0f6c5cc6a1c3a90deefaa0cf3ea694cd1fef5f928e67f0d3c937cd424b2eaebd180363 +SHA512 (swift-xcode-playground-support.tar.gz) = 27464efbd5150714d54f6d084e4fcb070e5de9caf831d23ac5eb0b3fed8cf3404e6d436090ff172addd2c7b01cb77bbf8594e156d05cad36b665f682d0c06acb +SHA512 (swift.tar.gz) = cf12f36b003b081ce0210484324dc38d5decc9a16ae4ae08803402c9d639431b8b0053c7b07db4043c246f7760f9597d08af07ee546b0d1be0dd5a62e1fdc98c diff --git a/swift-lang.spec b/swift-lang.spec index 4b4233b..2fe3782 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global swifttag 5.3.2-RELEASE +%global swifttag 5.3.3-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 %global icu_version 68-2 Name: swift-lang -Version: 5.3.2 -Release: 2%{?dist} +Version: 5.3.3 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -201,9 +201,10 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Thu Jan 28 2021 Ron Olson 5.3.3-1 +- Updated to swift-5.3.3-RELEASE * Wed Jan 27 2021 Fedora Release Engineering - 5.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Tue Dec 22 2020 Ron Olson 5.3.2-1 - Updated to swift-5.3.2-RELEASE * Fri Dec 04 2020 Jeff Law 5.3.1-2 From 0921e447b2be73991d3cf30b85065c60dd52b647 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:40:15 +0100 Subject: [PATCH 070/152] Rebuilt for removed libstdc++ symbol (#1937698) --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 2fe3782..c5494d6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ Name: swift-lang Version: 5.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -201,6 +201,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Tue Mar 30 2021 Jonathan Wakely - 5.3.3-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Thu Jan 28 2021 Ron Olson 5.3.3-1 - Updated to swift-5.3.3-RELEASE * Wed Jan 27 2021 Fedora Release Engineering - 5.3.2-2 From 49474493f90278be59a49de60bd4a03573d0271e Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 19 Apr 2021 13:18:32 +0200 Subject: [PATCH 071/152] BuildRequire setuptools explicitly See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools --- swift-lang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/swift-lang.spec b/swift-lang.spec index c5494d6..7846865 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -44,6 +44,7 @@ BuildRequires: swig BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel From 549d849ca9943758e5f8caf8ae15069b9a4d1ac9 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 1 May 2021 13:53:33 -0500 Subject: [PATCH 072/152] Updated to Swift 5.4-RELEASE --- .gitignore | 5 +++ build-setup-s390x.patch | 32 ----------------- indexstore.patch | 11 ------ llvm-indexstore.patch | 17 --------- nosysctl.patch | 24 ------------- oldamd.patch | 24 ------------- sources | 32 +++++++++-------- swift-build-setup.patch | 24 ------------- swift-for-fedora.patch | 46 +++++++++++++++++++++++++ swift-lang.spec | 76 +++++++++++++++++++---------------------- 10 files changed, 104 insertions(+), 187 deletions(-) delete mode 100644 build-setup-s390x.patch delete mode 100644 indexstore.patch delete mode 100644 llvm-indexstore.patch delete mode 100644 nosysctl.patch delete mode 100644 oldamd.patch delete mode 100644 swift-build-setup.patch create mode 100644 swift-for-fedora.patch diff --git a/.gitignore b/.gitignore index ff06e18..2bf6ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ /cmake-3.16.5.tar.gz /release-67-1.tar.gz /release-68-2.tar.gz +/0.3.0.tar.gz +/3.0.1.zip +/cmake-3.19.3.tar.gz +/swift-driver.tar.gz +/swift-tools-support-core.tar.gz diff --git a/build-setup-s390x.patch b/build-setup-s390x.patch deleted file mode 100644 index 83a723b..0000000 --- a/build-setup-s390x.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2020-04-11 22:32:29.178121900 +0000 -+++ swift/utils/build-presets.ini 2020-04-11 22:33:41.148121900 +0000 -@@ -736,18 +736,15 @@ - llbuild - swiftpm - xctest --libicu - libcxx - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild - install-swiftpm - install-xctest --install-libicu - install-prefix=/usr - install-libcxx - install-sourcekit-lsp -@@ -758,10 +755,8 @@ - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out - --test-installable-package - - # Build the benchmarks against the toolchain. --toolchain-benchmarks - - # Path to the root of the installation filesystem. - install-destdir=%(install_destdir)s diff --git a/indexstore.patch b/indexstore.patch deleted file mode 100644 index d3c43ab..0000000 --- a/indexstore.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur ./indexstore-db-orig/include/IndexStoreDB/Database/IDCode.h indexstore-db/include/IndexStoreDB/Database/IDCode.h ---- ./indexstore-db-orig/include/IndexStoreDB/Database/IDCode.h 2019-08-19 13:15:44.000000000 -0500 -+++ indexstore-db/include/IndexStoreDB/Database/IDCode.h 2020-01-23 16:20:05.055701686 -0600 -@@ -14,6 +14,7 @@ - #define INDEXSTOREDB_SKDATABASE_IDCODE_H - - #include -+#include - - namespace IndexStoreDB { - namespace db { diff --git a/llvm-indexstore.patch b/llvm-indexstore.patch deleted file mode 100644 index fac4669..0000000 --- a/llvm-indexstore.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- llvm-project/clang/include/indexstore/indexstore.h.orig 2020-08-30 20:56:38.552235207 -0500 -+++ llvm-project/clang/include/indexstore/indexstore.h 2020-08-30 20:58:02.746863308 -0500 -@@ -98,9 +98,11 @@ - - #define INDEXSTORE_OPTIONS_ATTRS INDEXSTORE_OPEN_ENUM_ATTR INDEXSTORE_FLAG_ENUM_ATTR - --#if defined(__has_extension) --#if __has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum) --# define INDEXSTORE_OPTIONS(_type, _name) enum INDEXSTORE_OPTIONS_ATTRS _name : _type _name; enum INDEXSTORE_OPTIONS_ATTRS _name : _type -+#if __has_feature(objc_fixed_enum) -+#ifdef __cplusplus -+# define INDEXSTORE_OPTIONS(_type, _name) enum INDEXSTORE_OPTIONS_ATTRS _name : _type -+#else -+# define INDEXSTORE_OPTIONS(_type, _name) enum _name : _type; typedef enum _name _name; enum INDEXSTORE_OPTIONS_ATTRS _name : _type - #endif - #endif - diff --git a/nosysctl.patch b/nosysctl.patch deleted file mode 100644 index a93e565..0000000 --- a/nosysctl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c ---- ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-19 22:20:35.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-24 21:29:34.742564898 -0500 -@@ -17,7 +17,7 @@ - - #if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN - #include --#if !TARGET_OS_ANDROID -+#if TARGET_OS_MAC || TARGET_OS_BSD - #include - #endif - #include -diff -Naur ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c ---- ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-19 22:20:35.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-24 21:30:07.201669760 -0500 -@@ -27,7 +27,7 @@ - - #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD - #include --#if !TARGET_OS_ANDROID -+#if TARGET_OS_MAC || TARGET_OS_BSD - #include - #endif - #include diff --git a/oldamd.patch b/oldamd.patch deleted file mode 100644 index a2e9ed8..0000000 --- a/oldamd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur ./swift-orig/cmake/modules/AddSwift.cmake ./swift/cmake/modules/AddSwift.cmake ---- ./swift-orig/cmake/modules/AddSwift.cmake 2020-10-28 15:44:53.000000000 -0500 -+++ ./swift/cmake/modules/AddSwift.cmake 2020-10-31 08:57:43.088514376 -0500 -@@ -356,7 +356,7 @@ - if("${CFLAGS_SDK}" STREQUAL "LINUX") - if(${CFLAGS_ARCH} STREQUAL x86_64) - # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic -- list(APPEND result "-march=core2") -+ list(APPEND result "-mcx16") - endif() - endif() - -diff -Naur ./swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake ./swift/stdlib/cmake/modules/AddSwiftStdlib.cmake ---- ./swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake 2020-10-28 15:44:53.000000000 -0500 -+++ ./swift/stdlib/cmake/modules/AddSwiftStdlib.cmake 2020-10-31 08:58:34.788036005 -0500 -@@ -287,7 +287,7 @@ - if("${CFLAGS_SDK}" STREQUAL "LINUX") - if(${CFLAGS_ARCH} STREQUAL x86_64) - # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic -- list(APPEND result "-march=core2") -+ list(APPEND result "-mcx16") - endif() - endif() - diff --git a/sources b/sources index 9a48519..542b6df 100644 --- a/sources +++ b/sources @@ -1,15 +1,19 @@ -SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 1f74fe3b0dcdde00ac32c621f636992dbee9130e1d83e3ff4c59a68f877e64ec6df390f614d2e1b492aa1ae203601a508dcb4b75f2b3103d16c53d1e4222d936 -SHA512 (corelibs-foundation.tar.gz) = f22cc8a0aee5060b62974d6bbf9e209b3a4708d7176951165df34b1b9a05d6e20f02094b220fcda43a7e374e460184dd1280ea106c14f3cbe059cfb808520815 -SHA512 (corelibs-libdispatch.tar.gz) = b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909 -SHA512 (corelibs-xctest.tar.gz) = 888928be7e49f60c05492036e51fa985481779ea7ceeab8b1ec028c27e54a9eddfed6b4f05500c413d0795bd61b43727e2282b5b89ecd58135b1071a80fd04ca -SHA512 (indexstore-db.tar.gz) = 5bf66eaebac97f5f794f752cd06c154b007f7741775a51160aaccd599865c255026acebaee1483f9aa75b660a379f09e6d689e03fbd3fe0db61de92504a99670 -SHA512 (llbuild.tar.gz) = a3139a30d95e7215cb1e4500d052534abd7ca40446098013cddddace3c7bad60be4e164a3054842844a3f2796b9e16cfd06f0784ac8f5351a3c1922e5f8a9a0f -SHA512 (llvm-project.tar.gz) = 6dbaaa7f970b1c5a179fc0951592067f7885e50d3f04caa3a48f0d18d86f009b9609319edd3c2ea4ca4789bacd5ab32fdcb6019d6380fddd5bc43832ddec2432 -SHA512 (package-manager.tar.gz) = 2bb9b397046640ccdcab3fea296a6bee445079b4c47569b9e856cac40f6d5a96902b18683a8e3fa28f23915706ab799c1e90975e521c054328d621db11db1fb2 +SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f +SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 +SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 +SHA512 (cmark.tar.gz) = cfff001159bf16407d9346f304190dce345e5868b4d8acf34fdb8c14529363c505967b0384026d954692a8a2a579048e8b52f1018155c7ceb3a80da965b19c90 +SHA512 (corelibs-foundation.tar.gz) = b41d67ec4b51cf5b4cf1cae5db0802e6c4f7a6eee05dc30aebb907827c9ae8eb12d79e17016c0c932b90b25318b5927a5ab53ffa1adc01b689b4a096e3cd7758 +SHA512 (corelibs-libdispatch.tar.gz) = 3aa78997dd03b86ce597bc3f031ca4fb452dbb1169f826fbce587d7d2cc5a2deb10ea9c00eaf6e89f4d486b1a8981024d1e1c5d252a4946aa1939bae733a4ff4 +SHA512 (corelibs-xctest.tar.gz) = 73371afcadf27f8795b9df04c78f3653972bc2d101256d00d7e3dd4d6f83a36fb361ed51dcb546f3fad001d06c555594a525e47900a296264e072ba9f210a9df +SHA512 (indexstore-db.tar.gz) = 612596e90dbdad98253e6e5edac1f3d5f5a40daf1d1286e6c439c549111221dc0432b87188e514c75cd5306a4abbb0e54c2a04590d321d87110cde9355a77321 +SHA512 (llbuild.tar.gz) = fe00a2dae3da8ec8e43ad430401b4e46c0bc1da2f8982e3094748f15fb0ed2f6aa4929e17514db5f552814aa363ff579fd681df2cd07d53cd828fedf68a34c95 +SHA512 (llvm-project.tar.gz) = ae851a8d79041370337e4fd393fbb820f6f377b56226e5637ba3f6f57e0670bb45502fdccb2c9c5bb4795b23f3146d98b9503cd58a4ecf774eaaabe9225262d3 +SHA512 (package-manager.tar.gz) = 577ee7ca20b886aa1283ba50237fb662ef1277996ffd6cfe17f07250da5ccaf7a12576dd138281e7b6dac20d707374065d1da8d470764f04389499d393ba4209 SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = fd777e0920f57c84baf215b34814822f3e980479939c07c4c22ea6dd7545971607272e93971ef8dbd395df268865a99c27e8ca3d000a60b66b5443b9085b493b -SHA512 (swift-integration-tests.tar.gz) = d1b4ca6a759406b78e70abfca8520a3a6a31a0f50c36d394daf47fedd7a70a9691cc7a52c50dbcb18e6bb00b5493fceab8c96dd5f92f0be894adcef3603ce6f0 -SHA512 (swift-syntax.tar.gz) = 0b1e0f8df787b78a8ce76087cdeae16c614564427503198c543e6761de0f6c5cc6a1c3a90deefaa0cf3ea694cd1fef5f928e67f0d3c937cd424b2eaebd180363 -SHA512 (swift-xcode-playground-support.tar.gz) = 27464efbd5150714d54f6d084e4fcb070e5de9caf831d23ac5eb0b3fed8cf3404e6d436090ff172addd2c7b01cb77bbf8594e156d05cad36b665f682d0c06acb -SHA512 (swift.tar.gz) = cf12f36b003b081ce0210484324dc38d5decc9a16ae4ae08803402c9d639431b8b0053c7b07db4043c246f7760f9597d08af07ee546b0d1be0dd5a62e1fdc98c +SHA512 (sourcekit-lsp.tar.gz) = be72400d4db7d88c2f136d0aa6c7f0ef3f9716fa2fb072e891245bc7f7eb896f2567310e2cc3f75b61fdc6ee48625dddfb24ee7c0407d79f64ec5778ffbb50d7 +SHA512 (swift-driver.tar.gz) = 7f1e67c65ce6ed24d7dd346a037756aa77b0b3b5422339f84ed29377642bf4457058593d1e343223451059d76002db6796327145babc05688b7183e54f183813 +SHA512 (swift-integration-tests.tar.gz) = e8da92697da71e181a00a4a392a296a17159c2e2904a228bdab0f146dbcd50817a4aa6f70d297b1aea69ec0eb9b5afdd130fb7107b9ad171264b5c33acd823d1 +SHA512 (swift-syntax.tar.gz) = a17ad1b85b195477fc2ca58b1a9a259cfabddc33ed15f92c3a88baf08a3a18eebfc3cfb8c9242b41dab0a4f16299ca113e9cee9ba2349d26da5692e1e1a0dc5e +SHA512 (swift-tools-support-core.tar.gz) = 983d0db537d49ca2541af901616b90162e086185e6280c08eb48792af6380cacce9357c47d7d51a5c954d24783eb0a534b4618ba69698b0740074204dd27aee1 +SHA512 (swift-xcode-playground-support.tar.gz) = 09adf270ff44d53c285857a35a57d8e54537f9f0c3e12823a73c7b2ab3ab5f1daeb5a6532841aab90597c967696807377f74ff0907a7bc66249af1a76b26a3e5 +SHA512 (swift.tar.gz) = 21f7e923fd0968c805450192a54dc0c52601e2b6891bfd72a7e883c9f8474395d985f05e582a77b6ffbce83d93d93045aa9021ff506be2e9dd9ed4528ab4cd76 diff --git a/swift-build-setup.patch b/swift-build-setup.patch deleted file mode 100644 index 4480202..0000000 --- a/swift-build-setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini ---- swift-orig/utils/build-presets.ini 2020-04-21 15:42:23.000000000 -0500 -+++ swift/utils/build-presets.ini 2020-04-23 09:55:05.038603369 -0500 -@@ -789,7 +789,6 @@ - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild -@@ -801,12 +800,7 @@ - install-sourcekit-lsp - build-swift-static-stdlib - build-swift-static-sdk-overlay --build-swift-stdlib-unittest-extra - --# Executes the lit tests for the installable package that is created --# Assumes the swift-integration-tests repo is checked out -- --test-installable-package - - # Build the benchmarks against the toolchain. - toolchain-benchmarks diff --git a/swift-for-fedora.patch b/swift-for-fedora.patch new file mode 100644 index 0000000..213fbf0 --- /dev/null +++ b/swift-for-fedora.patch @@ -0,0 +1,46 @@ +diff -Naur swift-orig/cmake/modules/AddSwift.cmake swift/cmake/modules/AddSwift.cmake +--- swift-orig/cmake/modules/AddSwift.cmake 2021-01-11 09:24:03.000000000 -0600 ++++ swift/cmake/modules/AddSwift.cmake 2021-01-14 16:07:26.118061686 -0600 +@@ -288,7 +288,7 @@ + if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64) + # this is the minimum architecture that supports 16 byte CAS, which is + # necessary to avoid a dependency to libatomic +- target_compile_options(${target} PRIVATE -march=core2) ++ target_compile_options(${target} PRIVATE -mcx16) + endif() + endif() + +diff -Naur swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake swift/stdlib/cmake/modules/AddSwiftStdlib.cmake +--- swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake 2021-01-11 09:24:03.000000000 -0600 ++++ swift/stdlib/cmake/modules/AddSwiftStdlib.cmake 2021-01-14 16:06:49.905752127 -0600 +@@ -306,7 +306,7 @@ + if("${CFLAGS_SDK}" STREQUAL "LINUX") + if(${CFLAGS_ARCH} STREQUAL x86_64) + # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic +- list(APPEND result "-march=core2") ++ list(APPEND result "-mcx16") + endif() + endif() + +diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini +--- swift-orig/utils/build-presets.ini 2021-01-11 09:24:03.000000000 -0600 ++++ swift/utils/build-presets.ini 2021-01-14 15:42:31.063141040 -0600 +@@ -771,7 +771,6 @@ + libicu + libcxx + +-build-ninja + install-llvm + install-swift + install-lldb +@@ -787,10 +786,6 @@ + build-swift-static-sdk-overlay + build-swift-stdlib-unittest-extra + +-# Executes the lit tests for the installable package that is created +-# Assumes the swift-integration-tests repo is checked out +- +-test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks diff --git a/swift-lang.spec b/swift-lang.spec index 7846865..6e8d78f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,15 @@ %global debug_package %{nil} -%global swifttag 5.3.3-RELEASE +%global swifttag 5.4-RELEASE %global swiftbuild swift-source -%global cmake_version 3.16.5 +%global cmake_version 3.19.3 %global icu_version 68-2 +%global yams_version 3.0.1 +%global sap_version 0.3.0 Name: swift-lang -Version: 5.3.3 -Release: 2%{?dist} +Version: 5.4 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -24,32 +26,30 @@ Source8: https://github.com/apple/swift-xcode-playground-support/archive/ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz -Source13: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz -Source14: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz +Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz +Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip +Source18: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz -Patch0: swift-build-setup.patch +Patch0: swift-for-fedora.patch Patch1: compiler-rt-fuzzer.patch -Patch3: linux-tests-python-3-2.patch -Patch4: glibcpthread.patch -Patch6: nosysctl.patch -Patch7: indexstore.patch -Patch8: build-setup-s390x.patch -Patch9: llvm-indexstore.patch -Patch10: oldamd.patch -Patch11: %{name}-gcc11.patch +Patch2: linux-tests-python-3-2.patch +Patch3: glibcpthread.patch +Patch4: %{name}-gcc11.patch BuildRequires: clang BuildRequires: swig BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel -BuildRequires: libblocksruntime-static +BuildRequires: libdispatch-devel BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel @@ -98,13 +98,13 @@ correct programs easier for the developer. # Now we build our own CMake because the one in EPEL8 is too old and # we can safely build it for all platforms (though will add some time # to the whole build process) -%setup -q -c -n cmake -a 14 +%setup -q -c -n cmake -a 18 mkdir cmake-build cd cmake-build ../cmake-%{cmake_version}/bootstrap && make %endif -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -121,41 +121,30 @@ mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp mv indexstore-db-swift-%{swifttag} indexstore-db mv llvm-project-swift-%{swifttag} llvm-project mv swift-syntax-swift-%{swifttag} swift-syntax +mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core +mv swift-argument-parser-%{sap_version} swift-argument-parser +mv swift-driver-swift-%{swifttag} swift-driver # ICU mv icu-release-%{icu_version} icu +# Yams +mv Yams-%{yams_version} yams + # Since we require ninja for building, there's no sense to rebuild it just for Swift -%ifnarch s390x %patch0 -p0 -%else -# Couple other things for s390x -%patch8 -p0 -%endif # Fixes an issue with using std::thread in a vector in compiler-rt %patch1 -p0 # Python 3 is the new default so we need to make the python code work with it -%patch3 -p0 +#%patch2 -p0 # Fixes compiler issue with glibc and pthreads after 2.5.0.9000 -%patch4 -p0 - -# sys/sysctl.h has been removed -%patch6 -p0 - -# implicit include of cstdint -%patch7 -p0 - -# Issue with enum declaration building with Clang 11 -%patch9 -p0 - -# For older AMD processors -%patch10 -p0 +%patch3 -p0 # For gcc-11 -%patch11 -p1 +%patch4 -p1 # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py @@ -202,13 +191,18 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Tue Apr 27 2021 Ron Olson 5.4-1 +- Updated to swift-5.4-RELEASE +* Tue Apr 06 2021 Ron Olson 5.4-1 +- Updated to swift-5.4-DEVELOPMENT-SNAPSHOT-2021-03-25-a * Tue Mar 30 2021 Jonathan Wakely - 5.3.3-2 - Rebuilt for removed libstdc++ symbol (#1937698) - * Thu Jan 28 2021 Ron Olson 5.3.3-1 - Updated to swift-5.3.3-RELEASE * Wed Jan 27 2021 Fedora Release Engineering - 5.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Thu Jan 21 2021 Ron Olson 5.4-1 +- First working version of Swift 5.4 * Tue Dec 22 2020 Ron Olson 5.3.2-1 - Updated to swift-5.3.2-RELEASE * Fri Dec 04 2020 Jeff Law 5.3.1-2 From 69e65e866eac70d5054aeb32d9da5d83d9d61720 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:16:00 +0200 Subject: [PATCH 073/152] Rebuilt for Python 3.10 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 6e8d78f..6b1311e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -9,7 +9,7 @@ Name: swift-lang Version: 5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -191,6 +191,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Fri Jun 04 2021 Python Maint - 5.4-2 +- Rebuilt for Python 3.10 + * Tue Apr 27 2021 Ron Olson 5.4-1 - Updated to swift-5.4-RELEASE * Tue Apr 06 2021 Ron Olson 5.4-1 From f9338fd16c3f2e633cfdebeca0090d6eceeca2e5 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 10 Jun 2021 09:48:45 -0500 Subject: [PATCH 074/152] Swift 5.4.1 with RPATH workaround --- nocyclades.patch | 81 +++++++++++++++++++++ pc-circular-dependencies-optimization.patch | 59 +++++++++++++++ pc-circular-dependencies.patch | 79 ++++++++++++++++++++ sources | 30 ++++---- swift-lang.spec | 26 ++++++- 5 files changed, 258 insertions(+), 17 deletions(-) create mode 100644 nocyclades.patch create mode 100644 pc-circular-dependencies-optimization.patch create mode 100644 pc-circular-dependencies.patch diff --git a/nocyclades.patch b/nocyclades.patch new file mode 100644 index 0000000..e6fca96 --- /dev/null +++ b/nocyclades.patch @@ -0,0 +1,81 @@ +diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-06 16:48:03.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-06-01 11:22:41.912766994 -0500 +@@ -366,15 +366,6 @@ + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-06 16:48:03.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-06-01 11:24:41.465542878 -0500 +@@ -130,7 +130,6 @@ + # include + #endif + #include +-#include + #include + #include + #include +@@ -444,7 +443,6 @@ + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -810,15 +808,6 @@ + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-06 16:48:03.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-06-01 11:24:23.594426892 -0500 +@@ -981,7 +981,6 @@ + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +-extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1326,15 +1325,6 @@ + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +-extern unsigned IOCTL_CYGETDEFTHRESH; +-extern unsigned IOCTL_CYGETDEFTIMEOUT; +-extern unsigned IOCTL_CYGETMON; +-extern unsigned IOCTL_CYGETTHRESH; +-extern unsigned IOCTL_CYGETTIMEOUT; +-extern unsigned IOCTL_CYSETDEFTHRESH; +-extern unsigned IOCTL_CYSETDEFTIMEOUT; +-extern unsigned IOCTL_CYSETTHRESH; +-extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/pc-circular-dependencies-optimization.patch b/pc-circular-dependencies-optimization.patch new file mode 100644 index 0000000..a29197c --- /dev/null +++ b/pc-circular-dependencies-optimization.patch @@ -0,0 +1,59 @@ +From 14983644da3b8bbb32aa2823602e4161bf3e2ec9 Mon Sep 17 00:00:00 2001 +From: Dadoum +Date: Tue, 4 May 2021 01:06:34 +0200 +Subject: [PATCH] [PkgConfig] Cache PkgConfig and avoid reparsing multiple time + the same file. + +--- + swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift | 31 ++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +index 45d80995..558c81e7 100644 +--- a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift ++++ b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +@@ -115,6 +115,8 @@ public class LoadingContext { + + /// Information on an individual `pkg-config` supported package. + public struct PkgConfig { ++ public static var pkgConfigCache: [String: PkgConfig] = [String: PkgConfig]() ++ + /// The name of the package. + public let name: String + +@@ -179,18 +181,23 @@ public struct PkgConfig { + continue + } + +- // FIXME: This is wasteful, we should be caching the PkgConfig result. +- let pkg = try PkgConfig( +- name: dep, +- additionalSearchPaths: additionalSearchPaths, +- diagnostics: diagnostics, +- fileSystem: fileSystem, +- brewPrefix: brewPrefix, +- loadingContext: loadingContext +- ) +- +- cFlags += pkg.cFlags +- libs += pkg.libs ++ if !PkgConfig.pkgConfigCache.keys.contains(dep) { ++ PkgConfig.pkgConfigCache[dep] = try PkgConfig( ++ name: dep, ++ additionalSearchPaths: additionalSearchPaths, ++ diagnostics: diagnostics, ++ fileSystem: fileSystem, ++ brewPrefix: brewPrefix, ++ loadingContext: loadingContext ++ ) ++ } ++ ++ guard let cachedPkg = PkgConfig.pkgConfigCache[dep] else { ++ fatalError("Cannot retrieve cached pkgConfig result") ++ } ++ ++ cFlags += cachedPkg.cFlags ++ libs += cachedPkg.libs + } + + return (cFlags: cFlags, libs: libs) diff --git a/pc-circular-dependencies.patch b/pc-circular-dependencies.patch new file mode 100644 index 0000000..9c9eff2 --- /dev/null +++ b/pc-circular-dependencies.patch @@ -0,0 +1,79 @@ +From 7600334ea90f44d39a80aff85c0ec33b4d87c94f Mon Sep 17 00:00:00 2001 +From: Dadoum +Date: Sat, 16 Jan 2021 21:36:17 +0100 +Subject: [PATCH] [PkgConfig] Add checks for circular dependencies + +--- + swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift | 28 +++++++++++++++++++++++++--- + 1 file changed, 25 insertions(+), 3 deletions(-) + +diff --git a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +index 57165965..fd9a8865 100644 +--- a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift ++++ b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +@@ -104,6 +104,15 @@ public struct PCFileFinder { + } + } + ++/// Informations to track circular dependencies and other PkgConfig issues ++public class LoadingContext { ++ public init() { ++ pkgConfigStack = [String]() ++ } ++ ++ public var pkgConfigStack: [String] ++} ++ + /// Information on an individual `pkg-config` supported package. + public struct PkgConfig { + /// The name of the package. +@@ -138,8 +147,10 @@ public struct PkgConfig { + additionalSearchPaths: [AbsolutePath] = [], + diagnostics: DiagnosticsEngine, + fileSystem: FileSystem = localFileSystem, +- brewPrefix: AbsolutePath? ++ brewPrefix: AbsolutePath?, ++ loadingContext: LoadingContext = LoadingContext() + ) throws { ++ loadingContext.pkgConfigStack.append(name) + + if let path = try? AbsolutePath(validating: name) { + guard fileSystem.isFile(path) else { throw PkgConfigError.couldNotFindConfigFile(name: name) } +@@ -163,13 +174,21 @@ public struct PkgConfig { + var libs = [String]() + + for dep in dependencies { ++ let firstOccurrence = loadingContext.pkgConfigStack.firstIndex(of: dep) ++ ++ if let index = firstOccurrence { ++ diagnostics.emit(warning: "circular dependency detected while parsing \(loadingContext.pkgConfigStack[0]): \(loadingContext.pkgConfigStack[index.. ")) -> \(dep)") ++ continue ++ } ++ + // FIXME: This is wasteful, we should be caching the PkgConfig result. + let pkg = try PkgConfig( +- name: dep, ++ name: dep, + additionalSearchPaths: additionalSearchPaths, + diagnostics: diagnostics, + fileSystem: fileSystem, +- brewPrefix: brewPrefix ++ brewPrefix: brewPrefix, ++ loadingContext: loadingContext + ) + + cFlags += pkg.cFlags +@@ -184,6 +203,8 @@ public struct PkgConfig { + + self.cFlags = parser.cFlags + dependencyFlags.cFlags + privateDependencyFlags.cFlags + self.libs = parser.libs + dependencyFlags.libs ++ ++ loadingContext.pkgConfigStack.removeLast(); + } + + private static var envSearchPaths: [AbsolutePath] { +@@ -408,3 +429,4 @@ public struct PkgConfigParser { + return splits + } + } ++ diff --git a/sources b/sources index 542b6df..e081b90 100644 --- a/sources +++ b/sources @@ -1,19 +1,19 @@ SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 -SHA512 (cmark.tar.gz) = cfff001159bf16407d9346f304190dce345e5868b4d8acf34fdb8c14529363c505967b0384026d954692a8a2a579048e8b52f1018155c7ceb3a80da965b19c90 -SHA512 (corelibs-foundation.tar.gz) = b41d67ec4b51cf5b4cf1cae5db0802e6c4f7a6eee05dc30aebb907827c9ae8eb12d79e17016c0c932b90b25318b5927a5ab53ffa1adc01b689b4a096e3cd7758 -SHA512 (corelibs-libdispatch.tar.gz) = 3aa78997dd03b86ce597bc3f031ca4fb452dbb1169f826fbce587d7d2cc5a2deb10ea9c00eaf6e89f4d486b1a8981024d1e1c5d252a4946aa1939bae733a4ff4 -SHA512 (corelibs-xctest.tar.gz) = 73371afcadf27f8795b9df04c78f3653972bc2d101256d00d7e3dd4d6f83a36fb361ed51dcb546f3fad001d06c555594a525e47900a296264e072ba9f210a9df -SHA512 (indexstore-db.tar.gz) = 612596e90dbdad98253e6e5edac1f3d5f5a40daf1d1286e6c439c549111221dc0432b87188e514c75cd5306a4abbb0e54c2a04590d321d87110cde9355a77321 -SHA512 (llbuild.tar.gz) = fe00a2dae3da8ec8e43ad430401b4e46c0bc1da2f8982e3094748f15fb0ed2f6aa4929e17514db5f552814aa363ff579fd681df2cd07d53cd828fedf68a34c95 -SHA512 (llvm-project.tar.gz) = ae851a8d79041370337e4fd393fbb820f6f377b56226e5637ba3f6f57e0670bb45502fdccb2c9c5bb4795b23f3146d98b9503cd58a4ecf774eaaabe9225262d3 -SHA512 (package-manager.tar.gz) = 577ee7ca20b886aa1283ba50237fb662ef1277996ffd6cfe17f07250da5ccaf7a12576dd138281e7b6dac20d707374065d1da8d470764f04389499d393ba4209 +SHA512 (cmark.tar.gz) = e76592081cc11048717e8fcb48772605a4d1d9ebdc81b967a8085721516e2414328818a6b5c0078c6b20e8a79b77d6dd749d5cd3017626603417818e85186d12 +SHA512 (corelibs-foundation.tar.gz) = 90c9a76418cd5ac111b3a23885c34aed19f35ede94d048625843bf46004f0f6368cc29827ea5555010f5dbf3f97ee59f2a3a21fbb3353f81c06f4809dd65f689 +SHA512 (corelibs-libdispatch.tar.gz) = a6ce5381d3776db5884ed691e2c22c0563da69cd3925c10f9de089a7f0e33dcbaec9d3afea4d58fa5cae819d104f9db7e81241b31ccc1bf8218d7923b2811a62 +SHA512 (corelibs-xctest.tar.gz) = 30eff653a1fed9113fb12ee5a5e2a0d60bf6e713fc280ebd4e7b17389d9088d8fa1c187eb7fcd290cc205ab1930f8ff3e97ffcf1864412ad946588c4180bc2db +SHA512 (indexstore-db.tar.gz) = c2ac11c9d9f987f2c3827ed89a7dc104c8ec18cf9fc53dc2b8762c23a27c8a1af1b70421391ac8dbd1663f44f565e56ec6843e750063fc9a6219a30dec465627 +SHA512 (llbuild.tar.gz) = 007f2632bf7295b658d1e331cea3c6475f1e07fbb674fee8fe2cb459a6a89b9fde45549e9d512c4e3130908b121e74e5022cdfda2486b5b6c2e421ce82e4e7ba +SHA512 (llvm-project.tar.gz) = ac4854d64ca881c81e82b23976f66963468766d6feff205e3336cafebb5e9ac1d96ba6fb856a4dcd1d4ec931d4d6cb40338f66ad08f0a79080f991ee90d676ca +SHA512 (package-manager.tar.gz) = 8d0e271c2b7f3d507279713b3c57eb54ad6081908e756176109cc91831386185bd79c9a233274573a47ca76ada845d30c782373a51d1442c94325839447f8ed8 SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = be72400d4db7d88c2f136d0aa6c7f0ef3f9716fa2fb072e891245bc7f7eb896f2567310e2cc3f75b61fdc6ee48625dddfb24ee7c0407d79f64ec5778ffbb50d7 -SHA512 (swift-driver.tar.gz) = 7f1e67c65ce6ed24d7dd346a037756aa77b0b3b5422339f84ed29377642bf4457058593d1e343223451059d76002db6796327145babc05688b7183e54f183813 -SHA512 (swift-integration-tests.tar.gz) = e8da92697da71e181a00a4a392a296a17159c2e2904a228bdab0f146dbcd50817a4aa6f70d297b1aea69ec0eb9b5afdd130fb7107b9ad171264b5c33acd823d1 -SHA512 (swift-syntax.tar.gz) = a17ad1b85b195477fc2ca58b1a9a259cfabddc33ed15f92c3a88baf08a3a18eebfc3cfb8c9242b41dab0a4f16299ca113e9cee9ba2349d26da5692e1e1a0dc5e -SHA512 (swift-tools-support-core.tar.gz) = 983d0db537d49ca2541af901616b90162e086185e6280c08eb48792af6380cacce9357c47d7d51a5c954d24783eb0a534b4618ba69698b0740074204dd27aee1 -SHA512 (swift-xcode-playground-support.tar.gz) = 09adf270ff44d53c285857a35a57d8e54537f9f0c3e12823a73c7b2ab3ab5f1daeb5a6532841aab90597c967696807377f74ff0907a7bc66249af1a76b26a3e5 -SHA512 (swift.tar.gz) = 21f7e923fd0968c805450192a54dc0c52601e2b6891bfd72a7e883c9f8474395d985f05e582a77b6ffbce83d93d93045aa9021ff506be2e9dd9ed4528ab4cd76 +SHA512 (sourcekit-lsp.tar.gz) = aef385e4bbd2c26a93c152899cf0d72c92465198789e008bb02df66fb4cc330d18f5c01ccb024c5820ea0c6d00476ec5afb9c42a27214d51e119ca76c3ea05ba +SHA512 (swift-driver.tar.gz) = 635eb54fa08efc8b949bf05094b77a671f8217ea35411402cb0961da04cfcf07c221f467c4c6214db3301a95ecc106f1253517f9ebac9dd5bb621cf95d03e5b6 +SHA512 (swift-integration-tests.tar.gz) = 5c6a561cac74750861ed3b5a15344f691082540422dfc69fa85824067f94cb1666fffadb16fa1d660322bb829a7eb7d2d6780f66cbbbf9bb5effad6d755faae9 +SHA512 (swift-syntax.tar.gz) = efa9d36b4bd1c0a2cf629b604caa3f755570c5f184423194574cc83fda890ae5df9e6649fb85271102e61502c4988113a82aacc964bf0dbda758c2363c3c1fa1 +SHA512 (swift-tools-support-core.tar.gz) = 9e36886bd08021e5a47006b22a8f4ad16b58fa46d9c4a7f4658780ed7390153ff3df9ad6278ef211415399817ba507d1f05d2311d68c153eaf8a7dc500d60e44 +SHA512 (swift-xcode-playground-support.tar.gz) = aabe4671de5552b531c96611a2a364d3dde124083b73be10327b4ce20845c8dc57675dc7d59d44500bb4d8babf4d9dcf272c45d1f2fc34f68d84ede64d206c26 +SHA512 (swift.tar.gz) = 50417cb4c1e72594eb156671b2145e14e321f9b2cc8c12d322f9a2edf8415f60e26481ecd47f81a6727d6fbc15864c687e3e65e74f4bfda10e689b41249c2a02 diff --git a/swift-lang.spec b/swift-lang.spec index 6e8d78f..2168e7a 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global swifttag 5.4-RELEASE +%global swifttag 5.4.1-RELEASE %global swiftbuild swift-source %global cmake_version 3.19.3 %global icu_version 68-2 @@ -8,7 +8,7 @@ Name: swift-lang -Version: 5.4 +Version: 5.4.1 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -39,6 +39,9 @@ Patch1: compiler-rt-fuzzer.patch Patch2: linux-tests-python-3-2.patch Patch3: glibcpthread.patch Patch4: %{name}-gcc11.patch +Patch5: pc-circular-dependencies.patch +Patch6: pc-circular-dependencies-optimization.patch +Patch7: nocyclades.patch BuildRequires: clang BuildRequires: swig @@ -146,6 +149,15 @@ mv Yams-%{yams_version} yams # For gcc-11 %patch4 -p1 +# Fixes swift build crashing when there is a circular dependency between PkgConfig files +%patch5 -p1 + +# Cache PkgConfig and avoid reparsing multiple time the same file. +%patch6 -p1 + +# Remove Cyclades from LLVM as it's been removed from the linux kernel +%patch7 -p0 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize @@ -176,6 +188,10 @@ ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-l mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 +# This is to fix an issue with check-rpaths complaining about +# how the Swift binaries use RPATH +export QA_SKIP_RPATHS=1 + %files %license swift/LICENSE.txt @@ -191,6 +207,12 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Tue Jun 01 2021 Ron Olson 5.4.1-1 +- Added patch to remove Cyclades from LLVM +* Fri May 28 2021 Jesús Abelardo Saldívar Aguilar 5.4.1-1 +- Added patches to fix circular dependency on PkgConfig +* Thu May 27 2021 Ron Olson 5.4.1-1 +- Updated to swift-5.4.1-RELEASE * Tue Apr 27 2021 Ron Olson 5.4-1 - Updated to swift-5.4-RELEASE * Tue Apr 06 2021 Ron Olson 5.4-1 From ed3ca2d5ae4e97c9f2f4c64a0d669e6df41b2bdc Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 22 Jun 2021 13:30:00 -0500 Subject: [PATCH 075/152] Swift 5.4.1 --- sources | 1 - swift-lang.spec | 34 +++++++++------------------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/sources b/sources index e081b90..4ebc919 100644 --- a/sources +++ b/sources @@ -1,6 +1,5 @@ SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 -SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 SHA512 (cmark.tar.gz) = e76592081cc11048717e8fcb48772605a4d1d9ebdc81b967a8085721516e2414328818a6b5c0078c6b20e8a79b77d6dd749d5cd3017626603417818e85186d12 SHA512 (corelibs-foundation.tar.gz) = 90c9a76418cd5ac111b3a23885c34aed19f35ede94d048625843bf46004f0f6368cc29827ea5555010f5dbf3f97ee59f2a3a21fbb3353f81c06f4809dd65f689 SHA512 (corelibs-libdispatch.tar.gz) = a6ce5381d3776db5884ed691e2c22c0563da69cd3925c10f9de089a7f0e33dcbaec9d3afea4d58fa5cae819d104f9db7e81241b31ccc1bf8218d7923b2811a62 diff --git a/swift-lang.spec b/swift-lang.spec index 409165d..7a37274 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,6 @@ %global debug_package %{nil} %global swifttag 5.4.1-RELEASE %global swiftbuild swift-source -%global cmake_version 3.19.3 %global icu_version 68-2 %global yams_version 3.0.1 %global sap_version 0.3.0 @@ -9,7 +8,7 @@ Name: swift-lang Version: 5.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -32,7 +31,6 @@ Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}. Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip -Source18: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: swift-for-fedora.patch Patch1: compiler-rt-fuzzer.patch @@ -65,13 +63,12 @@ BuildRequires: /usr/bin/pathfix.py BuildRequires: make BuildRequires: openssl-devel BuildRequires: cmake +%if 0%{!?el8} +BuildRequires: python-unversioned-command +%endif Requires: glibc-devel -%if 0%{?fedora} >= 31 Requires: binutils-gold -%else -Requires: binutils -%endif Requires: gcc Requires: ncurses-devel Requires: ncurses-compat-libs @@ -80,7 +77,6 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} Obsoletes: %{name}-runtime < %{version}-%{release} - ExclusiveArch: x86_64 aarch64 @@ -97,16 +93,6 @@ correct programs easier for the developer. %prep -%if 0%{?el8} -# Now we build our own CMake because the one in EPEL8 is too old and -# we can safely build it for all platforms (though will add some time -# to the whole build process) -%setup -q -c -n cmake -a 18 -mkdir cmake-build -cd cmake-build -../cmake-%{cmake_version}/bootstrap && make -%endif - %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is @@ -164,14 +150,12 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/h %build export VERBOSE=1 -# We may not have /usr/bin/python, so we roll our own -# because the build script expects there to be one. +# Before Fedora 34, we may not have /usr/bin/python, so we +# roll our own because the build script expects there to be one. +%if 0%{?fedora} < 34 || 0%{?el8} mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH -%if 0%{?el8} -# And for CMake, which we built first -export PATH=$PWD/../cmake/cmake-build/bin:$PATH %endif # Here we go! @@ -207,6 +191,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Jun 21 2021 Ron Olson - 5.4.1-2 +- Changes for EPEL-8 * Thu Jun 10 2021 Ron Olson - 5.4.1-1 - Added fix for RPATH problems * Fri Jun 04 2021 Python Maint - 5.4-2 @@ -217,8 +203,6 @@ export QA_SKIP_RPATHS=1 - Added patches to fix circular dependency on PkgConfig * Thu May 27 2021 Ron Olson 5.4.1-1 - Updated to swift-5.4.1-RELEASE -* Fri Jun 04 2021 Python Maint - 5.4-2 -- Rebuilt for Python 3.10 * Tue Apr 27 2021 Ron Olson 5.4-1 - Updated to swift-5.4-RELEASE * Tue Apr 06 2021 Ron Olson 5.4-1 From d50b7502371e4fc31de1fa18b5a3079696964f5e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 6 Jul 2021 12:48:27 -0500 Subject: [PATCH 076/152] Updated to Swift 5.4.2-RELEASE --- implicit_fallthru.patch | 112 ---------------------------------------- sources | 30 +++++------ swift-lang.spec | 10 ++-- 3 files changed, 21 insertions(+), 131 deletions(-) delete mode 100644 implicit_fallthru.patch diff --git a/implicit_fallthru.patch b/implicit_fallthru.patch deleted file mode 100644 index abcec31..0000000 --- a/implicit_fallthru.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -Naur swift-corelibs-libdispatch-orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c ---- swift-corelibs-libdispatch-orig/src/event/event_epoll.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/event/event_epoll.c 2020-03-11 16:06:21.182865901 -0500 -@@ -174,6 +174,9 @@ - } - case EVFILT_WRITE: - filter = EVFILT_READ; -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case EVFILT_READ: - if (fstat(fd, &sb) < 0) { - return NULL; -diff -Naur swift-corelibs-libdispatch-orig/src/io.c swift-corelibs-libdispatch/src/io.c ---- swift-corelibs-libdispatch-orig/src/io.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/io.c 2020-03-11 16:08:45.344481709 -0500 -@@ -2086,11 +2086,17 @@ - case DISPATCH_OP_DELIVER: - flags = DOP_DEFAULT; - // Fall through -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_OP_DELIVER_AND_COMPLETE: - flags = (flags != DOP_DEFAULT) ? DOP_DELIVER | DOP_NO_EMPTY : - DOP_DEFAULT; - _dispatch_operation_deliver_data(op, flags); - // Fall through -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_OP_COMPLETE: - if (flags != DOP_DEFAULT) { - _dispatch_stream_complete_operation(stream, op); -@@ -2103,6 +2109,9 @@ - case DISPATCH_OP_COMPLETE_RESUME: - _dispatch_stream_complete_operation(stream, op); - // Fall through -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_OP_RESUME: - if (_dispatch_stream_operation_avail(stream)) { - stream->source_running = true; -diff -Naur swift-corelibs-libdispatch-orig/src/semaphore.c swift-corelibs-libdispatch/src/semaphore.c ---- swift-corelibs-libdispatch-orig/src/semaphore.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/semaphore.c 2020-03-11 16:10:04.319558171 -0500 -@@ -118,6 +118,9 @@ - } - // Fall through and try to undo what the fast path did to - // dsema->dsema_value -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_TIME_NOW: - orig = dsema->dsema_value; - while (orig < 0) { -@@ -128,6 +131,9 @@ - } - // Another thread called semaphore_signal(). - // Fall through and drain the wakeup. -+ #if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case DISPATCH_TIME_FOREVER: - _dispatch_sema4_wait(&dsema->dsema_sema); - break; -diff -Naur swift-corelibs-libdispatch-orig/src/shims/lock.c swift-corelibs-libdispatch/src/shims/lock.c ---- swift-corelibs-libdispatch-orig/src/shims/lock.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/shims/lock.c 2020-03-11 16:10:55.045534383 -0500 -@@ -428,8 +428,17 @@ - continue; - } - /* FALLTHROUGH */ -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case ETIMEDOUT: -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case EFAULT: -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case EWOULDBLOCK: - return errno; - default: -diff -Naur swift-corelibs-libdispatch-orig/src/transform.c swift-corelibs-libdispatch/src/transform.c ---- swift-corelibs-libdispatch-orig/src/transform.c 2019-07-31 17:58:26.000000000 -0500 -+++ swift-corelibs-libdispatch/src/transform.c 2020-03-11 16:11:47.034560632 -0500 -@@ -781,11 +781,20 @@ - case 1: - *ptr++ = '='; // c - *ptr++ = '='; // d -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case 2: - *ptr++ = '='; // e -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case 3: - *ptr++ = '='; // f - *ptr++ = '='; // g -+#if __clang_major__ >= 10 -+ __attribute__((fallthrough)); -+ #endif - case 4: - *ptr++ = '='; // h - break; diff --git a/sources b/sources index 4ebc919..74c6f7e 100644 --- a/sources +++ b/sources @@ -1,18 +1,18 @@ SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 -SHA512 (cmark.tar.gz) = e76592081cc11048717e8fcb48772605a4d1d9ebdc81b967a8085721516e2414328818a6b5c0078c6b20e8a79b77d6dd749d5cd3017626603417818e85186d12 -SHA512 (corelibs-foundation.tar.gz) = 90c9a76418cd5ac111b3a23885c34aed19f35ede94d048625843bf46004f0f6368cc29827ea5555010f5dbf3f97ee59f2a3a21fbb3353f81c06f4809dd65f689 -SHA512 (corelibs-libdispatch.tar.gz) = a6ce5381d3776db5884ed691e2c22c0563da69cd3925c10f9de089a7f0e33dcbaec9d3afea4d58fa5cae819d104f9db7e81241b31ccc1bf8218d7923b2811a62 -SHA512 (corelibs-xctest.tar.gz) = 30eff653a1fed9113fb12ee5a5e2a0d60bf6e713fc280ebd4e7b17389d9088d8fa1c187eb7fcd290cc205ab1930f8ff3e97ffcf1864412ad946588c4180bc2db -SHA512 (indexstore-db.tar.gz) = c2ac11c9d9f987f2c3827ed89a7dc104c8ec18cf9fc53dc2b8762c23a27c8a1af1b70421391ac8dbd1663f44f565e56ec6843e750063fc9a6219a30dec465627 -SHA512 (llbuild.tar.gz) = 007f2632bf7295b658d1e331cea3c6475f1e07fbb674fee8fe2cb459a6a89b9fde45549e9d512c4e3130908b121e74e5022cdfda2486b5b6c2e421ce82e4e7ba -SHA512 (llvm-project.tar.gz) = ac4854d64ca881c81e82b23976f66963468766d6feff205e3336cafebb5e9ac1d96ba6fb856a4dcd1d4ec931d4d6cb40338f66ad08f0a79080f991ee90d676ca -SHA512 (package-manager.tar.gz) = 8d0e271c2b7f3d507279713b3c57eb54ad6081908e756176109cc91831386185bd79c9a233274573a47ca76ada845d30c782373a51d1442c94325839447f8ed8 +SHA512 (cmark.tar.gz) = b1bfbd3c9a10aa98dabfa81daeca041408ed595f939ed994dd26fef794830eca9a39fe528c6e1fe247fc1ea69b3dc444dda999b6c1584fd4e58a06913aca0e5d +SHA512 (corelibs-foundation.tar.gz) = 3a61a6e3d5cf6da84b00121a8cdc351798f5b5e8829cd4897793744a42788acb9132681fe25d49f2a4dc0bd6daa2723ada425b2ebb10e4cd1ac615f2721caa70 +SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 +SHA512 (corelibs-xctest.tar.gz) = 0d67abc24de002a1c6b9884861a3ae52b5cf2fb7e2dc63ed01e2b0a92b986dc8d2f87a75692affbd92fcac1c852b502dc531e7ce64f7527f9559bd4b56c2046c +SHA512 (indexstore-db.tar.gz) = fa8c3a5e55b8698719ee12c684d640ed339df4e8effdea08e78b1a8e311e31d753788c8ed8554540bad218f5900da528621e1286ccb4d58af8b62f24624763c1 +SHA512 (llbuild.tar.gz) = 9a93fc6edb89603a4e334ed565ac61e78d12ceed8baf0d34321d0c17464e437cd43aacccd79be61c6ecbc6e9622b209299e6eae0bec79a2d098427fcd51d62da +SHA512 (llvm-project.tar.gz) = 9bad93a651ad36346614c904ef4e79d7bb5257a6edc6d79ab6cc95bb50654cc9bb359c2e3b67ecaaf4c2356cdcaaf03081deea6af8059af899a1d69f2e0e474e +SHA512 (package-manager.tar.gz) = cd7625299a10ae01c97435c6cb70cd75133446ecb62351ff92980b3899674b5e6c576e73555fee3f1960fa9bcdb3487d33145590fa5097770893b1f756826f7e SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = aef385e4bbd2c26a93c152899cf0d72c92465198789e008bb02df66fb4cc330d18f5c01ccb024c5820ea0c6d00476ec5afb9c42a27214d51e119ca76c3ea05ba -SHA512 (swift-driver.tar.gz) = 635eb54fa08efc8b949bf05094b77a671f8217ea35411402cb0961da04cfcf07c221f467c4c6214db3301a95ecc106f1253517f9ebac9dd5bb621cf95d03e5b6 -SHA512 (swift-integration-tests.tar.gz) = 5c6a561cac74750861ed3b5a15344f691082540422dfc69fa85824067f94cb1666fffadb16fa1d660322bb829a7eb7d2d6780f66cbbbf9bb5effad6d755faae9 -SHA512 (swift-syntax.tar.gz) = efa9d36b4bd1c0a2cf629b604caa3f755570c5f184423194574cc83fda890ae5df9e6649fb85271102e61502c4988113a82aacc964bf0dbda758c2363c3c1fa1 -SHA512 (swift-tools-support-core.tar.gz) = 9e36886bd08021e5a47006b22a8f4ad16b58fa46d9c4a7f4658780ed7390153ff3df9ad6278ef211415399817ba507d1f05d2311d68c153eaf8a7dc500d60e44 -SHA512 (swift-xcode-playground-support.tar.gz) = aabe4671de5552b531c96611a2a364d3dde124083b73be10327b4ce20845c8dc57675dc7d59d44500bb4d8babf4d9dcf272c45d1f2fc34f68d84ede64d206c26 -SHA512 (swift.tar.gz) = 50417cb4c1e72594eb156671b2145e14e321f9b2cc8c12d322f9a2edf8415f60e26481ecd47f81a6727d6fbc15864c687e3e65e74f4bfda10e689b41249c2a02 +SHA512 (sourcekit-lsp.tar.gz) = 6d62bdf5ef16ad2bebacbbc3d9f7157267059bb019013c951522151dffbe08b3ae9d0ca33e79a16c9423bb42da0b329cd708d23c0fd52074a919a4fdbc64103d +SHA512 (swift-driver.tar.gz) = b6923dd55e867eb30b48561c2e153400a0fd77c81b746fcc07683319f26e425b7a724311410fbdfe03e7fdbdef10ca034810b5e31ab032f551421b29b5c4be08 +SHA512 (swift-integration-tests.tar.gz) = 62e9e72dd38066bbc5ac4b52e6e38b630202d05dbec4b78dee7667972ffb81f24aa86392f881fa99f439901df86d32808a3b394676c7f7fa9a905b1efde1edbe +SHA512 (swift-syntax.tar.gz) = fc15a85c53eeb89f6610c4dafadc92e5fba5d123dd3cd05ca41d22906c079be66c5adf4d01ae5ef775ebcc008a645a388378e6f2649fc4ab4db3dedf7586f39b +SHA512 (swift-tools-support-core.tar.gz) = fc26a81b9d581fc9e79cc6a557dd95af887bf8b06d70fa102d8b3cc5698a72e82c42bb90c2bc43ca2c231c5274da3ebbd1c497bf978f21dc9a66d4e1b4a64f43 +SHA512 (swift-xcode-playground-support.tar.gz) = f13e3cf1e43f97060e012edad1ded9250a40d07894a7026e676bb3b223e4d248f7b830f1897a3b6e98abef9fad43fb63832dad11eda36e8d8c5042017583e220 +SHA512 (swift.tar.gz) = d0cc82d20e19339c2716613ede93209890c3c86b6f23ffe45c640fe7b1f39ea2d6e8fe982b71838d34b787a4249d654d5f2d2a71e6594766fc32eaadb5c15204 diff --git a/swift-lang.spec b/swift-lang.spec index 7a37274..7d73981 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global swifttag 5.4.1-RELEASE +%global swifttag 5.4.2-RELEASE %global swiftbuild swift-source %global icu_version 68-2 %global yams_version 3.0.1 @@ -7,8 +7,8 @@ Name: swift-lang -Version: 5.4.1 -Release: 2%{?dist} +Version: 5.4.2 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -63,7 +63,7 @@ BuildRequires: /usr/bin/pathfix.py BuildRequires: make BuildRequires: openssl-devel BuildRequires: cmake -%if 0%{!?el8} +%if ! 0%{?el8} BuildRequires: python-unversioned-command %endif @@ -191,6 +191,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Jul 05 2021 Ron Olson - 5.4.2-1 +- Updated to swift-5.4.2-RELEASE * Mon Jun 21 2021 Ron Olson - 5.4.1-2 - Changes for EPEL-8 * Thu Jun 10 2021 Ron Olson - 5.4.1-1 From bc397dc2b30129f8651c4f31446f2fded2fcac33 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 16 Jul 2021 07:03:01 -0500 Subject: [PATCH 077/152] Fixed issue with EPEL-8 --- nocyclades.patch | 81 +++++++++++++++++++++ pc-circular-dependencies-optimization.patch | 59 +++++++++++++++ pc-circular-dependencies.patch | 79 ++++++++++++++++++++ sources | 31 ++++---- swift-lang.spec | 70 +++++++++++------- 5 files changed, 279 insertions(+), 41 deletions(-) create mode 100644 nocyclades.patch create mode 100644 pc-circular-dependencies-optimization.patch create mode 100644 pc-circular-dependencies.patch diff --git a/nocyclades.patch b/nocyclades.patch new file mode 100644 index 0000000..e6fca96 --- /dev/null +++ b/nocyclades.patch @@ -0,0 +1,81 @@ +diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-06 16:48:03.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-06-01 11:22:41.912766994 -0500 +@@ -366,15 +366,6 @@ + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-06 16:48:03.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-06-01 11:24:41.465542878 -0500 +@@ -130,7 +130,6 @@ + # include + #endif + #include +-#include + #include + #include + #include +@@ -444,7 +443,6 @@ + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -810,15 +808,6 @@ + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-06 16:48:03.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-06-01 11:24:23.594426892 -0500 +@@ -981,7 +981,6 @@ + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +-extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1326,15 +1325,6 @@ + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +-extern unsigned IOCTL_CYGETDEFTHRESH; +-extern unsigned IOCTL_CYGETDEFTIMEOUT; +-extern unsigned IOCTL_CYGETMON; +-extern unsigned IOCTL_CYGETTHRESH; +-extern unsigned IOCTL_CYGETTIMEOUT; +-extern unsigned IOCTL_CYSETDEFTHRESH; +-extern unsigned IOCTL_CYSETDEFTIMEOUT; +-extern unsigned IOCTL_CYSETTHRESH; +-extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/pc-circular-dependencies-optimization.patch b/pc-circular-dependencies-optimization.patch new file mode 100644 index 0000000..a29197c --- /dev/null +++ b/pc-circular-dependencies-optimization.patch @@ -0,0 +1,59 @@ +From 14983644da3b8bbb32aa2823602e4161bf3e2ec9 Mon Sep 17 00:00:00 2001 +From: Dadoum +Date: Tue, 4 May 2021 01:06:34 +0200 +Subject: [PATCH] [PkgConfig] Cache PkgConfig and avoid reparsing multiple time + the same file. + +--- + swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift | 31 ++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +index 45d80995..558c81e7 100644 +--- a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift ++++ b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +@@ -115,6 +115,8 @@ public class LoadingContext { + + /// Information on an individual `pkg-config` supported package. + public struct PkgConfig { ++ public static var pkgConfigCache: [String: PkgConfig] = [String: PkgConfig]() ++ + /// The name of the package. + public let name: String + +@@ -179,18 +181,23 @@ public struct PkgConfig { + continue + } + +- // FIXME: This is wasteful, we should be caching the PkgConfig result. +- let pkg = try PkgConfig( +- name: dep, +- additionalSearchPaths: additionalSearchPaths, +- diagnostics: diagnostics, +- fileSystem: fileSystem, +- brewPrefix: brewPrefix, +- loadingContext: loadingContext +- ) +- +- cFlags += pkg.cFlags +- libs += pkg.libs ++ if !PkgConfig.pkgConfigCache.keys.contains(dep) { ++ PkgConfig.pkgConfigCache[dep] = try PkgConfig( ++ name: dep, ++ additionalSearchPaths: additionalSearchPaths, ++ diagnostics: diagnostics, ++ fileSystem: fileSystem, ++ brewPrefix: brewPrefix, ++ loadingContext: loadingContext ++ ) ++ } ++ ++ guard let cachedPkg = PkgConfig.pkgConfigCache[dep] else { ++ fatalError("Cannot retrieve cached pkgConfig result") ++ } ++ ++ cFlags += cachedPkg.cFlags ++ libs += cachedPkg.libs + } + + return (cFlags: cFlags, libs: libs) diff --git a/pc-circular-dependencies.patch b/pc-circular-dependencies.patch new file mode 100644 index 0000000..9c9eff2 --- /dev/null +++ b/pc-circular-dependencies.patch @@ -0,0 +1,79 @@ +From 7600334ea90f44d39a80aff85c0ec33b4d87c94f Mon Sep 17 00:00:00 2001 +From: Dadoum +Date: Sat, 16 Jan 2021 21:36:17 +0100 +Subject: [PATCH] [PkgConfig] Add checks for circular dependencies + +--- + swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift | 28 +++++++++++++++++++++++++--- + 1 file changed, 25 insertions(+), 3 deletions(-) + +diff --git a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +index 57165965..fd9a8865 100644 +--- a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift ++++ b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift +@@ -104,6 +104,15 @@ public struct PCFileFinder { + } + } + ++/// Informations to track circular dependencies and other PkgConfig issues ++public class LoadingContext { ++ public init() { ++ pkgConfigStack = [String]() ++ } ++ ++ public var pkgConfigStack: [String] ++} ++ + /// Information on an individual `pkg-config` supported package. + public struct PkgConfig { + /// The name of the package. +@@ -138,8 +147,10 @@ public struct PkgConfig { + additionalSearchPaths: [AbsolutePath] = [], + diagnostics: DiagnosticsEngine, + fileSystem: FileSystem = localFileSystem, +- brewPrefix: AbsolutePath? ++ brewPrefix: AbsolutePath?, ++ loadingContext: LoadingContext = LoadingContext() + ) throws { ++ loadingContext.pkgConfigStack.append(name) + + if let path = try? AbsolutePath(validating: name) { + guard fileSystem.isFile(path) else { throw PkgConfigError.couldNotFindConfigFile(name: name) } +@@ -163,13 +174,21 @@ public struct PkgConfig { + var libs = [String]() + + for dep in dependencies { ++ let firstOccurrence = loadingContext.pkgConfigStack.firstIndex(of: dep) ++ ++ if let index = firstOccurrence { ++ diagnostics.emit(warning: "circular dependency detected while parsing \(loadingContext.pkgConfigStack[0]): \(loadingContext.pkgConfigStack[index.. ")) -> \(dep)") ++ continue ++ } ++ + // FIXME: This is wasteful, we should be caching the PkgConfig result. + let pkg = try PkgConfig( +- name: dep, ++ name: dep, + additionalSearchPaths: additionalSearchPaths, + diagnostics: diagnostics, + fileSystem: fileSystem, +- brewPrefix: brewPrefix ++ brewPrefix: brewPrefix, ++ loadingContext: loadingContext + ) + + cFlags += pkg.cFlags +@@ -184,6 +203,8 @@ public struct PkgConfig { + + self.cFlags = parser.cFlags + dependencyFlags.cFlags + privateDependencyFlags.cFlags + self.libs = parser.libs + dependencyFlags.libs ++ ++ loadingContext.pkgConfigStack.removeLast(); + } + + private static var envSearchPaths: [AbsolutePath] { +@@ -408,3 +429,4 @@ public struct PkgConfigParser { + return splits + } + } ++ diff --git a/sources b/sources index 542b6df..74c6f7e 100644 --- a/sources +++ b/sources @@ -1,19 +1,18 @@ SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 -SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 -SHA512 (cmark.tar.gz) = cfff001159bf16407d9346f304190dce345e5868b4d8acf34fdb8c14529363c505967b0384026d954692a8a2a579048e8b52f1018155c7ceb3a80da965b19c90 -SHA512 (corelibs-foundation.tar.gz) = b41d67ec4b51cf5b4cf1cae5db0802e6c4f7a6eee05dc30aebb907827c9ae8eb12d79e17016c0c932b90b25318b5927a5ab53ffa1adc01b689b4a096e3cd7758 -SHA512 (corelibs-libdispatch.tar.gz) = 3aa78997dd03b86ce597bc3f031ca4fb452dbb1169f826fbce587d7d2cc5a2deb10ea9c00eaf6e89f4d486b1a8981024d1e1c5d252a4946aa1939bae733a4ff4 -SHA512 (corelibs-xctest.tar.gz) = 73371afcadf27f8795b9df04c78f3653972bc2d101256d00d7e3dd4d6f83a36fb361ed51dcb546f3fad001d06c555594a525e47900a296264e072ba9f210a9df -SHA512 (indexstore-db.tar.gz) = 612596e90dbdad98253e6e5edac1f3d5f5a40daf1d1286e6c439c549111221dc0432b87188e514c75cd5306a4abbb0e54c2a04590d321d87110cde9355a77321 -SHA512 (llbuild.tar.gz) = fe00a2dae3da8ec8e43ad430401b4e46c0bc1da2f8982e3094748f15fb0ed2f6aa4929e17514db5f552814aa363ff579fd681df2cd07d53cd828fedf68a34c95 -SHA512 (llvm-project.tar.gz) = ae851a8d79041370337e4fd393fbb820f6f377b56226e5637ba3f6f57e0670bb45502fdccb2c9c5bb4795b23f3146d98b9503cd58a4ecf774eaaabe9225262d3 -SHA512 (package-manager.tar.gz) = 577ee7ca20b886aa1283ba50237fb662ef1277996ffd6cfe17f07250da5ccaf7a12576dd138281e7b6dac20d707374065d1da8d470764f04389499d393ba4209 +SHA512 (cmark.tar.gz) = b1bfbd3c9a10aa98dabfa81daeca041408ed595f939ed994dd26fef794830eca9a39fe528c6e1fe247fc1ea69b3dc444dda999b6c1584fd4e58a06913aca0e5d +SHA512 (corelibs-foundation.tar.gz) = 3a61a6e3d5cf6da84b00121a8cdc351798f5b5e8829cd4897793744a42788acb9132681fe25d49f2a4dc0bd6daa2723ada425b2ebb10e4cd1ac615f2721caa70 +SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 +SHA512 (corelibs-xctest.tar.gz) = 0d67abc24de002a1c6b9884861a3ae52b5cf2fb7e2dc63ed01e2b0a92b986dc8d2f87a75692affbd92fcac1c852b502dc531e7ce64f7527f9559bd4b56c2046c +SHA512 (indexstore-db.tar.gz) = fa8c3a5e55b8698719ee12c684d640ed339df4e8effdea08e78b1a8e311e31d753788c8ed8554540bad218f5900da528621e1286ccb4d58af8b62f24624763c1 +SHA512 (llbuild.tar.gz) = 9a93fc6edb89603a4e334ed565ac61e78d12ceed8baf0d34321d0c17464e437cd43aacccd79be61c6ecbc6e9622b209299e6eae0bec79a2d098427fcd51d62da +SHA512 (llvm-project.tar.gz) = 9bad93a651ad36346614c904ef4e79d7bb5257a6edc6d79ab6cc95bb50654cc9bb359c2e3b67ecaaf4c2356cdcaaf03081deea6af8059af899a1d69f2e0e474e +SHA512 (package-manager.tar.gz) = cd7625299a10ae01c97435c6cb70cd75133446ecb62351ff92980b3899674b5e6c576e73555fee3f1960fa9bcdb3487d33145590fa5097770893b1f756826f7e SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = be72400d4db7d88c2f136d0aa6c7f0ef3f9716fa2fb072e891245bc7f7eb896f2567310e2cc3f75b61fdc6ee48625dddfb24ee7c0407d79f64ec5778ffbb50d7 -SHA512 (swift-driver.tar.gz) = 7f1e67c65ce6ed24d7dd346a037756aa77b0b3b5422339f84ed29377642bf4457058593d1e343223451059d76002db6796327145babc05688b7183e54f183813 -SHA512 (swift-integration-tests.tar.gz) = e8da92697da71e181a00a4a392a296a17159c2e2904a228bdab0f146dbcd50817a4aa6f70d297b1aea69ec0eb9b5afdd130fb7107b9ad171264b5c33acd823d1 -SHA512 (swift-syntax.tar.gz) = a17ad1b85b195477fc2ca58b1a9a259cfabddc33ed15f92c3a88baf08a3a18eebfc3cfb8c9242b41dab0a4f16299ca113e9cee9ba2349d26da5692e1e1a0dc5e -SHA512 (swift-tools-support-core.tar.gz) = 983d0db537d49ca2541af901616b90162e086185e6280c08eb48792af6380cacce9357c47d7d51a5c954d24783eb0a534b4618ba69698b0740074204dd27aee1 -SHA512 (swift-xcode-playground-support.tar.gz) = 09adf270ff44d53c285857a35a57d8e54537f9f0c3e12823a73c7b2ab3ab5f1daeb5a6532841aab90597c967696807377f74ff0907a7bc66249af1a76b26a3e5 -SHA512 (swift.tar.gz) = 21f7e923fd0968c805450192a54dc0c52601e2b6891bfd72a7e883c9f8474395d985f05e582a77b6ffbce83d93d93045aa9021ff506be2e9dd9ed4528ab4cd76 +SHA512 (sourcekit-lsp.tar.gz) = 6d62bdf5ef16ad2bebacbbc3d9f7157267059bb019013c951522151dffbe08b3ae9d0ca33e79a16c9423bb42da0b329cd708d23c0fd52074a919a4fdbc64103d +SHA512 (swift-driver.tar.gz) = b6923dd55e867eb30b48561c2e153400a0fd77c81b746fcc07683319f26e425b7a724311410fbdfe03e7fdbdef10ca034810b5e31ab032f551421b29b5c4be08 +SHA512 (swift-integration-tests.tar.gz) = 62e9e72dd38066bbc5ac4b52e6e38b630202d05dbec4b78dee7667972ffb81f24aa86392f881fa99f439901df86d32808a3b394676c7f7fa9a905b1efde1edbe +SHA512 (swift-syntax.tar.gz) = fc15a85c53eeb89f6610c4dafadc92e5fba5d123dd3cd05ca41d22906c079be66c5adf4d01ae5ef775ebcc008a645a388378e6f2649fc4ab4db3dedf7586f39b +SHA512 (swift-tools-support-core.tar.gz) = fc26a81b9d581fc9e79cc6a557dd95af887bf8b06d70fa102d8b3cc5698a72e82c42bb90c2bc43ca2c231c5274da3ebbd1c497bf978f21dc9a66d4e1b4a64f43 +SHA512 (swift-xcode-playground-support.tar.gz) = f13e3cf1e43f97060e012edad1ded9250a40d07894a7026e676bb3b223e4d248f7b830f1897a3b6e98abef9fad43fb63832dad11eda36e8d8c5042017583e220 +SHA512 (swift.tar.gz) = d0cc82d20e19339c2716613ede93209890c3c86b6f23ffe45c640fe7b1f39ea2d6e8fe982b71838d34b787a4249d654d5f2d2a71e6594766fc32eaadb5c15204 diff --git a/swift-lang.spec b/swift-lang.spec index 6e8d78f..881c2e3 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,15 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.4-RELEASE +%global swifttag 5.4.2-RELEASE %global swiftbuild swift-source -%global cmake_version 3.19.3 %global icu_version 68-2 %global yams_version 3.0.1 %global sap_version 0.3.0 Name: swift-lang -Version: 5.4 -Release: 1%{?dist} +Version: 5.4.2 +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -27,18 +26,20 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag} Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip -Source18: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz Patch0: swift-for-fedora.patch Patch1: compiler-rt-fuzzer.patch Patch2: linux-tests-python-3-2.patch Patch3: glibcpthread.patch Patch4: %{name}-gcc11.patch +Patch5: pc-circular-dependencies.patch +Patch6: pc-circular-dependencies-optimization.patch +Patch7: nocyclades.patch BuildRequires: clang BuildRequires: swig @@ -62,12 +63,15 @@ BuildRequires: /usr/bin/pathfix.py BuildRequires: make BuildRequires: openssl-devel BuildRequires: cmake +%if ! 0%{?el8} +BuildRequires: python-unversioned-command +%endif Requires: glibc-devel -%if 0%{?fedora} >= 31 -Requires: binutils-gold -%else +%if ! 0%{?el8} Requires: binutils +%else +Requires: binutils-gold %endif Requires: gcc Requires: ncurses-devel @@ -77,7 +81,6 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} Obsoletes: %{name}-runtime < %{version}-%{release} - ExclusiveArch: x86_64 aarch64 @@ -94,16 +97,6 @@ correct programs easier for the developer. %prep -%if 0%{?el8} -# Now we build our own CMake because the one in EPEL8 is too old and -# we can safely build it for all platforms (though will add some time -# to the whole build process) -%setup -q -c -n cmake -a 18 -mkdir cmake-build -cd cmake-build -../cmake-%{cmake_version}/bootstrap && make -%endif - %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is @@ -146,20 +139,27 @@ mv Yams-%{yams_version} yams # For gcc-11 %patch4 -p1 +# Fixes swift build crashing when there is a circular dependency between PkgConfig files +%patch5 -p1 + +# Cache PkgConfig and avoid reparsing multiple time the same file. +%patch6 -p1 + +# Remove Cyclades from LLVM as it's been removed from the linux kernel +%patch7 -p0 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize %build export VERBOSE=1 -# We may not have /usr/bin/python, so we roll our own -# because the build script expects there to be one. +# Before Fedora 34, we may not have /usr/bin/python, so we +# roll our own because the build script expects there to be one. +%if 0%{?fedora} < 34 || 0%{?el8} mkdir $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH -%if 0%{?el8} -# And for CMake, which we built first -export PATH=$PWD/../cmake/cmake-build/bin:$PATH %endif # Here we go! @@ -176,6 +176,10 @@ ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-l mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 +# This is to fix an issue with check-rpaths complaining about +# how the Swift binaries use RPATH +export QA_SKIP_RPATHS=1 + %files %license swift/LICENSE.txt @@ -191,6 +195,22 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog +* Thu Jul 15 2021 Ron Olson - 5.4.2-2 +- Discovered that EPEL-8 doesn't have binutils-gold +* Mon Jul 05 2021 Ron Olson - 5.4.2-1 +- Updated to swift-5.4.2-RELEASE +* Mon Jun 21 2021 Ron Olson - 5.4.1-2 +- Changes for EPEL-8 +* Thu Jun 10 2021 Ron Olson - 5.4.1-1 +- Added fix for RPATH problems +* Fri Jun 04 2021 Python Maint - 5.4-2 +- Rebuilt for Python 3.10 +* Tue Jun 01 2021 Ron Olson 5.4.1-1 +- Added patch to remove Cyclades from LLVM +* Fri May 28 2021 Jesús Abelardo Saldívar Aguilar 5.4.1-1 +- Added patches to fix circular dependency on PkgConfig +* Thu May 27 2021 Ron Olson 5.4.1-1 +- Updated to swift-5.4.1-RELEASE * Tue Apr 27 2021 Ron Olson 5.4-1 - Updated to swift-5.4-RELEASE * Tue Apr 06 2021 Ron Olson 5.4-1 From 8658eed85baecb60652c9f538a499b24bf487557 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 17 Jul 2021 09:23:25 -0500 Subject: [PATCH 078/152] Fix for EPEL-8 --- swift-lang.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 7d73981..93dbba7 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -68,7 +68,11 @@ BuildRequires: python-unversioned-command %endif Requires: glibc-devel +%if ! 0%{?el8} Requires: binutils-gold +%else +Requires: binutils +%endif Requires: gcc Requires: ncurses-devel Requires: ncurses-compat-libs @@ -191,6 +195,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Jul 15 2021 Ron Olson - 5.4.2-2 +- Discovered that EPEL-8 doesn't have binutils-gold * Mon Jul 05 2021 Ron Olson - 5.4.2-1 - Updated to swift-5.4.2-RELEASE * Mon Jun 21 2021 Ron Olson - 5.4.1-2 From 28b8aba4aab592efc9907228ccb1b8cfdec2188c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:39:43 +0000 Subject: [PATCH 079/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 93dbba7..0ecd7f8 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -195,6 +195,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 15 2021 Ron Olson - 5.4.2-2 - Discovered that EPEL-8 doesn't have binutils-gold * Mon Jul 05 2021 Ron Olson - 5.4.2-1 From a2da44c5b48e333a45063ad1c59323c0bf493c79 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 16 Sep 2021 09:10:20 -0500 Subject: [PATCH 080/152] Updated to Swift-5.4.3-RELEASE --- .gitignore | 3 +++ sources | 36 ++++++++++++++++++------------------ swift-lang.spec | 22 ++++++++-------------- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 2bf6ff8..5ab084e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ /cmake-3.19.3.tar.gz /swift-driver.tar.gz /swift-tools-support-core.tar.gz +/0.4.1.tar.gz +/4.0.2.zip +/release-65-1.tar.gz diff --git a/sources b/sources index 74c6f7e..1fdd068 100644 --- a/sources +++ b/sources @@ -1,18 +1,18 @@ -SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f -SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 -SHA512 (cmark.tar.gz) = b1bfbd3c9a10aa98dabfa81daeca041408ed595f939ed994dd26fef794830eca9a39fe528c6e1fe247fc1ea69b3dc444dda999b6c1584fd4e58a06913aca0e5d -SHA512 (corelibs-foundation.tar.gz) = 3a61a6e3d5cf6da84b00121a8cdc351798f5b5e8829cd4897793744a42788acb9132681fe25d49f2a4dc0bd6daa2723ada425b2ebb10e4cd1ac615f2721caa70 -SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 -SHA512 (corelibs-xctest.tar.gz) = 0d67abc24de002a1c6b9884861a3ae52b5cf2fb7e2dc63ed01e2b0a92b986dc8d2f87a75692affbd92fcac1c852b502dc531e7ce64f7527f9559bd4b56c2046c -SHA512 (indexstore-db.tar.gz) = fa8c3a5e55b8698719ee12c684d640ed339df4e8effdea08e78b1a8e311e31d753788c8ed8554540bad218f5900da528621e1286ccb4d58af8b62f24624763c1 -SHA512 (llbuild.tar.gz) = 9a93fc6edb89603a4e334ed565ac61e78d12ceed8baf0d34321d0c17464e437cd43aacccd79be61c6ecbc6e9622b209299e6eae0bec79a2d098427fcd51d62da -SHA512 (llvm-project.tar.gz) = 9bad93a651ad36346614c904ef4e79d7bb5257a6edc6d79ab6cc95bb50654cc9bb359c2e3b67ecaaf4c2356cdcaaf03081deea6af8059af899a1d69f2e0e474e -SHA512 (package-manager.tar.gz) = cd7625299a10ae01c97435c6cb70cd75133446ecb62351ff92980b3899674b5e6c576e73555fee3f1960fa9bcdb3487d33145590fa5097770893b1f756826f7e -SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = 6d62bdf5ef16ad2bebacbbc3d9f7157267059bb019013c951522151dffbe08b3ae9d0ca33e79a16c9423bb42da0b329cd708d23c0fd52074a919a4fdbc64103d -SHA512 (swift-driver.tar.gz) = b6923dd55e867eb30b48561c2e153400a0fd77c81b746fcc07683319f26e425b7a724311410fbdfe03e7fdbdef10ca034810b5e31ab032f551421b29b5c4be08 -SHA512 (swift-integration-tests.tar.gz) = 62e9e72dd38066bbc5ac4b52e6e38b630202d05dbec4b78dee7667972ffb81f24aa86392f881fa99f439901df86d32808a3b394676c7f7fa9a905b1efde1edbe -SHA512 (swift-syntax.tar.gz) = fc15a85c53eeb89f6610c4dafadc92e5fba5d123dd3cd05ca41d22906c079be66c5adf4d01ae5ef775ebcc008a645a388378e6f2649fc4ab4db3dedf7586f39b -SHA512 (swift-tools-support-core.tar.gz) = fc26a81b9d581fc9e79cc6a557dd95af887bf8b06d70fa102d8b3cc5698a72e82c42bb90c2bc43ca2c231c5274da3ebbd1c497bf978f21dc9a66d4e1b4a64f43 -SHA512 (swift-xcode-playground-support.tar.gz) = f13e3cf1e43f97060e012edad1ded9250a40d07894a7026e676bb3b223e4d248f7b830f1897a3b6e98abef9fad43fb63832dad11eda36e8d8c5042017583e220 -SHA512 (swift.tar.gz) = d0cc82d20e19339c2716613ede93209890c3c86b6f23ffe45c640fe7b1f39ea2d6e8fe982b71838d34b787a4249d654d5f2d2a71e6594766fc32eaadb5c15204 +SHA512 (0.4.1.tar.gz) = 4dd115a8d98297acbe708ffab657e6e592a0835210f7db3d8544089103c0f1f61938f3f4e20b8d1aaa3caee47c54484478c6b19a9932750ee47c1e9c90933f79 +SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 +SHA512 (cmark.tar.gz) = 14b7b4b8607ba0d61d41320905a8e90d991c7657ff1cfed6472e8ea2c4187e6e8708450e31e8964b0c5e16c79527f4d4c1f18fcd39f9c8aba5fe3334bde1e798 +SHA512 (corelibs-foundation.tar.gz) = 3ad396f49cf26605db3a9172311de0108f14955d7421f04e629519b59ddfe2c15cc29d6eda2a6b9652c84193c136db35f06f507a2ace8356d507582776a16699 +SHA512 (corelibs-libdispatch.tar.gz) = 50c0c7ebcd652c389406c420742e0ba5f20ec7fb4a5122d91a63673639dc77eddbc2262a191faea706ea8c2afc335e5056713c68d7fde6819347f42ef97fdff3 +SHA512 (corelibs-xctest.tar.gz) = 0dc9f0a23fe433d29267c098e2d15ae189f1f0fb8665c9b45824c3a8714fa0a494b729436eabc37a4fa92c54c8cf10079df9a848baec01be9b74242a573e3fae +SHA512 (indexstore-db.tar.gz) = 0ea3133d93d47151a4b17d498a9537d178888c1482d851d457f7999a2faff4a876981ddfde1742ae0f68ba6935a1312cccc835cc4124039adf3b6cb2994acdab +SHA512 (llbuild.tar.gz) = f693593707b4fdfb9f38b5a35c08e3cf3e70e170a5b66f9ea05c2597a3ea43980e2eb03806c0155add86ba05650e54b430ede4a5cc26c9fbf8113fe562a89bf5 +SHA512 (llvm-project.tar.gz) = ea86cc608618ca1da34b702bcd223df8d7457eec3261d68888ded644d67fa16f2d03815c49632187316f138dc9a516e97fa60c5c8a4997e7ee84ef9dd7e90be8 +SHA512 (package-manager.tar.gz) = e1cdff08391e25963b23c222162b27a5dea34c88303e67692a0c57d23e34ddb565e57bb9a76195fb7de3d10402a9bb88964f24adab1e12365665f59436a011d1 +SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 +SHA512 (sourcekit-lsp.tar.gz) = 0c8790de81a4af6eedc9b1d1b175f8c025137059e0c822bc2a087b8e1fa1be0b28778dbf6b29b0f05c0e15bda0bc26ea35fc65a41b73341969ca83dfeece1124 +SHA512 (swift-driver.tar.gz) = 52e20a348ff9bbf7f7a942b2b4a0758c83810408cb8b0075452c1fa616058c7d3ae762eb43571f5f40e1df4194625f7c6f582f1ed02b752f8502a635107f17b3 +SHA512 (swift-integration-tests.tar.gz) = 6ccf8c9b7e7f243d33b5c8a0122396971014ce106a6335d28dd314d4a7d83330c145e796f08fa70a47179e5f61e21211d17f6b1a71ad384923f0c7c9e0ef0a14 +SHA512 (swift-syntax.tar.gz) = 737fccdaa6ef6c76decdece28cb45a7e897c014f9026dabe6a4ec4695ff9766ce56c666a0d724b36e1ad84290c11413a60085d9761f72cdab40f4312a67cb3ab +SHA512 (swift-tools-support-core.tar.gz) = f64bfd7a9c2728910899e73242e63224078fe60d149594a9ed93f619fb6b26b7acc247aea6e0c7cf52477bc7cd43dba6bd9eefdfe1453745b6e37319d951d218 +SHA512 (swift-xcode-playground-support.tar.gz) = 514bb25a6c6ee57a12424909a0000b623222e60b624ea23ce92fb4f812db725efbffb01ed8dd6b5d731d0210f2e75644d197f18db3269133e93f5e354846675b +SHA512 (swift.tar.gz) = e3746a58b40f83dfe8b08c80bff1b8535c98081524bb2d82df3e5f2e282918d0f881a8820dea8addfd8710b4d1c7a943f0732dc9461a72d9bc5695506aca3df0 diff --git a/swift-lang.spec b/swift-lang.spec index 585e459..b5ad71d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.4.2-RELEASE +%global swifttag 5.4.3-RELEASE %global swiftbuild swift-source -%global icu_version 68-2 -%global yams_version 3.0.1 -%global sap_version 0.3.0 +%global icu_version 65-1 +%global yams_version 4.0.2 +%global sap_version 0.4.1 Name: swift-lang -Version: 5.4.2 -Release: 3%{?dist} +Version: 5.4.3 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -69,14 +69,9 @@ BuildRequires: python-unversioned-command Requires: glibc-devel %if ! 0%{?el8} -<<<<<<< HEAD -======= Requires: binutils-gold %else ->>>>>>> 28b8aba4aab592efc9907228ccb1b8cfdec2188c Requires: binutils -%else -Requires: binutils-gold %endif Requires: gcc Requires: ncurses-devel @@ -200,9 +195,8 @@ export QA_SKIP_RPATHS=1 %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 5.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - +* Wed Sep 15 2021 Ron Olson - 5.4.3-1 +- Updated to swift-5.4.3-RELEASE * Thu Jul 15 2021 Ron Olson - 5.4.2-2 - Discovered that EPEL-8 doesn't have binutils-gold * Mon Jul 05 2021 Ron Olson - 5.4.2-1 From 45864e514c706219bcbe6f73eed05c9b6e8a6f2f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 16 Sep 2021 09:10:20 -0500 Subject: [PATCH 081/152] Updated to Swift-5.4.3-RELEASE --- .gitignore | 3 +++ sources | 36 ++++++++++++++++++------------------ swift-lang.spec | 22 ++++++++-------------- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 2bf6ff8..5ab084e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ /cmake-3.19.3.tar.gz /swift-driver.tar.gz /swift-tools-support-core.tar.gz +/0.4.1.tar.gz +/4.0.2.zip +/release-65-1.tar.gz diff --git a/sources b/sources index 74c6f7e..1fdd068 100644 --- a/sources +++ b/sources @@ -1,18 +1,18 @@ -SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f -SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 -SHA512 (cmark.tar.gz) = b1bfbd3c9a10aa98dabfa81daeca041408ed595f939ed994dd26fef794830eca9a39fe528c6e1fe247fc1ea69b3dc444dda999b6c1584fd4e58a06913aca0e5d -SHA512 (corelibs-foundation.tar.gz) = 3a61a6e3d5cf6da84b00121a8cdc351798f5b5e8829cd4897793744a42788acb9132681fe25d49f2a4dc0bd6daa2723ada425b2ebb10e4cd1ac615f2721caa70 -SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 -SHA512 (corelibs-xctest.tar.gz) = 0d67abc24de002a1c6b9884861a3ae52b5cf2fb7e2dc63ed01e2b0a92b986dc8d2f87a75692affbd92fcac1c852b502dc531e7ce64f7527f9559bd4b56c2046c -SHA512 (indexstore-db.tar.gz) = fa8c3a5e55b8698719ee12c684d640ed339df4e8effdea08e78b1a8e311e31d753788c8ed8554540bad218f5900da528621e1286ccb4d58af8b62f24624763c1 -SHA512 (llbuild.tar.gz) = 9a93fc6edb89603a4e334ed565ac61e78d12ceed8baf0d34321d0c17464e437cd43aacccd79be61c6ecbc6e9622b209299e6eae0bec79a2d098427fcd51d62da -SHA512 (llvm-project.tar.gz) = 9bad93a651ad36346614c904ef4e79d7bb5257a6edc6d79ab6cc95bb50654cc9bb359c2e3b67ecaaf4c2356cdcaaf03081deea6af8059af899a1d69f2e0e474e -SHA512 (package-manager.tar.gz) = cd7625299a10ae01c97435c6cb70cd75133446ecb62351ff92980b3899674b5e6c576e73555fee3f1960fa9bcdb3487d33145590fa5097770893b1f756826f7e -SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = 6d62bdf5ef16ad2bebacbbc3d9f7157267059bb019013c951522151dffbe08b3ae9d0ca33e79a16c9423bb42da0b329cd708d23c0fd52074a919a4fdbc64103d -SHA512 (swift-driver.tar.gz) = b6923dd55e867eb30b48561c2e153400a0fd77c81b746fcc07683319f26e425b7a724311410fbdfe03e7fdbdef10ca034810b5e31ab032f551421b29b5c4be08 -SHA512 (swift-integration-tests.tar.gz) = 62e9e72dd38066bbc5ac4b52e6e38b630202d05dbec4b78dee7667972ffb81f24aa86392f881fa99f439901df86d32808a3b394676c7f7fa9a905b1efde1edbe -SHA512 (swift-syntax.tar.gz) = fc15a85c53eeb89f6610c4dafadc92e5fba5d123dd3cd05ca41d22906c079be66c5adf4d01ae5ef775ebcc008a645a388378e6f2649fc4ab4db3dedf7586f39b -SHA512 (swift-tools-support-core.tar.gz) = fc26a81b9d581fc9e79cc6a557dd95af887bf8b06d70fa102d8b3cc5698a72e82c42bb90c2bc43ca2c231c5274da3ebbd1c497bf978f21dc9a66d4e1b4a64f43 -SHA512 (swift-xcode-playground-support.tar.gz) = f13e3cf1e43f97060e012edad1ded9250a40d07894a7026e676bb3b223e4d248f7b830f1897a3b6e98abef9fad43fb63832dad11eda36e8d8c5042017583e220 -SHA512 (swift.tar.gz) = d0cc82d20e19339c2716613ede93209890c3c86b6f23ffe45c640fe7b1f39ea2d6e8fe982b71838d34b787a4249d654d5f2d2a71e6594766fc32eaadb5c15204 +SHA512 (0.4.1.tar.gz) = 4dd115a8d98297acbe708ffab657e6e592a0835210f7db3d8544089103c0f1f61938f3f4e20b8d1aaa3caee47c54484478c6b19a9932750ee47c1e9c90933f79 +SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 +SHA512 (cmark.tar.gz) = 14b7b4b8607ba0d61d41320905a8e90d991c7657ff1cfed6472e8ea2c4187e6e8708450e31e8964b0c5e16c79527f4d4c1f18fcd39f9c8aba5fe3334bde1e798 +SHA512 (corelibs-foundation.tar.gz) = 3ad396f49cf26605db3a9172311de0108f14955d7421f04e629519b59ddfe2c15cc29d6eda2a6b9652c84193c136db35f06f507a2ace8356d507582776a16699 +SHA512 (corelibs-libdispatch.tar.gz) = 50c0c7ebcd652c389406c420742e0ba5f20ec7fb4a5122d91a63673639dc77eddbc2262a191faea706ea8c2afc335e5056713c68d7fde6819347f42ef97fdff3 +SHA512 (corelibs-xctest.tar.gz) = 0dc9f0a23fe433d29267c098e2d15ae189f1f0fb8665c9b45824c3a8714fa0a494b729436eabc37a4fa92c54c8cf10079df9a848baec01be9b74242a573e3fae +SHA512 (indexstore-db.tar.gz) = 0ea3133d93d47151a4b17d498a9537d178888c1482d851d457f7999a2faff4a876981ddfde1742ae0f68ba6935a1312cccc835cc4124039adf3b6cb2994acdab +SHA512 (llbuild.tar.gz) = f693593707b4fdfb9f38b5a35c08e3cf3e70e170a5b66f9ea05c2597a3ea43980e2eb03806c0155add86ba05650e54b430ede4a5cc26c9fbf8113fe562a89bf5 +SHA512 (llvm-project.tar.gz) = ea86cc608618ca1da34b702bcd223df8d7457eec3261d68888ded644d67fa16f2d03815c49632187316f138dc9a516e97fa60c5c8a4997e7ee84ef9dd7e90be8 +SHA512 (package-manager.tar.gz) = e1cdff08391e25963b23c222162b27a5dea34c88303e67692a0c57d23e34ddb565e57bb9a76195fb7de3d10402a9bb88964f24adab1e12365665f59436a011d1 +SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 +SHA512 (sourcekit-lsp.tar.gz) = 0c8790de81a4af6eedc9b1d1b175f8c025137059e0c822bc2a087b8e1fa1be0b28778dbf6b29b0f05c0e15bda0bc26ea35fc65a41b73341969ca83dfeece1124 +SHA512 (swift-driver.tar.gz) = 52e20a348ff9bbf7f7a942b2b4a0758c83810408cb8b0075452c1fa616058c7d3ae762eb43571f5f40e1df4194625f7c6f582f1ed02b752f8502a635107f17b3 +SHA512 (swift-integration-tests.tar.gz) = 6ccf8c9b7e7f243d33b5c8a0122396971014ce106a6335d28dd314d4a7d83330c145e796f08fa70a47179e5f61e21211d17f6b1a71ad384923f0c7c9e0ef0a14 +SHA512 (swift-syntax.tar.gz) = 737fccdaa6ef6c76decdece28cb45a7e897c014f9026dabe6a4ec4695ff9766ce56c666a0d724b36e1ad84290c11413a60085d9761f72cdab40f4312a67cb3ab +SHA512 (swift-tools-support-core.tar.gz) = f64bfd7a9c2728910899e73242e63224078fe60d149594a9ed93f619fb6b26b7acc247aea6e0c7cf52477bc7cd43dba6bd9eefdfe1453745b6e37319d951d218 +SHA512 (swift-xcode-playground-support.tar.gz) = 514bb25a6c6ee57a12424909a0000b623222e60b624ea23ce92fb4f812db725efbffb01ed8dd6b5d731d0210f2e75644d197f18db3269133e93f5e354846675b +SHA512 (swift.tar.gz) = e3746a58b40f83dfe8b08c80bff1b8535c98081524bb2d82df3e5f2e282918d0f881a8820dea8addfd8710b4d1c7a943f0732dc9461a72d9bc5695506aca3df0 diff --git a/swift-lang.spec b/swift-lang.spec index 585e459..b5ad71d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.4.2-RELEASE +%global swifttag 5.4.3-RELEASE %global swiftbuild swift-source -%global icu_version 68-2 -%global yams_version 3.0.1 -%global sap_version 0.3.0 +%global icu_version 65-1 +%global yams_version 4.0.2 +%global sap_version 0.4.1 Name: swift-lang -Version: 5.4.2 -Release: 3%{?dist} +Version: 5.4.3 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -69,14 +69,9 @@ BuildRequires: python-unversioned-command Requires: glibc-devel %if ! 0%{?el8} -<<<<<<< HEAD -======= Requires: binutils-gold %else ->>>>>>> 28b8aba4aab592efc9907228ccb1b8cfdec2188c Requires: binutils -%else -Requires: binutils-gold %endif Requires: gcc Requires: ncurses-devel @@ -200,9 +195,8 @@ export QA_SKIP_RPATHS=1 %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 5.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - +* Wed Sep 15 2021 Ron Olson - 5.4.3-1 +- Updated to swift-5.4.3-RELEASE * Thu Jul 15 2021 Ron Olson - 5.4.2-2 - Discovered that EPEL-8 doesn't have binutils-gold * Mon Jul 05 2021 Ron Olson - 5.4.2-1 From 53b33875a39fa9763161e8b9d552bd1113453335 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 18 Sep 2021 08:17:01 -0500 Subject: [PATCH 082/152] Updated to Swift-5.4.3-RELEASE and buildable with Clang 13 --- swift-lang.spec | 11 +++++++++-- unusedvariable.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 unusedvariable.patch diff --git a/swift-lang.spec b/swift-lang.spec index b1ba811..aaf7fb5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -8,7 +8,7 @@ Name: swift-lang Version: 5.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -26,7 +26,7 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag} Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz @@ -40,6 +40,7 @@ Patch4: %{name}-gcc11.patch Patch5: pc-circular-dependencies.patch Patch6: pc-circular-dependencies-optimization.patch Patch7: nocyclades.patch +Patch8: unusedvariable.patch BuildRequires: clang BuildRequires: swig @@ -148,10 +149,14 @@ mv Yams-%{yams_version} yams # Remove Cyclades from LLVM as it's been removed from the linux kernel %patch7 -p0 +# Fixes unused variable causing an error with -Werror +%patch8 -p0 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize + %build export VERBOSE=1 # Before Fedora 34, we may not have /usr/bin/python, so we @@ -195,6 +200,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Sep 17 2021 Ron Olson - 5.4.3-2 +- Added patch to allow building using Clang 13 * Wed Sep 15 2021 Ron Olson - 5.4.3-1 - Updated to swift-5.4.3-RELEASE * Fri Jul 23 2021 Fedora Release Engineering - 5.4.2-3 diff --git a/unusedvariable.patch b/unusedvariable.patch new file mode 100644 index 0000000..e633cd1 --- /dev/null +++ b/unusedvariable.patch @@ -0,0 +1,35 @@ +diff --color -Naur swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c +--- swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c 2021-09-17 18:40:21.684025320 -0500 +@@ -479,6 +479,7 @@ + return; // stack or GC or global + } + refcount = byref->flags & BLOCK_REFCOUNT_MASK; ++ (void)refcount; + os_assert(refcount); + if (latching_decr_int_should_deallocate(&byref->flags)) { + if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) { +diff --color -Naur swift-corelibs-libdispatch-orig/tests/bsdtestharness.c swift-corelibs-libdispatch/tests/bsdtestharness.c +--- swift-corelibs-libdispatch-orig/tests/bsdtestharness.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/tests/bsdtestharness.c 2021-09-17 18:39:05.679434477 -0500 +@@ -152,6 +152,7 @@ + assert(pid > 0); + + #if defined(__linux__) ++ (void)to; + int status; + struct rusage usage; + struct timeval tv_stop, tv_wall; +diff --color -Naur swift-corelibs-libdispatch-orig/tests/dispatch_apply.c swift-corelibs-libdispatch/tests/dispatch_apply.c +--- swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/tests/dispatch_apply.c 2021-09-17 23:38:38.107488681 -0500 +@@ -56,7 +56,8 @@ + (void)ignored; + /* prevent i and j been optimized out */ + volatile uint64_t i = 0, j = 0; +- ++ (void)i; ++ (void)j; + OSAtomicIncrement32(&busy_threads_started); + + while(!all_done) From b9c22b1ac130d552048cd100a7d6c6731df93dc5 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 22 Sep 2021 08:40:18 -0500 Subject: [PATCH 083/152] Updated to Swift 5.5-RELEASE --- .gitignore | 2 + compiler-rt-fuzzer.patch | 23 ---------- glibcpthread.patch | 11 ----- linux-tests-python-3-2.patch | 48 -------------------- nocyclades.patch | 34 +++++++-------- pc-circular-dependencies.patch | 79 --------------------------------- sources | 33 +++++++------- swift-lang-gcc11.patch | 13 ------ swift-lang.spec | 80 ++++++++++++---------------------- 9 files changed, 64 insertions(+), 259 deletions(-) delete mode 100644 compiler-rt-fuzzer.patch delete mode 100644 glibcpthread.patch delete mode 100644 linux-tests-python-3-2.patch delete mode 100644 pc-circular-dependencies.patch delete mode 100644 swift-lang-gcc11.patch diff --git a/.gitignore b/.gitignore index 5ab084e..20815f8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /0.4.1.tar.gz /4.0.2.zip /release-65-1.tar.gz +/0.4.3.tar.gz +/1.1.5.tar.gz diff --git a/compiler-rt-fuzzer.patch b/compiler-rt-fuzzer.patch deleted file mode 100644 index 19575b7..0000000 --- a/compiler-rt-fuzzer.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- llvm-project/compiler-rt/lib/fuzzer/FuzzerDriver.cpp.orig 2019-02-13 14:24:24.239239031 -0600 -+++ llvm-project/compiler-rt/lib/fuzzer/FuzzerDriver.cpp 2019-02-13 14:28:18.525530281 -0600 -@@ -248,13 +248,16 @@ - Command Cmd(Args); - Cmd.removeFlag("jobs"); - Cmd.removeFlag("workers"); -- Vector V; -+ Vector> V; - std::thread Pulse(PulseThread); - Pulse.detach(); -- for (unsigned i = 0; i < NumWorkers; i++) -- V.push_back(std::thread(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors)); -+ for (unsigned i = 0; i < NumWorkers; i++) { -+ std::shared_ptr wt(new std::thread(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors)); -+ V.push_back(wt); -+ } - for (auto &T : V) -- T.join(); -+ T->join(); -+ Vector>().swap(V); - return HasErrors ? 1 : 0; - } - diff --git a/glibcpthread.patch b/glibcpthread.patch deleted file mode 100644 index 24ce515..0000000 --- a/glibcpthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- llvm-project/compiler-rt/lib/builtins/CMakeLists.txt.orig 2019-12-11 15:39:19.537518740 -0600 -+++ llvm-project/compiler-rt/lib/builtins/CMakeLists.txt 2019-12-11 23:23:57.583292289 -0600 -@@ -537,7 +537,7 @@ - add_subdirectory(macho_embedded) - darwin_add_builtin_libraries(${BUILTIN_SUPPORTED_OS}) - else () -- set(BUILTIN_CFLAGS "") -+ set(BUILTIN_CFLAGS "-D_DEFAULT_SOURCE") - - append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) - diff --git a/linux-tests-python-3-2.patch b/linux-tests-python-3-2.patch deleted file mode 100644 index 45a1bb6..0000000 --- a/linux-tests-python-3-2.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py ---- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py 2019-10-07 17:57:28.000000000 -0500 -+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py 2020-01-29 14:05:33.991180706 -0600 -@@ -85,12 +85,12 @@ - numberOfLinesSeen = 0 - - print("Visiting lib: {}".format(lib)) -- lines = list(reversed(subprocess.check_output([args.read_elf, "-program-headers", lib]).split("\n")[:-1])) -+ lines = list(reversed(subprocess.check_output([args.read_elf, "-program-headers", lib]).split(b"\n")[:-1])) - p = ParseState() - - # Until we finish parsing or run out of lines to parse... - while len(lines) > 0: -- l = lines.pop() -+ l = lines.pop().decode("utf-8") - print("DUMP: '{}'".format(l)) - assert(p is not None) - curState = p -@@ -143,7 +143,7 @@ - "-iname", - "*.so" - ] -- return subprocess.check_output(cmd).split("\n")[:-1] -+ return subprocess.check_output(cmd).split(b"\n")[:-1] - - def main(): - parser = argparse.ArgumentParser() -@@ -154,7 +154,7 @@ - - libraries = get_libraries(args.package_path) - for l in libraries: -- process_library(args, l) -+ process_library(args, l.decode("utf-8")) - sys.exit(0) - - if __name__ == "__main__": -diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py ---- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py 2019-10-07 17:57:28.000000000 -0500 -+++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py 2020-01-29 18:35:26.953725332 -0600 -@@ -136,7 +136,7 @@ - - skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync'] - p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE) -- out, _ = p.communicate(lsp.script) -+ out, _ = p.communicate(lsp.script.encode()) - print(out) - print('') - diff --git a/nocyclades.patch b/nocyclades.patch index e6fca96..72d7f52 100644 --- a/nocyclades.patch +++ b/nocyclades.patch @@ -1,9 +1,9 @@ -diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ---- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-06 16:48:03.000000000 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-06-01 11:22:41.912766994 -0500 -@@ -366,15 +366,6 @@ +diff -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-28 10:17:04.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-31 08:19:34.794058378 -0500 +@@ -370,15 +370,6 @@ - #if SANITIZER_LINUX && !SANITIZER_ANDROID + #if SANITIZER_GLIBC // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE - _(CYGETDEFTHRESH, WRITE, sizeof(int)); - _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); @@ -17,10 +17,10 @@ diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_ _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); -diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ---- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-06 16:48:03.000000000 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-06-01 11:24:41.465542878 -0500 -@@ -130,7 +130,6 @@ +diff -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-28 10:17:04.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-31 12:30:07.414710413 -0500 +@@ -143,7 +143,6 @@ # include #endif #include @@ -28,15 +28,15 @@ diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_ #include #include #include -@@ -444,7 +443,6 @@ +@@ -459,7 +458,6 @@ - #if SANITIZER_LINUX && !SANITIZER_ANDROID + #if SANITIZER_GLIBC unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); - unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); #if EV_VERSION > (0x010000) unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); #else -@@ -810,15 +808,6 @@ +@@ -823,15 +821,6 @@ #endif // SANITIZER_LINUX #if SANITIZER_LINUX && !SANITIZER_ANDROID @@ -52,10 +52,10 @@ diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_ unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; -diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ---- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-06 16:48:03.000000000 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-06-01 11:24:23.594426892 -0500 -@@ -981,7 +981,6 @@ +diff -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-28 10:17:04.000000000 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-31 12:30:40.568693281 -0500 +@@ -983,7 +983,6 @@ #if SANITIZER_LINUX && !SANITIZER_ANDROID extern unsigned struct_ax25_parms_struct_sz; @@ -63,7 +63,7 @@ diff --color -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_ extern unsigned struct_input_keymap_entry_sz; extern unsigned struct_ipx_config_data_sz; extern unsigned struct_kbdiacrs_sz; -@@ -1326,15 +1325,6 @@ +@@ -1328,15 +1327,6 @@ #endif // SANITIZER_LINUX #if SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/pc-circular-dependencies.patch b/pc-circular-dependencies.patch deleted file mode 100644 index 9c9eff2..0000000 --- a/pc-circular-dependencies.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7600334ea90f44d39a80aff85c0ec33b4d87c94f Mon Sep 17 00:00:00 2001 -From: Dadoum -Date: Sat, 16 Jan 2021 21:36:17 +0100 -Subject: [PATCH] [PkgConfig] Add checks for circular dependencies - ---- - swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift | 28 +++++++++++++++++++++++++--- - 1 file changed, 25 insertions(+), 3 deletions(-) - -diff --git a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift -index 57165965..fd9a8865 100644 ---- a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift -+++ b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift -@@ -104,6 +104,15 @@ public struct PCFileFinder { - } - } - -+/// Informations to track circular dependencies and other PkgConfig issues -+public class LoadingContext { -+ public init() { -+ pkgConfigStack = [String]() -+ } -+ -+ public var pkgConfigStack: [String] -+} -+ - /// Information on an individual `pkg-config` supported package. - public struct PkgConfig { - /// The name of the package. -@@ -138,8 +147,10 @@ public struct PkgConfig { - additionalSearchPaths: [AbsolutePath] = [], - diagnostics: DiagnosticsEngine, - fileSystem: FileSystem = localFileSystem, -- brewPrefix: AbsolutePath? -+ brewPrefix: AbsolutePath?, -+ loadingContext: LoadingContext = LoadingContext() - ) throws { -+ loadingContext.pkgConfigStack.append(name) - - if let path = try? AbsolutePath(validating: name) { - guard fileSystem.isFile(path) else { throw PkgConfigError.couldNotFindConfigFile(name: name) } -@@ -163,13 +174,21 @@ public struct PkgConfig { - var libs = [String]() - - for dep in dependencies { -+ let firstOccurrence = loadingContext.pkgConfigStack.firstIndex(of: dep) -+ -+ if let index = firstOccurrence { -+ diagnostics.emit(warning: "circular dependency detected while parsing \(loadingContext.pkgConfigStack[0]): \(loadingContext.pkgConfigStack[index.. ")) -> \(dep)") -+ continue -+ } -+ - // FIXME: This is wasteful, we should be caching the PkgConfig result. - let pkg = try PkgConfig( -- name: dep, -+ name: dep, - additionalSearchPaths: additionalSearchPaths, - diagnostics: diagnostics, - fileSystem: fileSystem, -- brewPrefix: brewPrefix -+ brewPrefix: brewPrefix, -+ loadingContext: loadingContext - ) - - cFlags += pkg.cFlags -@@ -184,6 +203,8 @@ public struct PkgConfig { - - self.cFlags = parser.cFlags + dependencyFlags.cFlags + privateDependencyFlags.cFlags - self.libs = parser.libs + dependencyFlags.libs -+ -+ loadingContext.pkgConfigStack.removeLast(); - } - - private static var envSearchPaths: [AbsolutePath] { -@@ -408,3 +429,4 @@ public struct PkgConfigParser { - return splits - } - } -+ diff --git a/sources b/sources index 1fdd068..0a579f8 100644 --- a/sources +++ b/sources @@ -1,18 +1,19 @@ -SHA512 (0.4.1.tar.gz) = 4dd115a8d98297acbe708ffab657e6e592a0835210f7db3d8544089103c0f1f61938f3f4e20b8d1aaa3caee47c54484478c6b19a9932750ee47c1e9c90933f79 +SHA512 (0.4.3.tar.gz) = d5f4eefe7b7b215e76f8f035a2481c73fa716fe199894874122ea51a27c885ab7780647099fdbfbaebf7d8df1da1b59483d10e9fa869e26e3d34df881d14b665 +SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 -SHA512 (cmark.tar.gz) = 14b7b4b8607ba0d61d41320905a8e90d991c7657ff1cfed6472e8ea2c4187e6e8708450e31e8964b0c5e16c79527f4d4c1f18fcd39f9c8aba5fe3334bde1e798 -SHA512 (corelibs-foundation.tar.gz) = 3ad396f49cf26605db3a9172311de0108f14955d7421f04e629519b59ddfe2c15cc29d6eda2a6b9652c84193c136db35f06f507a2ace8356d507582776a16699 -SHA512 (corelibs-libdispatch.tar.gz) = 50c0c7ebcd652c389406c420742e0ba5f20ec7fb4a5122d91a63673639dc77eddbc2262a191faea706ea8c2afc335e5056713c68d7fde6819347f42ef97fdff3 -SHA512 (corelibs-xctest.tar.gz) = 0dc9f0a23fe433d29267c098e2d15ae189f1f0fb8665c9b45824c3a8714fa0a494b729436eabc37a4fa92c54c8cf10079df9a848baec01be9b74242a573e3fae -SHA512 (indexstore-db.tar.gz) = 0ea3133d93d47151a4b17d498a9537d178888c1482d851d457f7999a2faff4a876981ddfde1742ae0f68ba6935a1312cccc835cc4124039adf3b6cb2994acdab -SHA512 (llbuild.tar.gz) = f693593707b4fdfb9f38b5a35c08e3cf3e70e170a5b66f9ea05c2597a3ea43980e2eb03806c0155add86ba05650e54b430ede4a5cc26c9fbf8113fe562a89bf5 -SHA512 (llvm-project.tar.gz) = ea86cc608618ca1da34b702bcd223df8d7457eec3261d68888ded644d67fa16f2d03815c49632187316f138dc9a516e97fa60c5c8a4997e7ee84ef9dd7e90be8 -SHA512 (package-manager.tar.gz) = e1cdff08391e25963b23c222162b27a5dea34c88303e67692a0c57d23e34ddb565e57bb9a76195fb7de3d10402a9bb88964f24adab1e12365665f59436a011d1 +SHA512 (cmark.tar.gz) = 78894077b00d4f73f9d7fff04e5145a9f268be6de306b2801669107edc05985c3568ccae7d5ec347e99411afd3b45f32e36cb1a03c3429b166640884a6629f23 +SHA512 (corelibs-foundation.tar.gz) = c1ba5f9e6916799128221a9427ad0ab764e81f5bb573b248ed7b40feb85a51d6225d5c6e59d8a2084d85b5a4b9903ca0266e68a0c0d174c41ec8d5100d4d1a91 +SHA512 (corelibs-libdispatch.tar.gz) = 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21 +SHA512 (corelibs-xctest.tar.gz) = cd780ef745a364651eaf6f678adc52610fab7736e3517907930c917de648509d95d868a98c113c20a78b3c094413418d4d2a355c3d27824c74161c4592456fec +SHA512 (indexstore-db.tar.gz) = 3711969d7679f30f4f2df428066b0e8029c087f86d9e3d4fdd1f1af9000c19baf2be20ab51d1e952d2ef18bee2d31d4e6c8236a7d53ec6f1cc44f663d0ffadf1 +SHA512 (llbuild.tar.gz) = d699913b46c34e84d1fa9752fdc972b9b259d5a5529aa56d386213182a5e1b7fad696327a14c3cdfe628f9146d22f4d72edd7868bc86dbd443736c475284e980 +SHA512 (llvm-project.tar.gz) = cc0014de669b0c1f9df49149590ec5fbe7c2175de98c8053c56593a8f25dd45bd56eed04bbb6e5a1de74507b11314f325c9d84d68ff904975b5075ffebdd6d01 +SHA512 (package-manager.tar.gz) = 7510733305823da3d0b0eca3378f3a101e4382334427a0c35b6748321a119c09cd4d1a6f039e917d36df3d14784d3f3159f51f24db0f28fb1e121499bd01fa68 SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = 0c8790de81a4af6eedc9b1d1b175f8c025137059e0c822bc2a087b8e1fa1be0b28778dbf6b29b0f05c0e15bda0bc26ea35fc65a41b73341969ca83dfeece1124 -SHA512 (swift-driver.tar.gz) = 52e20a348ff9bbf7f7a942b2b4a0758c83810408cb8b0075452c1fa616058c7d3ae762eb43571f5f40e1df4194625f7c6f582f1ed02b752f8502a635107f17b3 -SHA512 (swift-integration-tests.tar.gz) = 6ccf8c9b7e7f243d33b5c8a0122396971014ce106a6335d28dd314d4a7d83330c145e796f08fa70a47179e5f61e21211d17f6b1a71ad384923f0c7c9e0ef0a14 -SHA512 (swift-syntax.tar.gz) = 737fccdaa6ef6c76decdece28cb45a7e897c014f9026dabe6a4ec4695ff9766ce56c666a0d724b36e1ad84290c11413a60085d9761f72cdab40f4312a67cb3ab -SHA512 (swift-tools-support-core.tar.gz) = f64bfd7a9c2728910899e73242e63224078fe60d149594a9ed93f619fb6b26b7acc247aea6e0c7cf52477bc7cd43dba6bd9eefdfe1453745b6e37319d951d218 -SHA512 (swift-xcode-playground-support.tar.gz) = 514bb25a6c6ee57a12424909a0000b623222e60b624ea23ce92fb4f812db725efbffb01ed8dd6b5d731d0210f2e75644d197f18db3269133e93f5e354846675b -SHA512 (swift.tar.gz) = e3746a58b40f83dfe8b08c80bff1b8535c98081524bb2d82df3e5f2e282918d0f881a8820dea8addfd8710b4d1c7a943f0732dc9461a72d9bc5695506aca3df0 +SHA512 (sourcekit-lsp.tar.gz) = ff7d5232e542cb547a85632a91fdf24892c13abee23bffb393642aec21e881e38adb175543fd826a3d1348694425accef7b9ed3ae7a88c2201517b69c743904f +SHA512 (swift-driver.tar.gz) = 7f4753e15b197307feea703b685dc8cf73f1c5ac77863c6dccba09881b3aed6e93362bae7fdbe8395eb9cc088e5b506392ee9c752138f0131883971d4a6f3698 +SHA512 (swift-integration-tests.tar.gz) = 3e431b0414ec6bf70de740aa726d3e741dc9f192f97db3310d99c32ce6c7d1c24eb617702a6c5c92c3a32c74c098333c549c72666995aef229d2a9f9cfc5dbab +SHA512 (swift-syntax.tar.gz) = 82cbcb990725fbc7ede133c95e10fd309b7abc0e2d2d015565c1d94f064374ba59558f6cd2b47f958ea21431f750de836b1628071b7db524de3aad168fee64c8 +SHA512 (swift-tools-support-core.tar.gz) = cc6b4ef77538b1e0e509503bc5b1800c37a856d99bf00551c9c446314a40f4117851e87566314d2b1fe1820aff6249b07831ab4cad6b0eba8cfed4e4dae37a62 +SHA512 (swift-xcode-playground-support.tar.gz) = 475c568860bb99276b5be34d1de5b8a4e1e45e4a5d69e5871afc8db61643cbaf15e478c35b89fdeda3b10be1414b14e71f9d9663de044f1cf46fa39bda6362da +SHA512 (swift.tar.gz) = cd0df1fe312ab5de489cc639712f5b12f84e7df5e4afb46bb409eaca42c4631c76be72cd3c4b2e76eb43b35a6c33422d5e3f6e0e586e0bab1853425ced78c6f1 diff --git a/swift-lang-gcc11.patch b/swift-lang-gcc11.patch deleted file mode 100644 index c68d05b..0000000 --- a/swift-lang-gcc11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc b/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc -index dc6f93568..06f9e5e35 100644 ---- a/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc -+++ b/llvm-project/llvm/utils/benchmark/src/benchmark_register.cc -@@ -12,6 +12,8 @@ - // See the License for the specific language governing permissions and - // limitations under the License. - -+#include -+ - #include "benchmark_register.h" - - #ifndef BENCHMARK_OS_WINDOWS diff --git a/swift-lang.spec b/swift-lang.spec index aaf7fb5..a07b4cd 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.4.3-RELEASE +%global swifttag 5.5-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 -%global sap_version 0.4.1 - +%global sap_version 0.4.3 +%global swift_crypto_version 1.1.5 Name: swift-lang -Version: 5.4.3 -Release: 2%{?dist} +Version: 5.5 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -26,27 +26,24 @@ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag} Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz Patch0: swift-for-fedora.patch -Patch1: compiler-rt-fuzzer.patch -Patch2: linux-tests-python-3-2.patch -Patch3: glibcpthread.patch -Patch4: %{name}-gcc11.patch -Patch5: pc-circular-dependencies.patch -Patch6: pc-circular-dependencies-optimization.patch -Patch7: nocyclades.patch -Patch8: unusedvariable.patch +Patch1: nocyclades.patch +Patch2: pc-circular-dependencies-optimization.patch +Patch3: unusedvariable.patch BuildRequires: clang BuildRequires: swig BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel @@ -59,29 +56,18 @@ BuildRequires: libicu-devel BuildRequires: ninja-build BuildRequires: perl-podlators BuildRequires: python3-six -BuildRequires: python27 BuildRequires: /usr/bin/pathfix.py -BuildRequires: make -BuildRequires: openssl-devel BuildRequires: cmake %if ! 0%{?el8} -BuildRequires: python-unversioned-command +BuildRequires: python-unversioned-command %endif Requires: glibc-devel -%if ! 0%{?el8} Requires: binutils-gold -%else -Requires: binutils -%endif Requires: gcc Requires: ncurses-devel Requires: ncurses-compat-libs -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -Obsoletes: %{name}-runtime < %{version}-%{release} - ExclusiveArch: x86_64 aarch64 @@ -98,7 +84,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -118,6 +104,7 @@ mv swift-syntax-swift-%{swifttag} swift-syntax mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core mv swift-argument-parser-%{sap_version} swift-argument-parser mv swift-driver-swift-%{swifttag} swift-driver +mv swift-crypto-%{swift_crypto_version} swift-crypto # ICU mv icu-release-%{icu_version} icu @@ -128,29 +115,14 @@ mv Yams-%{yams_version} yams # Since we require ninja for building, there's no sense to rebuild it just for Swift %patch0 -p0 -# Fixes an issue with using std::thread in a vector in compiler-rt -%patch1 -p0 - -# Python 3 is the new default so we need to make the python code work with it -#%patch2 -p0 - -# Fixes compiler issue with glibc and pthreads after 2.5.0.9000 -%patch3 -p0 - -# For gcc-11 -%patch4 -p1 - -# Fixes swift build crashing when there is a circular dependency between PkgConfig files -%patch5 -p1 +# Remove Cyclades as it has been removed from the Linux kernel +%patch1 -p0 # Cache PkgConfig and avoid reparsing multiple time the same file. -%patch6 -p1 +%patch2 -p1 -# Remove Cyclades from LLVM as it's been removed from the linux kernel -%patch7 -p0 - -# Fixes unused variable causing an error with -Werror -%patch8 -p0 +# Temp patch to test libdispatch issue with clang 13 +%patch3 -p0 # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py @@ -159,7 +131,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/h %build export VERBOSE=1 -# Before Fedora 34, we may not have /usr/bin/python, so we +# Before Fedora 34, we may not have /usr/bin/python, so we # roll our own because the build script expects there to be one. %if 0%{?fedora} < 34 || 0%{?el8} mkdir $PWD/binforpython @@ -200,6 +172,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Sep 21 2021 Ron Olson - 5.5-1 +- Updated to Swift 5.5-RELEASE * Fri Sep 17 2021 Ron Olson - 5.4.3-2 - Added patch to allow building using Clang 13 * Wed Sep 15 2021 Ron Olson - 5.4.3-1 @@ -216,12 +190,14 @@ export QA_SKIP_RPATHS=1 - Added fix for RPATH problems * Fri Jun 04 2021 Python Maint - 5.4-2 - Rebuilt for Python 3.10 -* Tue Jun 01 2021 Ron Olson 5.4.1-1 +* Thu Jun 03 2021 Ron Olson 5.5-1 +- Removed special CMake stuff for EPEL 8 +* Tue Jun 01 2021 Ron Olson 5.5-1 - Added patch to remove Cyclades from LLVM -* Fri May 28 2021 Jesús Abelardo Saldívar Aguilar 5.4.1-1 +* Fri May 28 2021 Jesús Abelardo Saldívar Aguilar 5.5-1 - Added patches to fix circular dependency on PkgConfig -* Thu May 27 2021 Ron Olson 5.4.1-1 -- Updated to swift-5.4.1-RELEASE +* Fri May 21 2021 Ron Olson 5.5-1 +- First version of Swift 5.5 - 5.5-DEVELOPMENT-SNAPSHOT-2021-05-18-a * Tue Apr 27 2021 Ron Olson 5.4-1 - Updated to swift-5.4-RELEASE * Tue Apr 06 2021 Ron Olson 5.4-1 From b418984f5919ad58bd7e5aaa45b4704a3e598ecb Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 28 Oct 2021 09:42:06 -0500 Subject: [PATCH 084/152] Updated to Swift-5.5.1-RELEASE --- .gitignore | 1 + build-presets.patch | 76 +++++++++++++++++++++ pc-circular-dependencies-optimization.patch | 59 ---------------- sources | 31 +++++---- swift-for-fedora.patch | 46 ------------- swift-lang.spec | 23 ++++--- 6 files changed, 106 insertions(+), 130 deletions(-) create mode 100644 build-presets.patch delete mode 100644 pc-circular-dependencies-optimization.patch delete mode 100644 swift-for-fedora.patch diff --git a/.gitignore b/.gitignore index 20815f8..a914ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /release-65-1.tar.gz /0.4.3.tar.gz /1.1.5.tar.gz +/ninja.tar.gz diff --git a/build-presets.patch b/build-presets.patch new file mode 100644 index 0000000..c608c84 --- /dev/null +++ b/build-presets.patch @@ -0,0 +1,76 @@ +--- swift/utils/build-presets.ini-orig 2021-09-23 08:59:28.810313021 -0500 ++++ swift/utils/build-presets.ini 2021-10-01 15:06:55.158508958 -0500 +@@ -785,7 +785,6 @@ + libicu + libcxx + +-build-ninja + install-llvm + install-swift + install-lldb +@@ -866,6 +865,65 @@ + buildbot_linux + mixin_buildbot_linux,no_test + ++# Preset for Fedora Linux ++[preset: buildbot_linux_fedora,no_test] ++mixin-preset= ++ mixin_lightweight_assertions,no-stdlib-asserts ++ mixin_linux_install_components_with_clang ++build-subdir=buildbot_linux ++ ++lldb ++release ++foundation ++libdispatch ++indexstore-db ++sourcekit-lsp ++lit-args=-v --time-tests ++ ++llbuild ++swiftpm ++swift-driver ++xctest ++libicu ++libcxx ++ ++install-foundation ++install-libdispatch ++reconfigure ++ ++install-llvm ++install-swift ++install-lldb ++install-llbuild ++install-swiftpm ++install-swift-driver ++install-xctest ++install-libicu ++install-prefix=/usr ++install-libcxx ++install-sourcekit-lsp ++build-swift-static-stdlib ++build-swift-static-sdk-overlay ++build-swift-stdlib-unittest-extra ++ ++# Path to the root of the installation filesystem. ++install-destdir=%(install_destdir)s ++ ++# Path to the .tar.gz package we would create. ++installable-package=%(installable_package)s ++ ++# Executes the lit tests for the installable package that is created ++# Assumes the swift-integration-tests repo is checked out ++ ++test-installable-package ++ ++# This ensures the default module cache ++# location is local to this run, allowing ++# to schedule multiple builds safely ++# in Linux CI bots ++relocate-xdg-cache-home-under-build-subdir ++ ++ + [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build] + mixin-preset= + mixin_lightweight_assertions,no-stdlib-asserts diff --git a/pc-circular-dependencies-optimization.patch b/pc-circular-dependencies-optimization.patch deleted file mode 100644 index a29197c..0000000 --- a/pc-circular-dependencies-optimization.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 14983644da3b8bbb32aa2823602e4161bf3e2ec9 Mon Sep 17 00:00:00 2001 -From: Dadoum -Date: Tue, 4 May 2021 01:06:34 +0200 -Subject: [PATCH] [PkgConfig] Cache PkgConfig and avoid reparsing multiple time - the same file. - ---- - swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift | 31 ++++++++++++++++++------------ - 1 file changed, 19 insertions(+), 12 deletions(-) - -diff --git a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift -index 45d80995..558c81e7 100644 ---- a/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift -+++ b/swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift -@@ -115,6 +115,8 @@ public class LoadingContext { - - /// Information on an individual `pkg-config` supported package. - public struct PkgConfig { -+ public static var pkgConfigCache: [String: PkgConfig] = [String: PkgConfig]() -+ - /// The name of the package. - public let name: String - -@@ -179,18 +181,23 @@ public struct PkgConfig { - continue - } - -- // FIXME: This is wasteful, we should be caching the PkgConfig result. -- let pkg = try PkgConfig( -- name: dep, -- additionalSearchPaths: additionalSearchPaths, -- diagnostics: diagnostics, -- fileSystem: fileSystem, -- brewPrefix: brewPrefix, -- loadingContext: loadingContext -- ) -- -- cFlags += pkg.cFlags -- libs += pkg.libs -+ if !PkgConfig.pkgConfigCache.keys.contains(dep) { -+ PkgConfig.pkgConfigCache[dep] = try PkgConfig( -+ name: dep, -+ additionalSearchPaths: additionalSearchPaths, -+ diagnostics: diagnostics, -+ fileSystem: fileSystem, -+ brewPrefix: brewPrefix, -+ loadingContext: loadingContext -+ ) -+ } -+ -+ guard let cachedPkg = PkgConfig.pkgConfigCache[dep] else { -+ fatalError("Cannot retrieve cached pkgConfig result") -+ } -+ -+ cFlags += cachedPkg.cFlags -+ libs += cachedPkg.libs - } - - return (cFlags: cFlags, libs: libs) diff --git a/sources b/sources index 0a579f8..1907edd 100644 --- a/sources +++ b/sources @@ -1,19 +1,20 @@ SHA512 (0.4.3.tar.gz) = d5f4eefe7b7b215e76f8f035a2481c73fa716fe199894874122ea51a27c885ab7780647099fdbfbaebf7d8df1da1b59483d10e9fa869e26e3d34df881d14b665 SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 -SHA512 (cmark.tar.gz) = 78894077b00d4f73f9d7fff04e5145a9f268be6de306b2801669107edc05985c3568ccae7d5ec347e99411afd3b45f32e36cb1a03c3429b166640884a6629f23 -SHA512 (corelibs-foundation.tar.gz) = c1ba5f9e6916799128221a9427ad0ab764e81f5bb573b248ed7b40feb85a51d6225d5c6e59d8a2084d85b5a4b9903ca0266e68a0c0d174c41ec8d5100d4d1a91 -SHA512 (corelibs-libdispatch.tar.gz) = 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21 -SHA512 (corelibs-xctest.tar.gz) = cd780ef745a364651eaf6f678adc52610fab7736e3517907930c917de648509d95d868a98c113c20a78b3c094413418d4d2a355c3d27824c74161c4592456fec -SHA512 (indexstore-db.tar.gz) = 3711969d7679f30f4f2df428066b0e8029c087f86d9e3d4fdd1f1af9000c19baf2be20ab51d1e952d2ef18bee2d31d4e6c8236a7d53ec6f1cc44f663d0ffadf1 -SHA512 (llbuild.tar.gz) = d699913b46c34e84d1fa9752fdc972b9b259d5a5529aa56d386213182a5e1b7fad696327a14c3cdfe628f9146d22f4d72edd7868bc86dbd443736c475284e980 -SHA512 (llvm-project.tar.gz) = cc0014de669b0c1f9df49149590ec5fbe7c2175de98c8053c56593a8f25dd45bd56eed04bbb6e5a1de74507b11314f325c9d84d68ff904975b5075ffebdd6d01 -SHA512 (package-manager.tar.gz) = 7510733305823da3d0b0eca3378f3a101e4382334427a0c35b6748321a119c09cd4d1a6f039e917d36df3d14784d3f3159f51f24db0f28fb1e121499bd01fa68 +SHA512 (cmark.tar.gz) = e5bcaece74c27b385b295c3ccd48add7178587c29774c4370679a1f8ee4651852a294911377b24b8b8823136f0b8a73fa7af96331cf5d4a89991642331e6da0a +SHA512 (corelibs-foundation.tar.gz) = c6e964ec9568f10a23e3dda6471ee500891f767b567c5cb651f3c66a09fe8ef1429a78c3b475f78e2e14145bc1e08ee63a011b6f1b7d53adb7facdf319b6924e +SHA512 (corelibs-libdispatch.tar.gz) = 2c3ccb447660731830a289569649637f76b7f0c8b739550e4eb46416008bb233c3e56cc0658edb256fdc0ae99a4cd45cf12db1ddcd5c88e78736b9c62e2d7817 +SHA512 (corelibs-xctest.tar.gz) = 58e6e4ae3d3e9c382b3c59ad49ebef3164d53c453dd45943e4fecb391d515676bcc7c42e04d8340f89c28d7c18a159ec2f46f309368cea72227860c9fb51e0c7 +SHA512 (indexstore-db.tar.gz) = f7488d1db3f4473ef857345de89ab57055c73265a3e4323a1ae3fde75fbf81ca95d02daccf3421ed5a54c42c39fec5fcf21b708bd37b655b6ca9e84b7a7f3c15 +SHA512 (llbuild.tar.gz) = a1fb7c0fe5f8a7e3a9f5b20ddad4c2a3c179f42ccf299d8a9da79d7f03c249394381c0ea63c78a5a8edc74371c6d6bffee0fa17753e806208f21ee385d2a26bb +SHA512 (llvm-project.tar.gz) = 4455a19497fad4ee0e5cd0747a8eca7a00a5878a56ae0f3b026863712d041d0cb1c1ab0bdd70b3aa922f83eee2cc06a9536f9291c259c7ebc0782e39ba6c283a +SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 +SHA512 (package-manager.tar.gz) = 9e8273ace9c66de894f02abb2782d3339c38df393c7a539bdf5862e4ce49ad3fd91c294d76461e3fbc9f16fa81cee52bee00e8b3f79af96632e080fbfc278983 SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = ff7d5232e542cb547a85632a91fdf24892c13abee23bffb393642aec21e881e38adb175543fd826a3d1348694425accef7b9ed3ae7a88c2201517b69c743904f -SHA512 (swift-driver.tar.gz) = 7f4753e15b197307feea703b685dc8cf73f1c5ac77863c6dccba09881b3aed6e93362bae7fdbe8395eb9cc088e5b506392ee9c752138f0131883971d4a6f3698 -SHA512 (swift-integration-tests.tar.gz) = 3e431b0414ec6bf70de740aa726d3e741dc9f192f97db3310d99c32ce6c7d1c24eb617702a6c5c92c3a32c74c098333c549c72666995aef229d2a9f9cfc5dbab -SHA512 (swift-syntax.tar.gz) = 82cbcb990725fbc7ede133c95e10fd309b7abc0e2d2d015565c1d94f064374ba59558f6cd2b47f958ea21431f750de836b1628071b7db524de3aad168fee64c8 -SHA512 (swift-tools-support-core.tar.gz) = cc6b4ef77538b1e0e509503bc5b1800c37a856d99bf00551c9c446314a40f4117851e87566314d2b1fe1820aff6249b07831ab4cad6b0eba8cfed4e4dae37a62 -SHA512 (swift-xcode-playground-support.tar.gz) = 475c568860bb99276b5be34d1de5b8a4e1e45e4a5d69e5871afc8db61643cbaf15e478c35b89fdeda3b10be1414b14e71f9d9663de044f1cf46fa39bda6362da -SHA512 (swift.tar.gz) = cd0df1fe312ab5de489cc639712f5b12f84e7df5e4afb46bb409eaca42c4631c76be72cd3c4b2e76eb43b35a6c33422d5e3f6e0e586e0bab1853425ced78c6f1 +SHA512 (sourcekit-lsp.tar.gz) = 696b6cb7d95052259f6743d398a9248815c1a6c494a64f40dcf0be73414f1b89540ce36bda000fb7d4b0849f24394a43b006a0c0345cdf12afd5535a794256b1 +SHA512 (swift-driver.tar.gz) = 0e18a061ac2c356d88ace8ff4ad0ed64ce180c8758ac304a85c9287224f4f9d4db20d7764e1b6e48adcb88116d19d3073d292141018a408c75430f8c15a4eb87 +SHA512 (swift-integration-tests.tar.gz) = 53bad29ad6b1987f71bdd039fbf18f47d72694768304fa9b2f68c82c05228449d8054042716732ec08807dff04ac16847b75fd025ec429647a4409191c2c4b8c +SHA512 (swift-syntax.tar.gz) = 7922517b3851e7e28a78a20806dff0ea53413a7c41cd5bd8a5fa64183f64596c69f17d40fa8c14c80c09dc4e33df7bce9557439f30da5440ce0bab4f5263ff70 +SHA512 (swift-tools-support-core.tar.gz) = 8176714e9c4807550f850629b2f0d89eec532128e0641ca6cf5f95611bc435a703daeb9cf5d4994d2f3431baa5f691c5d38d954a0928476d8b2913653400b621 +SHA512 (swift-xcode-playground-support.tar.gz) = 081fce2f04216efef3eb297764086069e4618ea0765761e77a6b8c61ce66bf50606aaa4c1039710acbf72d96021d27c0adddf173e38a78ecd2dcbfcdfc5aa07b +SHA512 (swift.tar.gz) = 348a602c2334c928f358afb52e32c5534d9fdd4b4b3e652d9ca63fffc0b8a2b25e4a010e7ba0d161903b36769e5369c54a6641b1de480e1e303cf36b996bd554 diff --git a/swift-for-fedora.patch b/swift-for-fedora.patch deleted file mode 100644 index 213fbf0..0000000 --- a/swift-for-fedora.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur swift-orig/cmake/modules/AddSwift.cmake swift/cmake/modules/AddSwift.cmake ---- swift-orig/cmake/modules/AddSwift.cmake 2021-01-11 09:24:03.000000000 -0600 -+++ swift/cmake/modules/AddSwift.cmake 2021-01-14 16:07:26.118061686 -0600 -@@ -288,7 +288,7 @@ - if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64) - # this is the minimum architecture that supports 16 byte CAS, which is - # necessary to avoid a dependency to libatomic -- target_compile_options(${target} PRIVATE -march=core2) -+ target_compile_options(${target} PRIVATE -mcx16) - endif() - endif() - -diff -Naur swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake swift/stdlib/cmake/modules/AddSwiftStdlib.cmake ---- swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake 2021-01-11 09:24:03.000000000 -0600 -+++ swift/stdlib/cmake/modules/AddSwiftStdlib.cmake 2021-01-14 16:06:49.905752127 -0600 -@@ -306,7 +306,7 @@ - if("${CFLAGS_SDK}" STREQUAL "LINUX") - if(${CFLAGS_ARCH} STREQUAL x86_64) - # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic -- list(APPEND result "-march=core2") -+ list(APPEND result "-mcx16") - endif() - endif() - -diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini ---- swift-orig/utils/build-presets.ini 2021-01-11 09:24:03.000000000 -0600 -+++ swift/utils/build-presets.ini 2021-01-14 15:42:31.063141040 -0600 -@@ -771,7 +771,6 @@ - libicu - libcxx - --build-ninja - install-llvm - install-swift - install-lldb -@@ -787,10 +786,6 @@ - build-swift-static-sdk-overlay - build-swift-stdlib-unittest-extra - --# Executes the lit tests for the installable package that is created --# Assumes the swift-integration-tests repo is checked out -- --test-installable-package - - # Build the benchmarks against the toolchain. - toolchain-benchmarks diff --git a/swift-lang.spec b/swift-lang.spec index a07b4cd..3760a55 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,14 @@ %global debug_package %{nil} -%global swifttag 5.5-RELEASE +%global swifttag 5.5.1-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 %global sap_version 0.4.3 %global swift_crypto_version 1.1.5 +%global ninja_version 1.10.2 Name: swift-lang -Version: 5.5 +Version: 5.5.1 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -32,10 +33,10 @@ Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz +Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Patch0: swift-for-fedora.patch +Patch0: build-presets.patch Patch1: nocyclades.patch -Patch2: pc-circular-dependencies-optimization.patch Patch3: unusedvariable.patch BuildRequires: clang @@ -53,7 +54,6 @@ BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel -BuildRequires: ninja-build BuildRequires: perl-podlators BuildRequires: python3-six BuildRequires: /usr/bin/pathfix.py @@ -70,6 +70,7 @@ Requires: ncurses-compat-libs ExclusiveArch: x86_64 aarch64 +Provides: swiftlang = %{version}-%{release} %description Swift is a general-purpose programming language built using @@ -84,7 +85,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -112,15 +113,15 @@ mv icu-release-%{icu_version} icu # Yams mv Yams-%{yams_version} yams +# Ninja +mv ninja-%{ninja_version} ninja + # Since we require ninja for building, there's no sense to rebuild it just for Swift -%patch0 -p0 +#%patch0 -p0 # Remove Cyclades as it has been removed from the Linux kernel %patch1 -p0 -# Cache PkgConfig and avoid reparsing multiple time the same file. -%patch2 -p1 - # Temp patch to test libdispatch issue with clang 13 %patch3 -p0 @@ -172,6 +173,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Oct 27 2021 Ron Olson - 5.5.1-1 +- Updated to Swift 5.5.1-RELEASE * Tue Sep 21 2021 Ron Olson - 5.5-1 - Updated to Swift 5.5-RELEASE * Fri Sep 17 2021 Ron Olson - 5.4.3-2 From 85a63afbbfe1e033173bf829ac68fb1374641d7b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 14 Dec 2021 14:19:01 -0600 Subject: [PATCH 085/152] Updated to Swift-5.2.2-RELEASE --- build-presets.patch | 76 --------------------------------------------- sources | 31 +++++++++--------- swift-lang.spec | 16 +++++----- 3 files changed, 24 insertions(+), 99 deletions(-) delete mode 100644 build-presets.patch diff --git a/build-presets.patch b/build-presets.patch deleted file mode 100644 index c608c84..0000000 --- a/build-presets.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- swift/utils/build-presets.ini-orig 2021-09-23 08:59:28.810313021 -0500 -+++ swift/utils/build-presets.ini 2021-10-01 15:06:55.158508958 -0500 -@@ -785,7 +785,6 @@ - libicu - libcxx - --build-ninja - install-llvm - install-swift - install-lldb -@@ -866,6 +865,65 @@ - buildbot_linux - mixin_buildbot_linux,no_test - -+# Preset for Fedora Linux -+[preset: buildbot_linux_fedora,no_test] -+mixin-preset= -+ mixin_lightweight_assertions,no-stdlib-asserts -+ mixin_linux_install_components_with_clang -+build-subdir=buildbot_linux -+ -+lldb -+release -+foundation -+libdispatch -+indexstore-db -+sourcekit-lsp -+lit-args=-v --time-tests -+ -+llbuild -+swiftpm -+swift-driver -+xctest -+libicu -+libcxx -+ -+install-foundation -+install-libdispatch -+reconfigure -+ -+install-llvm -+install-swift -+install-lldb -+install-llbuild -+install-swiftpm -+install-swift-driver -+install-xctest -+install-libicu -+install-prefix=/usr -+install-libcxx -+install-sourcekit-lsp -+build-swift-static-stdlib -+build-swift-static-sdk-overlay -+build-swift-stdlib-unittest-extra -+ -+# Path to the root of the installation filesystem. -+install-destdir=%(install_destdir)s -+ -+# Path to the .tar.gz package we would create. -+installable-package=%(installable_package)s -+ -+# Executes the lit tests for the installable package that is created -+# Assumes the swift-integration-tests repo is checked out -+ -+test-installable-package -+ -+# This ensures the default module cache -+# location is local to this run, allowing -+# to schedule multiple builds safely -+# in Linux CI bots -+relocate-xdg-cache-home-under-build-subdir -+ -+ - [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build] - mixin-preset= - mixin_lightweight_assertions,no-stdlib-asserts diff --git a/sources b/sources index 1907edd..9b7bc5b 100644 --- a/sources +++ b/sources @@ -1,20 +1,21 @@ SHA512 (0.4.3.tar.gz) = d5f4eefe7b7b215e76f8f035a2481c73fa716fe199894874122ea51a27c885ab7780647099fdbfbaebf7d8df1da1b59483d10e9fa869e26e3d34df881d14b665 SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 -SHA512 (cmark.tar.gz) = e5bcaece74c27b385b295c3ccd48add7178587c29774c4370679a1f8ee4651852a294911377b24b8b8823136f0b8a73fa7af96331cf5d4a89991642331e6da0a -SHA512 (corelibs-foundation.tar.gz) = c6e964ec9568f10a23e3dda6471ee500891f767b567c5cb651f3c66a09fe8ef1429a78c3b475f78e2e14145bc1e08ee63a011b6f1b7d53adb7facdf319b6924e -SHA512 (corelibs-libdispatch.tar.gz) = 2c3ccb447660731830a289569649637f76b7f0c8b739550e4eb46416008bb233c3e56cc0658edb256fdc0ae99a4cd45cf12db1ddcd5c88e78736b9c62e2d7817 -SHA512 (corelibs-xctest.tar.gz) = 58e6e4ae3d3e9c382b3c59ad49ebef3164d53c453dd45943e4fecb391d515676bcc7c42e04d8340f89c28d7c18a159ec2f46f309368cea72227860c9fb51e0c7 -SHA512 (indexstore-db.tar.gz) = f7488d1db3f4473ef857345de89ab57055c73265a3e4323a1ae3fde75fbf81ca95d02daccf3421ed5a54c42c39fec5fcf21b708bd37b655b6ca9e84b7a7f3c15 -SHA512 (llbuild.tar.gz) = a1fb7c0fe5f8a7e3a9f5b20ddad4c2a3c179f42ccf299d8a9da79d7f03c249394381c0ea63c78a5a8edc74371c6d6bffee0fa17753e806208f21ee385d2a26bb -SHA512 (llvm-project.tar.gz) = 4455a19497fad4ee0e5cd0747a8eca7a00a5878a56ae0f3b026863712d041d0cb1c1ab0bdd70b3aa922f83eee2cc06a9536f9291c259c7ebc0782e39ba6c283a +SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 +SHA512 (cmark.tar.gz) = e8a19aad23e9d98d5c8af10df2e69aa7c2e58492ad1f5ae292fe8f79925bee876f2b8c17d75eb016b4c2628e06144b76d2398ac8a4b641aed0e04cc324910145 +SHA512 (corelibs-foundation.tar.gz) = 8a5b62014d980b770f1599cb427b5a37062c2d9ac84f271b493bdff69a98e6ade8855ee19ee12112a2061c8b77d96d32c15a3d52a548649979e035a37aa0112f +SHA512 (corelibs-libdispatch.tar.gz) = 7fbae1786cd544a104dd97e2ca951bd6149f15a77badb14671fad98420c823d986c21117003de163b06a51b1acfa2dafc4f4fa99b3dc607a0e8f0ccd4e87ed8b +SHA512 (corelibs-xctest.tar.gz) = 88a008874cfd7b7ca17cc124f9969dd452833aa535dd729fa5010262cdaadc52511d7e26e75c0a9cecd52135056b55ce0c84752f61890e1a2bcab07a450cad07 +SHA512 (indexstore-db.tar.gz) = 0a670910e92e2e30bf696347b5fcf88934bc8f641992799e7c2ee8cb3942d6d9c4641c803b09864ca7e9fca039f857809cb2cfa0c8d9ad86d0908be34e724516 +SHA512 (llbuild.tar.gz) = 75f59c158a9435864ee092f6c9da46729049e81a064276a9e8214accf7c68d218054a525c7ee01f53e99b0b12548804165071a4ff3be198ad2dd75796c2eeb5f +SHA512 (llvm-project.tar.gz) = 742e07ba80540dbfd31de9b05132074bf79bf9c69cbc4d739f9cfb052c1824c396c241dfeacb39f7136e907cda05127de06f69ab4242e35a1e29b5b6a88f77c1 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = 9e8273ace9c66de894f02abb2782d3339c38df393c7a539bdf5862e4ce49ad3fd91c294d76461e3fbc9f16fa81cee52bee00e8b3f79af96632e080fbfc278983 +SHA512 (package-manager.tar.gz) = 1ffdd5789f877156c89aa7ff06bde0778f8e093c435992ab97903e702c5dfb89bc2596b1ab6dce4843d5fbd03483084e4fc8d485e8ea32c4dd9c9adb74e0389f SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = 696b6cb7d95052259f6743d398a9248815c1a6c494a64f40dcf0be73414f1b89540ce36bda000fb7d4b0849f24394a43b006a0c0345cdf12afd5535a794256b1 -SHA512 (swift-driver.tar.gz) = 0e18a061ac2c356d88ace8ff4ad0ed64ce180c8758ac304a85c9287224f4f9d4db20d7764e1b6e48adcb88116d19d3073d292141018a408c75430f8c15a4eb87 -SHA512 (swift-integration-tests.tar.gz) = 53bad29ad6b1987f71bdd039fbf18f47d72694768304fa9b2f68c82c05228449d8054042716732ec08807dff04ac16847b75fd025ec429647a4409191c2c4b8c -SHA512 (swift-syntax.tar.gz) = 7922517b3851e7e28a78a20806dff0ea53413a7c41cd5bd8a5fa64183f64596c69f17d40fa8c14c80c09dc4e33df7bce9557439f30da5440ce0bab4f5263ff70 -SHA512 (swift-tools-support-core.tar.gz) = 8176714e9c4807550f850629b2f0d89eec532128e0641ca6cf5f95611bc435a703daeb9cf5d4994d2f3431baa5f691c5d38d954a0928476d8b2913653400b621 -SHA512 (swift-xcode-playground-support.tar.gz) = 081fce2f04216efef3eb297764086069e4618ea0765761e77a6b8c61ce66bf50606aaa4c1039710acbf72d96021d27c0adddf173e38a78ecd2dcbfcdfc5aa07b -SHA512 (swift.tar.gz) = 348a602c2334c928f358afb52e32c5534d9fdd4b4b3e652d9ca63fffc0b8a2b25e4a010e7ba0d161903b36769e5369c54a6641b1de480e1e303cf36b996bd554 +SHA512 (sourcekit-lsp.tar.gz) = f8fcb9a8327b8c1da2cf249d29cd8a8b917468a45b0a1a0e10dd3c522dffb7b0f9b7b58f08f2fd414d13586bf7720df64dfe1aef3ee2fb112d34b4a63928a7fd +SHA512 (swift-driver.tar.gz) = 44c06a4c4ac43bb1b68d0bd1289552ef42afd25565afd54b87c7f97740f5acdc05a63afacfed6a787b9172213927cc13d797e74bb7a4b3e646e0df68ce735cb4 +SHA512 (swift-integration-tests.tar.gz) = 432ed7bdf20954accfdd31ec5a873581a86f71780eb00f2771013b9b8812dc6de8111f0be95dcd86224076c8d2e4e8a406bf78fae6f970e13253bc544f8d0ea3 +SHA512 (swift-syntax.tar.gz) = 45f1289fd537efdf11ece0f7ba79b10a313bbb7f0b3320bf91577c5e09e5ff23e1f31f516cd1429f2bf571e723ffd6940752a636406b3a7c21ad328b78551179 +SHA512 (swift-tools-support-core.tar.gz) = 249d2ae0851a0b173b7d9e44564d10f429f4b8e03249cbcbd3e4e3a8b873c0074ee1aad99e25b8b43447fa60deb787ee1f5a87e0f61036a933feef0e92a7aa20 +SHA512 (swift-xcode-playground-support.tar.gz) = 45fd6eb1b81dd9c554cbe0d3c84c84d435d2bdad7ca84fd4fe4532fd6936b0201dab799eb216a78fe63688a4438b76d3c203961a4d9eb95df22247d54b1e470e +SHA512 (swift.tar.gz) = 7059e6998033464356e3de19a10d7837868dd274f335c63b06e9178b04c51a96e9b7ac237ca716deaa486c06e87409586bc8dc06f28e12ebf144331249d14f38 diff --git a/swift-lang.spec b/swift-lang.spec index 3760a55..05abbd7 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,14 +1,15 @@ %global debug_package %{nil} -%global swifttag 5.5.1-RELEASE +%global swifttag 5.5.2-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 %global sap_version 0.4.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 +%global cmake_version 3.16.5 Name: swift-lang -Version: 5.5.1 +Version: 5.5.2 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -34,8 +35,8 @@ Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}. Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source20: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz -Patch0: build-presets.patch Patch1: nocyclades.patch Patch3: unusedvariable.patch @@ -57,7 +58,6 @@ BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six BuildRequires: /usr/bin/pathfix.py -BuildRequires: cmake %if ! 0%{?el8} BuildRequires: python-unversioned-command %endif @@ -85,7 +85,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -106,6 +106,7 @@ mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core mv swift-argument-parser-%{sap_version} swift-argument-parser mv swift-driver-swift-%{swifttag} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto +mv cmake-%{cmake_version} cmake # ICU mv icu-release-%{icu_version} icu @@ -116,9 +117,6 @@ mv Yams-%{yams_version} yams # Ninja mv ninja-%{ninja_version} ninja -# Since we require ninja for building, there's no sense to rebuild it just for Swift -#%patch0 -p0 - # Remove Cyclades as it has been removed from the Linux kernel %patch1 -p0 @@ -173,6 +171,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Dec 14 2021 Ron Olson - 5.5.2-1 +- Updated to Swift 5.5.2-RELEASE * Wed Oct 27 2021 Ron Olson - 5.5.1-1 - Updated to Swift 5.5.1-RELEASE * Tue Sep 21 2021 Ron Olson - 5.5-1 From 15e5b599f91311ff774b76ddad5f60d22078f151 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:03:17 +0000 Subject: [PATCH 086/152] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 05abbd7..38cffec 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -10,7 +10,7 @@ Name: swift-lang Version: 5.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -171,6 +171,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Ron Olson - 5.5.2-1 - Updated to Swift 5.5.2-RELEASE * Wed Oct 27 2021 Ron Olson - 5.5.1-1 From 1b1f5cf316be3b9eec52403f3c67e8466d6eff3c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 17:32:53 -0800 Subject: [PATCH 087/152] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- README.md | 3 --- dead.package | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 README.md create mode 100644 dead.package diff --git a/README.md b/README.md deleted file mode 100644 index 482e0bb..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# swift-lang - -The swift-lang package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 From 544affd2c9ed212baba9a6ed909e2f46c8f8b371 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 16 Feb 2022 09:46:05 -0600 Subject: [PATCH 088/152] Updated to Swift 5.5.3-RELEASE --- sources | 30 +++++++++++++++--------------- swift-lang.spec | 9 +++++---- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/sources b/sources index 9b7bc5b..c6aae60 100644 --- a/sources +++ b/sources @@ -2,20 +2,20 @@ SHA512 (0.4.3.tar.gz) = d5f4eefe7b7b215e76f8f035a2481c73fa716fe199894874122ea51a SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = e8a19aad23e9d98d5c8af10df2e69aa7c2e58492ad1f5ae292fe8f79925bee876f2b8c17d75eb016b4c2628e06144b76d2398ac8a4b641aed0e04cc324910145 -SHA512 (corelibs-foundation.tar.gz) = 8a5b62014d980b770f1599cb427b5a37062c2d9ac84f271b493bdff69a98e6ade8855ee19ee12112a2061c8b77d96d32c15a3d52a548649979e035a37aa0112f -SHA512 (corelibs-libdispatch.tar.gz) = 7fbae1786cd544a104dd97e2ca951bd6149f15a77badb14671fad98420c823d986c21117003de163b06a51b1acfa2dafc4f4fa99b3dc607a0e8f0ccd4e87ed8b -SHA512 (corelibs-xctest.tar.gz) = 88a008874cfd7b7ca17cc124f9969dd452833aa535dd729fa5010262cdaadc52511d7e26e75c0a9cecd52135056b55ce0c84752f61890e1a2bcab07a450cad07 -SHA512 (indexstore-db.tar.gz) = 0a670910e92e2e30bf696347b5fcf88934bc8f641992799e7c2ee8cb3942d6d9c4641c803b09864ca7e9fca039f857809cb2cfa0c8d9ad86d0908be34e724516 -SHA512 (llbuild.tar.gz) = 75f59c158a9435864ee092f6c9da46729049e81a064276a9e8214accf7c68d218054a525c7ee01f53e99b0b12548804165071a4ff3be198ad2dd75796c2eeb5f -SHA512 (llvm-project.tar.gz) = 742e07ba80540dbfd31de9b05132074bf79bf9c69cbc4d739f9cfb052c1824c396c241dfeacb39f7136e907cda05127de06f69ab4242e35a1e29b5b6a88f77c1 +SHA512 (cmark.tar.gz) = 09ce0fb58ec97fde579113c0d9bb09cabea10b52593c35850f893455eeb2f1bfb4d514fc4d566fd90d5ebf442469aad0d64e68e1c47f6545ab8868ecf114760d +SHA512 (corelibs-foundation.tar.gz) = b0256af0d8c95022d8304e14c1df5b039618136858b9c8035adda1c1aa1d98404494c1d38e365d4d980f1b08593b431d55de01c2de4629ecaa37491a95d27074 +SHA512 (corelibs-libdispatch.tar.gz) = 6c5bbfe72c3e0976609aaf8c4d4405dc3dc14bcf2976dddf4803eed6ce5b03827808d18c7c5f840425da2568f5fdb254d4aa58ea7eb54f61f15f1e9929c48be2 +SHA512 (corelibs-xctest.tar.gz) = 8f07fcf8632f9e0b4f5b978b150124ca28400d5d092c6738191e0d57bcef06a7e29910bc5216be55ebc96ce087c8fa2e75fdf24c7e5447de021c6c9766d3de36 +SHA512 (indexstore-db.tar.gz) = e71acd2e4dc3771e6d8c2e58e01bd0d9c1b9c9b2bd6a71afb8bc43a3e8dcbcde81941608d5c40b2f1fc1419dd340bf6bd78464621be0d3e3e5c0b415f9a0b7e8 +SHA512 (llbuild.tar.gz) = 6b84a9175e89049d849bc1873a35a3f9ca2f106a91a08e8208b9b304f20496bf18ffdcb726520aafd80e0ec81e32848bf721d7a53158deba49b524a174697a96 +SHA512 (llvm-project.tar.gz) = 94d3c45fe5681749434f2ff73b448b8505449370a1a437d753dbab5a2d8571a33b5353900f4b35d6432885e944a37ff6274d52b4c58fe10ef62808dacad73c76 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = 1ffdd5789f877156c89aa7ff06bde0778f8e093c435992ab97903e702c5dfb89bc2596b1ab6dce4843d5fbd03483084e4fc8d485e8ea32c4dd9c9adb74e0389f +SHA512 (package-manager.tar.gz) = 978f5dd1d3607cf478f98e866c11a06ef1d6b534517a809b50655a9b46ffdd4d77a5bab48d36f74fe854f44ea4c24149bd8c7c00f236d723d96b91f75496e7e0 SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = f8fcb9a8327b8c1da2cf249d29cd8a8b917468a45b0a1a0e10dd3c522dffb7b0f9b7b58f08f2fd414d13586bf7720df64dfe1aef3ee2fb112d34b4a63928a7fd -SHA512 (swift-driver.tar.gz) = 44c06a4c4ac43bb1b68d0bd1289552ef42afd25565afd54b87c7f97740f5acdc05a63afacfed6a787b9172213927cc13d797e74bb7a4b3e646e0df68ce735cb4 -SHA512 (swift-integration-tests.tar.gz) = 432ed7bdf20954accfdd31ec5a873581a86f71780eb00f2771013b9b8812dc6de8111f0be95dcd86224076c8d2e4e8a406bf78fae6f970e13253bc544f8d0ea3 -SHA512 (swift-syntax.tar.gz) = 45f1289fd537efdf11ece0f7ba79b10a313bbb7f0b3320bf91577c5e09e5ff23e1f31f516cd1429f2bf571e723ffd6940752a636406b3a7c21ad328b78551179 -SHA512 (swift-tools-support-core.tar.gz) = 249d2ae0851a0b173b7d9e44564d10f429f4b8e03249cbcbd3e4e3a8b873c0074ee1aad99e25b8b43447fa60deb787ee1f5a87e0f61036a933feef0e92a7aa20 -SHA512 (swift-xcode-playground-support.tar.gz) = 45fd6eb1b81dd9c554cbe0d3c84c84d435d2bdad7ca84fd4fe4532fd6936b0201dab799eb216a78fe63688a4438b76d3c203961a4d9eb95df22247d54b1e470e -SHA512 (swift.tar.gz) = 7059e6998033464356e3de19a10d7837868dd274f335c63b06e9178b04c51a96e9b7ac237ca716deaa486c06e87409586bc8dc06f28e12ebf144331249d14f38 +SHA512 (sourcekit-lsp.tar.gz) = 90ce72ae810baf94390143cf69c37c30c09fefe2e82b69207f62b59ecf7744eb213ce63791e11fb44ea690c5dfe89217e45ac4e4af3997bd7878c22d1a2f06b0 +SHA512 (swift-driver.tar.gz) = f6f25ca854f5b28bd3ba00e1a27286e6cca6be6ad06806cbc5b76202ac28662b5a1ceaabf374f3ed3eac8448bcb1292baaaab54e8343e7ee3297cca81a4611d4 +SHA512 (swift-integration-tests.tar.gz) = c6161af17bb07bc16848dcfaa5afae7cb82c39907e1650586166620aa6e066044d2fdac9965b389816849c0a01280eee0c5c36c03eb86822959ba2e785870422 +SHA512 (swift-syntax.tar.gz) = 6fdd6c583160cb44288832f396b49bf1d5a69e33193045d0d22c3adbccbd000d0a5ee879fb71a1cb62c0d280f62a24c3b4bb1e1fd262d90b382374cb38dd26d0 +SHA512 (swift-tools-support-core.tar.gz) = 9ce75a861977aba45b8f1424ca8d6f1e2aa2491346665956378c7f68dac3080f5501f9d7eacb75dc3ee71abf5978dc68c5b89648b8b3df91ce3807bd719a45ce +SHA512 (swift-xcode-playground-support.tar.gz) = df2931e289c0599ef4d076f0af865355dc3781ab7ce7fc06768c9f7b9488271a958cbbdb6c25b061bf7c999d043878127eb4470592df4f3c94c3f3d385945b0f +SHA512 (swift.tar.gz) = 66395c1fb68b438d5bd9cfdba1989574357d5a7ea311933dc32b01a1e399c7606cad02cff3816526b028658b24b387148f2b7ea5158bf3c1a9dfe2807435f761 diff --git a/swift-lang.spec b/swift-lang.spec index 38cffec..8680407 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global swifttag 5.5.2-RELEASE +%global swifttag 5.5.3-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 @@ -9,8 +9,8 @@ %global cmake_version 3.16.5 Name: swift-lang -Version: 5.5.2 -Release: 2%{?dist} +Version: 5.5.3 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -171,9 +171,10 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Feb 15 2022 Ron Olson - 5.5.3-1 +- Updated to Swift 5.5.3-RELEASE * Sat Jan 22 2022 Fedora Release Engineering - 5.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Tue Dec 14 2021 Ron Olson - 5.5.2-1 - Updated to Swift 5.5.2-RELEASE * Wed Oct 27 2021 Ron Olson - 5.5.1-1 From c19f4b71361e6bf717d0700fb959b54b41a2eace Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 31 Mar 2022 08:34:47 -0500 Subject: [PATCH 089/152] Updated to Swift 5.6-RELEASE --- .gitignore | 14 ++++++++ goldinclude.patch | 12 +++++++ nocyclades.patch | 81 -------------------------------------------- sources | 45 +++++++++++++++--------- swift-lang.spec | 70 ++++++++++++++++++++++++++++---------- temp-patches.patch | 11 ++++++ unusedvariable.patch | 35 ------------------- 7 files changed, 119 insertions(+), 149 deletions(-) create mode 100644 goldinclude.patch delete mode 100644 nocyclades.patch create mode 100644 temp-patches.patch delete mode 100644 unusedvariable.patch diff --git a/.gitignore b/.gitignore index a914ee8..178db02 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,17 @@ /0.4.3.tar.gz /1.1.5.tar.gz /ninja.tar.gz +/1.0.2.zip +/cmake-3.19.6.tar.gz +/swift-cmark-gfm.zip +/swift-collections.zip +/swift-docc-render-artifact.tar.gz +/swift-docc-symbolkit.tar.gz +/swift-docc.tar.gz +/swift-lmdb.tar.gz +/swift-markdown.tar.gz +/swift-nio-ssl.zip +/swift-nio.zip +/swift-numerics.zip +/swift-stress-tester.tar.gz +/swift-system.zip diff --git a/goldinclude.patch b/goldinclude.patch new file mode 100644 index 0000000..fd0b3d2 --- /dev/null +++ b/goldinclude.patch @@ -0,0 +1,12 @@ +diff -Naur llvm-project-orig/llvm/cmake/config-ix.cmake llvm-project/llvm/cmake/config-ix.cmake +--- llvm-project-orig/llvm/cmake/config-ix.cmake 2022-02-14 16:28:34.599578465 -0600 ++++ llvm-project/llvm/cmake/config-ix.cmake 2022-02-14 16:30:08.863440853 -0600 +@@ -587,7 +587,7 @@ + endif() + + find_program(GOLD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.gold ld.gold ${LLVM_DEFAULT_TARGET_TRIPLE}-ld ld DOC "The gold linker") +-set(LLVM_BINUTILS_INCDIR "" CACHE PATH ++set(LLVM_BINUTILS_INCDIR "/usr/include" CACHE PATH + "PATH to binutils/include containing plugin-api.h for gold plugin.") + + if(CMAKE_GENERATOR STREQUAL "Ninja") diff --git a/nocyclades.patch b/nocyclades.patch deleted file mode 100644 index 72d7f52..0000000 --- a/nocyclades.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ---- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-28 10:17:04.000000000 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2021-05-31 08:19:34.794058378 -0500 -@@ -370,15 +370,6 @@ - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); -diff -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ---- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-28 10:17:04.000000000 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2021-05-31 12:30:07.414710413 -0500 -@@ -143,7 +143,6 @@ - # include - #endif - #include --#include - #include - #include - #include -@@ -459,7 +458,6 @@ - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -823,15 +821,6 @@ - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; -diff -Naur llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ---- llvm-project-orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-28 10:17:04.000000000 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2021-05-31 12:30:40.568693281 -0500 -@@ -983,7 +983,6 @@ - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/sources b/sources index c6aae60..027fe7d 100644 --- a/sources +++ b/sources @@ -1,21 +1,34 @@ SHA512 (0.4.3.tar.gz) = d5f4eefe7b7b215e76f8f035a2481c73fa716fe199894874122ea51a27c885ab7780647099fdbfbaebf7d8df1da1b59483d10e9fa869e26e3d34df881d14b665 +SHA512 (1.0.2.zip) = 38b63732b2b351c2e481ca5ec97000a4b704e19b0b886743523d5586af94daccf432ad4c6197bbdeb0e48918f4ac5ef4df947161dc53fcdd7530f2197f2cfbce SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 -SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 09ce0fb58ec97fde579113c0d9bb09cabea10b52593c35850f893455eeb2f1bfb4d514fc4d566fd90d5ebf442469aad0d64e68e1c47f6545ab8868ecf114760d -SHA512 (corelibs-foundation.tar.gz) = b0256af0d8c95022d8304e14c1df5b039618136858b9c8035adda1c1aa1d98404494c1d38e365d4d980f1b08593b431d55de01c2de4629ecaa37491a95d27074 -SHA512 (corelibs-libdispatch.tar.gz) = 6c5bbfe72c3e0976609aaf8c4d4405dc3dc14bcf2976dddf4803eed6ce5b03827808d18c7c5f840425da2568f5fdb254d4aa58ea7eb54f61f15f1e9929c48be2 -SHA512 (corelibs-xctest.tar.gz) = 8f07fcf8632f9e0b4f5b978b150124ca28400d5d092c6738191e0d57bcef06a7e29910bc5216be55ebc96ce087c8fa2e75fdf24c7e5447de021c6c9766d3de36 -SHA512 (indexstore-db.tar.gz) = e71acd2e4dc3771e6d8c2e58e01bd0d9c1b9c9b2bd6a71afb8bc43a3e8dcbcde81941608d5c40b2f1fc1419dd340bf6bd78464621be0d3e3e5c0b415f9a0b7e8 -SHA512 (llbuild.tar.gz) = 6b84a9175e89049d849bc1873a35a3f9ca2f106a91a08e8208b9b304f20496bf18ffdcb726520aafd80e0ec81e32848bf721d7a53158deba49b524a174697a96 -SHA512 (llvm-project.tar.gz) = 94d3c45fe5681749434f2ff73b448b8505449370a1a437d753dbab5a2d8571a33b5353900f4b35d6432885e944a37ff6274d52b4c58fe10ef62808dacad73c76 +SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 +SHA512 (cmark.tar.gz) = 427fa46a88925206707d9185433a830b90d155b7fbe8601b11f6ae56eb87ebabc2ac93b5a6d9876df604aac73da268feee3ec934e430c056ce891c09f9f67349 +SHA512 (corelibs-foundation.tar.gz) = 3cbb8662a4ce07130fb41f50dc701163d93f35965d97a54dfdfcd54de56a270b968e5b76c7f5b634c12688498029635e2812dfbae867e794462b3f30e7ef2ef7 +SHA512 (corelibs-libdispatch.tar.gz) = e449329e3ced90a0e9a98486a041e0b37c150de3ea1eebcb449271bd878a1e555298b747db7280f0918d1f8db428dc831cf8db46dd77b047bae9023820472c97 +SHA512 (corelibs-xctest.tar.gz) = 3edade7df0975ee9ffa6362ea7e6b86da5cb0d3c96f28e7e2dc4c2b067b97f754400ee2a7835f85e66481ad514e90ad86561a921bb1ba2ccc0715e6108ab6e5e +SHA512 (indexstore-db.tar.gz) = c7e1ba540d904d5800b5e07de52a1bb72fd72a35f4b6fce1a2d4e3df39cb9009282c30a78e0724ba1dc618c650ca25d9facaed04ae54e6c7a026aabb7a2a22bc +SHA512 (llbuild.tar.gz) = 34f221058f0a53069356a4747c1e307a596af5b315a8cdf3f3dd616268173e53601c5043153aa06b400d96fac1563139449f3c8152a8ef747e8d3636ee6c49f8 +SHA512 (llvm-project.tar.gz) = aa3bfd7c1099320dda9a531e9b20a4e82ce29b60e7e200e1462a2fab7dcabc62104dde357046cc692b53a9e9cea832497f50dd5a5733150d5a104ad24f946648 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = 978f5dd1d3607cf478f98e866c11a06ef1d6b534517a809b50655a9b46ffdd4d77a5bab48d36f74fe854f44ea4c24149bd8c7c00f236d723d96b91f75496e7e0 +SHA512 (package-manager.tar.gz) = dc3a761c0a5261696aaef6f3da0e1bf64ebf9bda5be1f8658444d0ae02cc106f127db405a35e94448a9711cc211c609e226f0d8cdaed4e8c4825a283d07096b5 SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = 90ce72ae810baf94390143cf69c37c30c09fefe2e82b69207f62b59ecf7744eb213ce63791e11fb44ea690c5dfe89217e45ac4e4af3997bd7878c22d1a2f06b0 -SHA512 (swift-driver.tar.gz) = f6f25ca854f5b28bd3ba00e1a27286e6cca6be6ad06806cbc5b76202ac28662b5a1ceaabf374f3ed3eac8448bcb1292baaaab54e8343e7ee3297cca81a4611d4 -SHA512 (swift-integration-tests.tar.gz) = c6161af17bb07bc16848dcfaa5afae7cb82c39907e1650586166620aa6e066044d2fdac9965b389816849c0a01280eee0c5c36c03eb86822959ba2e785870422 -SHA512 (swift-syntax.tar.gz) = 6fdd6c583160cb44288832f396b49bf1d5a69e33193045d0d22c3adbccbd000d0a5ee879fb71a1cb62c0d280f62a24c3b4bb1e1fd262d90b382374cb38dd26d0 -SHA512 (swift-tools-support-core.tar.gz) = 9ce75a861977aba45b8f1424ca8d6f1e2aa2491346665956378c7f68dac3080f5501f9d7eacb75dc3ee71abf5978dc68c5b89648b8b3df91ce3807bd719a45ce -SHA512 (swift-xcode-playground-support.tar.gz) = df2931e289c0599ef4d076f0af865355dc3781ab7ce7fc06768c9f7b9488271a958cbbdb6c25b061bf7c999d043878127eb4470592df4f3c94c3f3d385945b0f -SHA512 (swift.tar.gz) = 66395c1fb68b438d5bd9cfdba1989574357d5a7ea311933dc32b01a1e399c7606cad02cff3816526b028658b24b387148f2b7ea5158bf3c1a9dfe2807435f761 +SHA512 (sourcekit-lsp.tar.gz) = b67336789687b82a77f4dcf9a08ecf581a66bf0d4bdc3c00db2be693ff561e4f1504895c0a1246c1cf7f931fb60e9731d33618dd7669c66b6341ad285bb79cb4 +SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 +SHA512 (swift-collections.zip) = a883ccdfc2c2c9ead905c14102dbba0673f226671556d72d7c2458444dfed1681643976e4db8dd5184822a258361ec06e5cf7dfbdab64055bae313c4c346d25b +SHA512 (swift-docc-render-artifact.tar.gz) = 610589b620d6b12fa0dbf05d3e863f82a9854949564b3d8e3f10c1b4122c76c67e90c3b4c12b59ad8ec1ce42b43604759cfc8a2f86a1c93ab0ee5a995cfb6bc1 +SHA512 (swift-docc-symbolkit.tar.gz) = 6fa0f82db82b3778dc251a4de10fd6e6dbf6655d8f5aba93af157839ded6a994f1a96ec17c3bf725401641b714e476234168263d31faabfcca82614815305bd9 +SHA512 (swift-docc.tar.gz) = 25785304586e2ef1dc7b626d3d6cb7a1152191ec5855bbd450838e8e01eee861ca37753462bbb3927aeb855177692f9645ce44c85c3e2188efd3cf66d6c8b317 +SHA512 (swift-driver.tar.gz) = a66aa91704f602967aa8159f7e8de47aa185644534b9941b8efd6d301aa611bff59df7cd2738651347b20694b64a895b9343f542a00cd7f27e6f5dcf7d15b923 +SHA512 (swift-integration-tests.tar.gz) = 5ba4f847977bedd6b08ab26859b6750bdda4f078aca0270ffc28e652f71d4b944f087a2e8ab78ddfd64d22f25dabad781203d22695648da3cc6a23f63648b31e +SHA512 (swift-lmdb.tar.gz) = a7ed27b9a5a6fc8ef910659cf82ec44b506443381be6b992a7a6d1698c156c3e2a05c506f55f3065d171f19e9e15319ecd09d3c2cde4fdf2f80169890a1c55fd +SHA512 (swift-markdown.tar.gz) = b5dec762af69d4fa000e41996069178675e0f798dbde9992b73839dd3207c0cd4d3a8fcafb357acc76c67f90e5d632878d133c272ba1f7fc18d3066cc0357ec1 +SHA512 (swift-nio-ssl.zip) = ae44cf783ca7d16696532d0a9c0cdeb322b9eb6699087efbdb41d047e030492392858b7fa9f4cb80af9009a2af4f4442488b3673ea6675757bc1852542c8fd2a +SHA512 (swift-nio.zip) = 788bef190b0bf786167da5882184c870a0a0636533677f7495cc9585bb39952be800088be109100d2b9bdf748b92511ff4c973f71326631bd313e2e9c26c7f8e +SHA512 (swift-numerics.zip) = c7ccc01f9ca277b8aab2de9208bc9360b04f469e0ec811724772d558bb68f92056bb040f77ddf5c56bd9f18bf627f6cb48e4e11689722dadc92c0c4168134c39 +SHA512 (swift-stress-tester.tar.gz) = 65131dcbdc4f9a5e619e6c6d7212bd27e7a7267fdd8261dd3a2fac466d0243a9e3ab2813951482366e348470dcc5ab93ef5cbec5aaaa6552ea7e949b0ee28d7f +SHA512 (swift-syntax.tar.gz) = bf2c8c5227ac8e3fcd3345c4289877388b7a7e1a0a02362bb19c118780ebc3afb5eafa7b89f460652e339f6fc908f5377b1677325960fed62843c20e6b0520e2 +SHA512 (swift-system.zip) = 02d26bf01375168fc07be4bbc0cd6c39c2fd2cdabfbbd2a4c2d4e288118cdabab898b95c053afe1419e90bd85e86c1de0cf544505ecb154a70478c7d84b51bf5 +SHA512 (swift-tools-support-core.tar.gz) = 923fcfe87013c196c578c64a1cb07ef65b486afca7e6d550dab45fff005979672eacb8b773d19ca3d47879df6fd6f84c8cb212b203d45b9d3416efb046fb7ae3 +SHA512 (swift-xcode-playground-support.tar.gz) = 3faf9983fd340d938f65828e4ef3eaa8fbf26c03a097e0b6f276bd81827cf2523e99672ddca8efee9dde96787cdb3be466c102ccb1c9d5122da0c9bad8f41973 +SHA512 (swift.tar.gz) = b2db3b28af0505762edd607364161c703170888ab1795021b30c58aae9737552e5bb2045bc0511433b143042ff028f2dfa2ab1811ee1c93f17cd07f11037f19a diff --git a/swift-lang.spec b/swift-lang.spec index 8680407..f7fec3d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,15 +1,24 @@ %global debug_package %{nil} -%global swifttag 5.5.3-RELEASE +%undefine _auto_set_build_flags + +%global swifttag 5.6-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 %global sap_version 0.4.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 -%global cmake_version 3.16.5 +%global cmake_version 3.19.6 +%global swift_atomics_version 1.0.2 +%global swift_collections_version 1.0.1 +%global swift_numerics_version 1.0.1 +%global swift_system_version 1.1.1 +%global swift_nio_version 2.31.2 +%global swift_nio_ssl_version 2.15.0 +%global swift_cmark_gfm_branch release/5.6-gfm Name: swift-lang -Version: 5.5.3 +Version: 5.6 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -36,10 +45,23 @@ Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz Source20: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/refs/tags/%{swift_atomics_version}.zip +Source22: https://github.com/apple/swift-collections/archive/refs/tags/%{swift_collections_version}.zip#/swift-collections.zip +Source23: https://github.com/apple/swift-numerics/archive/refs/tags/%{swift_numerics_version}.zip#/swift-numerics.zip +Source24: https://github.com/apple/swift-system/archive/refs/tags/%{swift_system_version}.zip#/swift-system.zip +Source25: https://github.com/apple/swift-stress-tester/archive/swift-%{swifttag}.tar.gz#/swift-stress-tester.tar.gz +Source26: https://github.com/apple/swift-docc/archive/swift-%{swifttag}.tar.gz#/swift-docc.tar.gz +Source27: https://github.com/apple/swift-lmdb/archive/swift-%{swifttag}.tar.gz#/swift-lmdb.tar.gz +Source28: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swifttag}.tar.gz#/swift-docc-render-artifact.tar.gz +Source29: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swifttag}.tar.gz#/swift-docc-symbolkit.tar.gz +Source30: https://github.com/apple/swift-markdown/archive/swift-%{swifttag}.tar.gz#/swift-markdown.tar.gz +Source31: https://github.com/apple/swift-nio/archive/refs/tags/%{swift_nio_version}.zip#/swift-nio.zip +Source32: https://github.com/apple/swift-nio-ssl/archive/refs/tags/%{swift_nio_ssl_version}.zip#/swift-nio-ssl.zip +Source33: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_gfm_branch}.zip#/swift-cmark-gfm.zip + +Patch0: temp-patches.patch +Patch1: goldinclude.patch -Patch1: nocyclades.patch -Patch3: unusedvariable.patch - BuildRequires: clang BuildRequires: swig BuildRequires: rsync @@ -61,6 +83,7 @@ BuildRequires: /usr/bin/pathfix.py %if ! 0%{?el8} BuildRequires: python-unversioned-command %endif +BuildRequires: binutils-devel Requires: glibc-devel Requires: binutils-gold @@ -85,7 +108,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -107,6 +130,19 @@ mv swift-argument-parser-%{sap_version} swift-argument-parser mv swift-driver-swift-%{swifttag} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto mv cmake-%{cmake_version} cmake +mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-system-%{swift_system_version} swift-system +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-stress-tester-swift-%{swifttag} swift-stress-tester +mv swift-docc-swift-%{swifttag} swift-docc +mv swift-lmdb-swift-%{swifttag} swift-lmdb +mv swift-docc-render-artifact-swift-%{swifttag} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swifttag} swift-docc-symbolkit +mv swift-markdown-swift-%{swifttag} swift-markdown +mv swift-cmark-release-5.6-gfm swift-cmark-gfm # ICU mv icu-release-%{icu_version} icu @@ -117,16 +153,16 @@ mv Yams-%{yams_version} yams # Ninja mv ninja-%{ninja_version} ninja -# Remove Cyclades as it has been removed from the Linux kernel -%patch1 -p0 - -# Temp patch to test libdispatch issue with clang 13 -%patch3 -p0 - # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize +# Temp patch for testing building +%patch0 -p0 + +# Gold Linker issue with LLVM under Fedora 36 +%patch1 -p0 + %build export VERBOSE=1 @@ -171,10 +207,10 @@ export QA_SKIP_RPATHS=1 %changelog -* Tue Feb 15 2022 Ron Olson - 5.5.3-1 -- Updated to Swift 5.5.3-RELEASE -* Sat Jan 22 2022 Fedora Release Engineering - 5.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Wed Mar 30 2022 Ron Olson - 5.6-1 +- Updated to Swift 5.6-RELEASE +* Wed Jan 12 2022 Ron Olson - 5.6-1 +- First build of Swift-5.6 * Tue Dec 14 2021 Ron Olson - 5.5.2-1 - Updated to Swift 5.5.2-RELEASE * Wed Oct 27 2021 Ron Olson - 5.5.1-1 diff --git a/temp-patches.patch b/temp-patches.patch new file mode 100644 index 0000000..7569990 --- /dev/null +++ b/temp-patches.patch @@ -0,0 +1,11 @@ +--- swift-docc/build-script-helper.py.orig 2022-01-18 12:34:07.014018324 -0600 ++++ swift-docc/build-script-helper.py 2022-01-18 12:34:35.002731959 -0600 +@@ -261,7 +261,7 @@ + if verbose: + print(' '.join([escape_cmd_arg(arg) for arg in cmd])) + return os.path.join( +- subprocess.check_output(cmd, env=env).strip(), 'docc') ++ subprocess.check_output(cmd, env=env).strip().decode(), 'docc') + + def create_intermediate_directories(dir_path, verbose): + cmd = ["mkdir", "-p", dir_path] diff --git a/unusedvariable.patch b/unusedvariable.patch deleted file mode 100644 index e633cd1..0000000 --- a/unusedvariable.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --color -Naur swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c ---- swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c 2020-08-14 16:49:59.000000000 -0500 -+++ swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c 2021-09-17 18:40:21.684025320 -0500 -@@ -479,6 +479,7 @@ - return; // stack or GC or global - } - refcount = byref->flags & BLOCK_REFCOUNT_MASK; -+ (void)refcount; - os_assert(refcount); - if (latching_decr_int_should_deallocate(&byref->flags)) { - if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) { -diff --color -Naur swift-corelibs-libdispatch-orig/tests/bsdtestharness.c swift-corelibs-libdispatch/tests/bsdtestharness.c ---- swift-corelibs-libdispatch-orig/tests/bsdtestharness.c 2020-08-14 16:49:59.000000000 -0500 -+++ swift-corelibs-libdispatch/tests/bsdtestharness.c 2021-09-17 18:39:05.679434477 -0500 -@@ -152,6 +152,7 @@ - assert(pid > 0); - - #if defined(__linux__) -+ (void)to; - int status; - struct rusage usage; - struct timeval tv_stop, tv_wall; -diff --color -Naur swift-corelibs-libdispatch-orig/tests/dispatch_apply.c swift-corelibs-libdispatch/tests/dispatch_apply.c ---- swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2020-08-14 16:49:59.000000000 -0500 -+++ swift-corelibs-libdispatch/tests/dispatch_apply.c 2021-09-17 23:38:38.107488681 -0500 -@@ -56,7 +56,8 @@ - (void)ignored; - /* prevent i and j been optimized out */ - volatile uint64_t i = 0, j = 0; -- -+ (void)i; -+ (void)j; - OSAtomicIncrement32(&busy_threads_started); - - while(!all_done) From 7c9dd66d5717fbe53969ba9cf46979f332e0c8fc Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 13 Apr 2022 20:12:26 -0500 Subject: [PATCH 090/152] Updated to Swift 5.6.1-RELEASE --- enablelzma.patch | 11 +++++++++++ sources | 42 +++++++++++++++++++++--------------------- swift-lang.spec | 10 ++++++++-- 3 files changed, 40 insertions(+), 23 deletions(-) create mode 100644 enablelzma.patch diff --git a/enablelzma.patch b/enablelzma.patch new file mode 100644 index 0000000..5371a21 --- /dev/null +++ b/enablelzma.patch @@ -0,0 +1,11 @@ +--- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 ++++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 +@@ -2272,7 +2272,7 @@ + -DLLDB_ENABLE_CURSES=ON + -DLLDB_ENABLE_LIBEDIT=ON + -DLLDB_ENABLE_PYTHON=ON +- -DLLDB_ENABLE_LZMA=OFF ++ -DLLDB_ENABLE_LZMA=ON + -DLLDB_ENABLE_LUA=OFF + -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) + -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" diff --git a/sources b/sources index 027fe7d..c0b7d6b 100644 --- a/sources +++ b/sources @@ -3,32 +3,32 @@ SHA512 (1.0.2.zip) = 38b63732b2b351c2e481ca5ec97000a4b704e19b0b886743523d5586af9 SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 -SHA512 (cmark.tar.gz) = 427fa46a88925206707d9185433a830b90d155b7fbe8601b11f6ae56eb87ebabc2ac93b5a6d9876df604aac73da268feee3ec934e430c056ce891c09f9f67349 -SHA512 (corelibs-foundation.tar.gz) = 3cbb8662a4ce07130fb41f50dc701163d93f35965d97a54dfdfcd54de56a270b968e5b76c7f5b634c12688498029635e2812dfbae867e794462b3f30e7ef2ef7 -SHA512 (corelibs-libdispatch.tar.gz) = e449329e3ced90a0e9a98486a041e0b37c150de3ea1eebcb449271bd878a1e555298b747db7280f0918d1f8db428dc831cf8db46dd77b047bae9023820472c97 -SHA512 (corelibs-xctest.tar.gz) = 3edade7df0975ee9ffa6362ea7e6b86da5cb0d3c96f28e7e2dc4c2b067b97f754400ee2a7835f85e66481ad514e90ad86561a921bb1ba2ccc0715e6108ab6e5e -SHA512 (indexstore-db.tar.gz) = c7e1ba540d904d5800b5e07de52a1bb72fd72a35f4b6fce1a2d4e3df39cb9009282c30a78e0724ba1dc618c650ca25d9facaed04ae54e6c7a026aabb7a2a22bc -SHA512 (llbuild.tar.gz) = 34f221058f0a53069356a4747c1e307a596af5b315a8cdf3f3dd616268173e53601c5043153aa06b400d96fac1563139449f3c8152a8ef747e8d3636ee6c49f8 -SHA512 (llvm-project.tar.gz) = aa3bfd7c1099320dda9a531e9b20a4e82ce29b60e7e200e1462a2fab7dcabc62104dde357046cc692b53a9e9cea832497f50dd5a5733150d5a104ad24f946648 +SHA512 (cmark.tar.gz) = d116785651c1901df89b6880b3368f1401f8f5c5ef424eecb12a6991f49f2a0c6acd4c9d3ea9cf694d0820d6962f592ca082d322857f6c6bfe92845da9110090 +SHA512 (corelibs-foundation.tar.gz) = 4e7e8c3a2df55c7d2e67d75f82dfba4fab3b64e3748fa006c6e961d4117f6d6018ffa4c8ca866c89b66249c62853fba2cb87765f47c9aa26848bc53239e02ba7 +SHA512 (corelibs-libdispatch.tar.gz) = 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1 +SHA512 (corelibs-xctest.tar.gz) = 5f489dd5d796a9b42f71fac141b61974c4defb48516ff9dfdb8cece50e019fe6b5cf5888800eba0fad12951a32ec0393958edbf6e7586ea5b448eb49ea4489a2 +SHA512 (indexstore-db.tar.gz) = d9eb4afeca0b4b46fbfaf0f69add44b55729c51088eca5970c492f6475e97571e3af5deb9d15b5496eb34955462b8bdd504c3f6dc24407d1e606224804f914f1 +SHA512 (llbuild.tar.gz) = 1524d2e8ddb82f2a3f6c0fa4ff390869185c888bc39449f30e03b8d364a1e0293007cf48f8d402e1eebd8f6bfbff0b82f1a0ed60588c3789d4e7477dbb25107f +SHA512 (llvm-project.tar.gz) = 2f9fd71986a9694e4c468f049457f32f7f517331865ab7dceb9ec360a4cd78c9146b519bb08071f5223e7316d07550d9d1456b494c342b2924ef1abe827a7740 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = dc3a761c0a5261696aaef6f3da0e1bf64ebf9bda5be1f8658444d0ae02cc106f127db405a35e94448a9711cc211c609e226f0d8cdaed4e8c4825a283d07096b5 +SHA512 (package-manager.tar.gz) = e881896a37f2aac705424a4177933249159cb7361f381a685c87aaef511d6460e5dec7052a4b9f75ae14adbed56d1322af6de597d30e65b92f38ccdc6a77ebad SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = b67336789687b82a77f4dcf9a08ecf581a66bf0d4bdc3c00db2be693ff561e4f1504895c0a1246c1cf7f931fb60e9731d33618dd7669c66b6341ad285bb79cb4 +SHA512 (sourcekit-lsp.tar.gz) = 14337d41b85b095ebed71b3644c3e793c72d92899eddf27b78b4372159347383e8d63724442c75d32c8397381492db7bf13cff7879327d3512f41c54b3787ed1 SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 SHA512 (swift-collections.zip) = a883ccdfc2c2c9ead905c14102dbba0673f226671556d72d7c2458444dfed1681643976e4db8dd5184822a258361ec06e5cf7dfbdab64055bae313c4c346d25b -SHA512 (swift-docc-render-artifact.tar.gz) = 610589b620d6b12fa0dbf05d3e863f82a9854949564b3d8e3f10c1b4122c76c67e90c3b4c12b59ad8ec1ce42b43604759cfc8a2f86a1c93ab0ee5a995cfb6bc1 -SHA512 (swift-docc-symbolkit.tar.gz) = 6fa0f82db82b3778dc251a4de10fd6e6dbf6655d8f5aba93af157839ded6a994f1a96ec17c3bf725401641b714e476234168263d31faabfcca82614815305bd9 -SHA512 (swift-docc.tar.gz) = 25785304586e2ef1dc7b626d3d6cb7a1152191ec5855bbd450838e8e01eee861ca37753462bbb3927aeb855177692f9645ce44c85c3e2188efd3cf66d6c8b317 -SHA512 (swift-driver.tar.gz) = a66aa91704f602967aa8159f7e8de47aa185644534b9941b8efd6d301aa611bff59df7cd2738651347b20694b64a895b9343f542a00cd7f27e6f5dcf7d15b923 -SHA512 (swift-integration-tests.tar.gz) = 5ba4f847977bedd6b08ab26859b6750bdda4f078aca0270ffc28e652f71d4b944f087a2e8ab78ddfd64d22f25dabad781203d22695648da3cc6a23f63648b31e -SHA512 (swift-lmdb.tar.gz) = a7ed27b9a5a6fc8ef910659cf82ec44b506443381be6b992a7a6d1698c156c3e2a05c506f55f3065d171f19e9e15319ecd09d3c2cde4fdf2f80169890a1c55fd -SHA512 (swift-markdown.tar.gz) = b5dec762af69d4fa000e41996069178675e0f798dbde9992b73839dd3207c0cd4d3a8fcafb357acc76c67f90e5d632878d133c272ba1f7fc18d3066cc0357ec1 +SHA512 (swift-docc-render-artifact.tar.gz) = b21cea2d59cb4744d8b96a8d608b281ea73ef1a0fd190978eb2c3878cd35ea5258c19633f276c09e583facfaadc51cd93c5218bc9a4f941f3a1d8128ffafc29d +SHA512 (swift-docc-symbolkit.tar.gz) = 1528f57cbd4052b54984b39a5749f5b5847cd2da4131c8523572d6d12861463e778332a4bf3e3d44cb8b89decbccacbfacaa075110f0780c954dc64673a3f2fb +SHA512 (swift-docc.tar.gz) = 591bbdeb8d10d91ff19a6ed19966c635498a9e3e36bbe0033d5f8e7f4c99ef498f18ed9be001918e84e1c0b4f56ff33b818c62ba2a59c6a866c7c7fcaabee311 +SHA512 (swift-driver.tar.gz) = 1d212361f8691bd6abec15a276276a41bd69e8796099977c3647ab2041a609a1f07ef98d2787f23231eaf95769807660e1afc0e17f582b43edacda2de8ecc4ec +SHA512 (swift-integration-tests.tar.gz) = 940af690c29266ad64bfe9879bfa82ada87509a7e9dc60e3c9004f99c63cc9dff1ff7599f0d0bdade29d4158496d7b9e162941ae2e3b6b3ab05cec9a53e49a01 +SHA512 (swift-lmdb.tar.gz) = 9b461168b57b0f5e993160fda416a0b522198292fb5c1284107d416e3f169fd123183787fa196190508070c38903cb9736dacbd0ad5f501cde93944e5a6d3db6 +SHA512 (swift-markdown.tar.gz) = cb1b59b49f7b832ab99beab7f4a21aa8067b663b8dfcda651aeee6787f6971c8cb4e6f826aa38c3596b79fa3919766d657c79b1af4d829941078d40e17afcd81 SHA512 (swift-nio-ssl.zip) = ae44cf783ca7d16696532d0a9c0cdeb322b9eb6699087efbdb41d047e030492392858b7fa9f4cb80af9009a2af4f4442488b3673ea6675757bc1852542c8fd2a SHA512 (swift-nio.zip) = 788bef190b0bf786167da5882184c870a0a0636533677f7495cc9585bb39952be800088be109100d2b9bdf748b92511ff4c973f71326631bd313e2e9c26c7f8e SHA512 (swift-numerics.zip) = c7ccc01f9ca277b8aab2de9208bc9360b04f469e0ec811724772d558bb68f92056bb040f77ddf5c56bd9f18bf627f6cb48e4e11689722dadc92c0c4168134c39 -SHA512 (swift-stress-tester.tar.gz) = 65131dcbdc4f9a5e619e6c6d7212bd27e7a7267fdd8261dd3a2fac466d0243a9e3ab2813951482366e348470dcc5ab93ef5cbec5aaaa6552ea7e949b0ee28d7f -SHA512 (swift-syntax.tar.gz) = bf2c8c5227ac8e3fcd3345c4289877388b7a7e1a0a02362bb19c118780ebc3afb5eafa7b89f460652e339f6fc908f5377b1677325960fed62843c20e6b0520e2 +SHA512 (swift-stress-tester.tar.gz) = 6c508a08eaeab0de72427c70e98473bee730fbf0010979448847c05a5c68b539200425342f1e037c5455c562aff4556a26f0da3896fb8c81fef29c5c4356cecd +SHA512 (swift-syntax.tar.gz) = 4d3418d7397e3661f1600a028ee648d9910a67c62727e8a4c56de78afb294bf02fb38c35502b4474a326c89e440eb41c2f5c62ab73289df09165faba6d884299 SHA512 (swift-system.zip) = 02d26bf01375168fc07be4bbc0cd6c39c2fd2cdabfbbd2a4c2d4e288118cdabab898b95c053afe1419e90bd85e86c1de0cf544505ecb154a70478c7d84b51bf5 -SHA512 (swift-tools-support-core.tar.gz) = 923fcfe87013c196c578c64a1cb07ef65b486afca7e6d550dab45fff005979672eacb8b773d19ca3d47879df6fd6f84c8cb212b203d45b9d3416efb046fb7ae3 -SHA512 (swift-xcode-playground-support.tar.gz) = 3faf9983fd340d938f65828e4ef3eaa8fbf26c03a097e0b6f276bd81827cf2523e99672ddca8efee9dde96787cdb3be466c102ccb1c9d5122da0c9bad8f41973 -SHA512 (swift.tar.gz) = b2db3b28af0505762edd607364161c703170888ab1795021b30c58aae9737552e5bb2045bc0511433b143042ff028f2dfa2ab1811ee1c93f17cd07f11037f19a +SHA512 (swift-tools-support-core.tar.gz) = 9ab4e13c2abf6232787d56c068564886e29d285906f35c470c5e420d762da3d2420122d563669af7fc2485d8f1fe0a4c631f4908456d882cb415067244abfa91 +SHA512 (swift-xcode-playground-support.tar.gz) = 0b0b3f42b48c3d1d49833eba65b5fa09b1cc2ac7853770ff2c855bae8873ba7b3312dd41a3c4a594281aae20825ece978099deb4eed20d6947b63f6fa4e3fc23 +SHA512 (swift.tar.gz) = d4b36478c47d8819381afff0e9f7e2da98f4b026da4939e26c6871d6734991e74284f2678b05a9950c0af50421bfb6cfa02c0999ebd4a14ea64f55af46da0c34 diff --git a/swift-lang.spec b/swift-lang.spec index f7fec3d..17286a5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} %undefine _auto_set_build_flags -%global swifttag 5.6-RELEASE +%global swifttag 5.6.1-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 @@ -18,7 +18,7 @@ %global swift_cmark_gfm_branch release/5.6-gfm Name: swift-lang -Version: 5.6 +Version: 5.6.1 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -61,6 +61,7 @@ Source33: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_ Patch0: temp-patches.patch Patch1: goldinclude.patch +Patch2: enablelzma.patch BuildRequires: clang BuildRequires: swig @@ -163,6 +164,9 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/h # Gold Linker issue with LLVM under Fedora 36 %patch1 -p0 +# Enable LZMA +%patch2 -p0 + %build export VERBOSE=1 @@ -207,6 +211,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Apr 11 2022 Ron Olson - 5.6.1-1 +- Updated to Swift 5.6.1-RELEASE * Wed Mar 30 2022 Ron Olson - 5.6-1 - Updated to Swift 5.6-RELEASE * Wed Jan 12 2022 Ron Olson - 5.6-1 From 2fe3715eb88154ab77313ee3ed7340bcc83a485f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 22 Apr 2022 09:05:03 -0500 Subject: [PATCH 091/152] Removed older version of ncurses-devel --- swift-lang.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 17286a5..558171e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -19,7 +19,7 @@ Name: swift-lang Version: 5.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -90,7 +90,6 @@ Requires: glibc-devel Requires: binutils-gold Requires: gcc Requires: ncurses-devel -Requires: ncurses-compat-libs ExclusiveArch: x86_64 aarch64 @@ -211,6 +210,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Apr 21 2022 Ron Olson - 5.6.1-2 +- Removed ncurses-compat-libs as a runtime dependency as it + has been removed from Fedora Rawhide * Mon Apr 11 2022 Ron Olson - 5.6.1-1 - Updated to Swift 5.6.1-RELEASE * Wed Mar 30 2022 Ron Olson - 5.6-1 From 1947aad17a513c71962ac8c05be188a4dc4f31df Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 10 May 2022 11:32:23 -0500 Subject: [PATCH 092/152] RHEL and CentOS 8 have binutils, not binutils-gold --- swift-lang.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 558171e..f113e32 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -19,7 +19,7 @@ Name: swift-lang Version: 5.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -87,7 +87,11 @@ BuildRequires: python-unversioned-command BuildRequires: binutils-devel Requires: glibc-devel +%if 0%{?rhel} && 0%{?rhel} == 8 +Requires: binutils +%else Requires: binutils-gold +%endif Requires: gcc Requires: ncurses-devel @@ -210,6 +214,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue May 10 2022 Ron Olson - 5.6.1-3 +- Discovered that EPEL-8 doesn't have binutils-gold (again) * Thu Apr 21 2022 Ron Olson - 5.6.1-2 - Removed ncurses-compat-libs as a runtime dependency as it has been removed from Fedora Rawhide From f575ac71f4a0da7215fa3911828a734ecd6b3d56 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 22:01:08 +0200 Subject: [PATCH 093/152] Rebuilt for Python 3.11 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index f113e32..fb7b633 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -19,7 +19,7 @@ Name: swift-lang Version: 5.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -214,6 +214,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Jun 13 2022 Python Maint - 5.6.1-4 +- Rebuilt for Python 3.11 + * Tue May 10 2022 Ron Olson - 5.6.1-3 - Discovered that EPEL-8 doesn't have binutils-gold (again) * Thu Apr 21 2022 Ron Olson - 5.6.1-2 From 2b19d2344e5d47cf559abb8f5fc8247c3fae5780 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 20 Jun 2022 10:04:12 -0500 Subject: [PATCH 094/152] Updated to Swift 5.6.2-RELEASE --- sources | 42 +++++++++++++++---------------- swift-lang.spec => swiftlang.spec | 9 ++++--- 2 files changed, 26 insertions(+), 25 deletions(-) rename swift-lang.spec => swiftlang.spec (99%) diff --git a/sources b/sources index c0b7d6b..a4f05df 100644 --- a/sources +++ b/sources @@ -3,32 +3,32 @@ SHA512 (1.0.2.zip) = 38b63732b2b351c2e481ca5ec97000a4b704e19b0b886743523d5586af9 SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 -SHA512 (cmark.tar.gz) = d116785651c1901df89b6880b3368f1401f8f5c5ef424eecb12a6991f49f2a0c6acd4c9d3ea9cf694d0820d6962f592ca082d322857f6c6bfe92845da9110090 -SHA512 (corelibs-foundation.tar.gz) = 4e7e8c3a2df55c7d2e67d75f82dfba4fab3b64e3748fa006c6e961d4117f6d6018ffa4c8ca866c89b66249c62853fba2cb87765f47c9aa26848bc53239e02ba7 -SHA512 (corelibs-libdispatch.tar.gz) = 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1 -SHA512 (corelibs-xctest.tar.gz) = 5f489dd5d796a9b42f71fac141b61974c4defb48516ff9dfdb8cece50e019fe6b5cf5888800eba0fad12951a32ec0393958edbf6e7586ea5b448eb49ea4489a2 -SHA512 (indexstore-db.tar.gz) = d9eb4afeca0b4b46fbfaf0f69add44b55729c51088eca5970c492f6475e97571e3af5deb9d15b5496eb34955462b8bdd504c3f6dc24407d1e606224804f914f1 -SHA512 (llbuild.tar.gz) = 1524d2e8ddb82f2a3f6c0fa4ff390869185c888bc39449f30e03b8d364a1e0293007cf48f8d402e1eebd8f6bfbff0b82f1a0ed60588c3789d4e7477dbb25107f -SHA512 (llvm-project.tar.gz) = 2f9fd71986a9694e4c468f049457f32f7f517331865ab7dceb9ec360a4cd78c9146b519bb08071f5223e7316d07550d9d1456b494c342b2924ef1abe827a7740 +SHA512 (cmark.tar.gz) = a1e5fb5e3ee5b0f863c07c0288a82756e280eb28f68a38eb3944ec84f75db14605beaf8441d818458e63c48222193414cb6f4daa81c3ce64b4180327e6182287 +SHA512 (corelibs-foundation.tar.gz) = f02b538ecd18bd026a2436fac91d62a0fd98c0a7bcfd3ca13740caf3f61c17f87a138c6c2d8810e5e6cd5b23fc22d910c994cf0d65926e29c3ba44ad29749d55 +SHA512 (corelibs-libdispatch.tar.gz) = bd1a7c6eefadb1009448b937ddf3a388e3608bf1a2dff282c8eb5714679e2f17c4dd389b5a28c2898a32fd3609f3fdbf675ef04bc84fe63bffee0ca867f192ed +SHA512 (corelibs-xctest.tar.gz) = 9c1e3cbe6552d97f11ab3b2f3b6b245867257489fd1edf40ea8c2e434cf876e0a25f97dd4a9d80530b011662c1f763cc5d5ede0526860f6f9274793bd587ec33 +SHA512 (indexstore-db.tar.gz) = bec5df3d7e8c228008d4abbbeafb00d90db7cdd14214e686977b4dba5b3a79dbea1febc72b8d5f85be645e9a34fd9f3241908af711f320c291996e0204905aee +SHA512 (llbuild.tar.gz) = 1c26244704b64429770b310c0489ca6bd35d80a4180c9acfa0c5dbe0beecc347412c7039f77d30a41c0ff8e22432d8fbb4fc6c855605e426ce947c7f823062e4 +SHA512 (llvm-project.tar.gz) = 312ab094562488abce8e373460b3bd5571f177d2bba9f9515fe83ea6eaa8384ca36935d8cdcfacb5dc44aa0180b615eb9de98360eaf5008e123a9a492dc3b281 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = e881896a37f2aac705424a4177933249159cb7361f381a685c87aaef511d6460e5dec7052a4b9f75ae14adbed56d1322af6de597d30e65b92f38ccdc6a77ebad +SHA512 (package-manager.tar.gz) = 7ade97bfc232fbfa539f2eeca610be4e257f4586b2ded9c9ff45435e9571a22ff55d1955b2a68eed853805fd69b3df2fa79d53aa389e08de40398942413d955e SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = 14337d41b85b095ebed71b3644c3e793c72d92899eddf27b78b4372159347383e8d63724442c75d32c8397381492db7bf13cff7879327d3512f41c54b3787ed1 +SHA512 (sourcekit-lsp.tar.gz) = ae92c3d318aee4666a7ae65b1a8e115f4c2b02b653114414d51147b4abe38556acc7dc445d321840a0d702e257fdbe4e9dc91eeb053a821eb9f51fb062c054cc SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 SHA512 (swift-collections.zip) = a883ccdfc2c2c9ead905c14102dbba0673f226671556d72d7c2458444dfed1681643976e4db8dd5184822a258361ec06e5cf7dfbdab64055bae313c4c346d25b -SHA512 (swift-docc-render-artifact.tar.gz) = b21cea2d59cb4744d8b96a8d608b281ea73ef1a0fd190978eb2c3878cd35ea5258c19633f276c09e583facfaadc51cd93c5218bc9a4f941f3a1d8128ffafc29d -SHA512 (swift-docc-symbolkit.tar.gz) = 1528f57cbd4052b54984b39a5749f5b5847cd2da4131c8523572d6d12861463e778332a4bf3e3d44cb8b89decbccacbfacaa075110f0780c954dc64673a3f2fb -SHA512 (swift-docc.tar.gz) = 591bbdeb8d10d91ff19a6ed19966c635498a9e3e36bbe0033d5f8e7f4c99ef498f18ed9be001918e84e1c0b4f56ff33b818c62ba2a59c6a866c7c7fcaabee311 -SHA512 (swift-driver.tar.gz) = 1d212361f8691bd6abec15a276276a41bd69e8796099977c3647ab2041a609a1f07ef98d2787f23231eaf95769807660e1afc0e17f582b43edacda2de8ecc4ec -SHA512 (swift-integration-tests.tar.gz) = 940af690c29266ad64bfe9879bfa82ada87509a7e9dc60e3c9004f99c63cc9dff1ff7599f0d0bdade29d4158496d7b9e162941ae2e3b6b3ab05cec9a53e49a01 -SHA512 (swift-lmdb.tar.gz) = 9b461168b57b0f5e993160fda416a0b522198292fb5c1284107d416e3f169fd123183787fa196190508070c38903cb9736dacbd0ad5f501cde93944e5a6d3db6 -SHA512 (swift-markdown.tar.gz) = cb1b59b49f7b832ab99beab7f4a21aa8067b663b8dfcda651aeee6787f6971c8cb4e6f826aa38c3596b79fa3919766d657c79b1af4d829941078d40e17afcd81 +SHA512 (swift-docc-render-artifact.tar.gz) = 1ba9c3a37f580a4306691d574bec7f635495b43f92915b8b6716ab90b95cbd4b100edb627e032e1be15787048477c500652ff0048f48fe0bf9366ea77dd5ae8c +SHA512 (swift-docc-symbolkit.tar.gz) = e20e19c80d56ecdfb289161bdcd02724bb6d77b7c6f1fd58c88b5b6e6582ec9c60e585d488c050acdced338574e5246a1d95eaaaebbe9e204b173f67b613b0f0 +SHA512 (swift-docc.tar.gz) = e191868394311f0ae27d479c238f06ebcb41f09b36958204d1c62699d18e86bdbd93ba9e172767a8d2b276fb4b4be7883adb354132b240c324a824c4b69911f6 +SHA512 (swift-driver.tar.gz) = 936a3f5f3c48b4e68be9f06fe667631b0d9d151ac93a6713cffd2b19608efcc452fe71baaeb971545078fa33029ef4076eac9fb9ae63266b2d846dd8719a300c +SHA512 (swift-integration-tests.tar.gz) = b2fddd723492eef982ad426243d7bd46703fbd34ba86e244fb035bc66b86f15ab3f9adaf00306476960de9173a4bc6f7e12dfcc2f45521e7ed6994c14d402742 +SHA512 (swift-lmdb.tar.gz) = 5e963d8ee9a95b8495c51c3bbd7e984711d5f9a19f1e6d5169df866d6c768e3a5c9d4b3eda8233a8cbf385ddaa5ee7970459ee025ea3ec4f81bf602ea2be9534 +SHA512 (swift-markdown.tar.gz) = 03d458486ed0387a4cf6dd9daa32ebc173ee5c3b77dfb35cbf4d7a6b68300b58b19baeff2c70e01a75f8acd1af8517e47194c6461c64ec7d8f1f8aae98bed069 SHA512 (swift-nio-ssl.zip) = ae44cf783ca7d16696532d0a9c0cdeb322b9eb6699087efbdb41d047e030492392858b7fa9f4cb80af9009a2af4f4442488b3673ea6675757bc1852542c8fd2a SHA512 (swift-nio.zip) = 788bef190b0bf786167da5882184c870a0a0636533677f7495cc9585bb39952be800088be109100d2b9bdf748b92511ff4c973f71326631bd313e2e9c26c7f8e SHA512 (swift-numerics.zip) = c7ccc01f9ca277b8aab2de9208bc9360b04f469e0ec811724772d558bb68f92056bb040f77ddf5c56bd9f18bf627f6cb48e4e11689722dadc92c0c4168134c39 -SHA512 (swift-stress-tester.tar.gz) = 6c508a08eaeab0de72427c70e98473bee730fbf0010979448847c05a5c68b539200425342f1e037c5455c562aff4556a26f0da3896fb8c81fef29c5c4356cecd -SHA512 (swift-syntax.tar.gz) = 4d3418d7397e3661f1600a028ee648d9910a67c62727e8a4c56de78afb294bf02fb38c35502b4474a326c89e440eb41c2f5c62ab73289df09165faba6d884299 +SHA512 (swift-stress-tester.tar.gz) = eba0e27e1671e6fbf0b48494fa5ba7b4380d5bfc0afca15abef03f4dbe17ba95b51f9ace78218ae6562904326c1b46746c918caaa7aa34cde59da1c7cade9fd8 +SHA512 (swift-syntax.tar.gz) = 9d2ba256e601e04565bf45522de6e78858e1630f5e4d1e32fae55c9c8dd6e69db415f20305f37f611c2b14395f25ad24e0e472ce3c947c4ba4ba70d4bb3f88b1 SHA512 (swift-system.zip) = 02d26bf01375168fc07be4bbc0cd6c39c2fd2cdabfbbd2a4c2d4e288118cdabab898b95c053afe1419e90bd85e86c1de0cf544505ecb154a70478c7d84b51bf5 -SHA512 (swift-tools-support-core.tar.gz) = 9ab4e13c2abf6232787d56c068564886e29d285906f35c470c5e420d762da3d2420122d563669af7fc2485d8f1fe0a4c631f4908456d882cb415067244abfa91 -SHA512 (swift-xcode-playground-support.tar.gz) = 0b0b3f42b48c3d1d49833eba65b5fa09b1cc2ac7853770ff2c855bae8873ba7b3312dd41a3c4a594281aae20825ece978099deb4eed20d6947b63f6fa4e3fc23 -SHA512 (swift.tar.gz) = d4b36478c47d8819381afff0e9f7e2da98f4b026da4939e26c6871d6734991e74284f2678b05a9950c0af50421bfb6cfa02c0999ebd4a14ea64f55af46da0c34 +SHA512 (swift-tools-support-core.tar.gz) = 9a1c7cc30108d12ad041cdb6158300628ac951a71a2f188094a0eaeff8fe3e8ed3c9fcbee73fb9f13a7b69e000add3b9d37ce1a2adac9e434c64222a3e272114 +SHA512 (swift-xcode-playground-support.tar.gz) = c47bad89490ce793e3e5bffa69690e46eedc2ace2dc2001df7d9aff6e2694b54dc980b45788de0e5ed185cf51306985ad8ae062e629dd28ba3e80f2829532ce8 +SHA512 (swift.tar.gz) = fe989e50395f79f9b9f7e0891bc153f70963754015bc21958b79fbfda02aab85f6db059472bdc5ef6d06a9495f0babe7095cb668a91bb6d49a056f2539a78e9c diff --git a/swift-lang.spec b/swiftlang.spec similarity index 99% rename from swift-lang.spec rename to swiftlang.spec index fb7b633..7dc5ef6 100644 --- a/swift-lang.spec +++ b/swiftlang.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} %undefine _auto_set_build_flags -%global swifttag 5.6.1-RELEASE +%global swifttag 5.6.2-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 @@ -18,8 +18,8 @@ %global swift_cmark_gfm_branch release/5.6-gfm Name: swift-lang -Version: 5.6.1 -Release: 4%{?dist} +Version: 5.6.2 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -214,9 +214,10 @@ export QA_SKIP_RPATHS=1 %changelog +* Sun Jun 19 2022 Ron Olson - 5.6.2-1 +- Updated to Swift 5.6.2-RELEASE * Mon Jun 13 2022 Python Maint - 5.6.1-4 - Rebuilt for Python 3.11 - * Tue May 10 2022 Ron Olson - 5.6.1-3 - Discovered that EPEL-8 doesn't have binutils-gold (again) * Thu Apr 21 2022 Ron Olson - 5.6.1-2 From 771f11f8b0ac5b20b49a3f51640e175e527e5ece Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 22 Jun 2022 15:24:37 -0500 Subject: [PATCH 095/152] Update to Swift-5.6.2-RELEASE --- swiftlang.spec => swift-lang.spec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename swiftlang.spec => swift-lang.spec (100%) diff --git a/swiftlang.spec b/swift-lang.spec similarity index 100% rename from swiftlang.spec rename to swift-lang.spec From a8bd2441dde922275a51656c59160fd9cf31a649 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:50:11 +0000 Subject: [PATCH 096/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 7dc5ef6..dfff501 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -19,7 +19,7 @@ Name: swift-lang Version: 5.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -214,6 +214,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 19 2022 Ron Olson - 5.6.2-1 - Updated to Swift 5.6.2-RELEASE * Mon Jun 13 2022 Python Maint - 5.6.1-4 From 8468d61ee1f2365a3dfec32b87e1fbb540f5031c Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 4 Aug 2022 15:24:36 -0500 Subject: [PATCH 097/152] Changes for Bugzilla 2114563 --- fs.patch | 15 +++++++++++++++ swift-lang.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 fs.patch diff --git a/fs.patch b/fs.patch new file mode 100644 index 0000000..fa12d1d --- /dev/null +++ b/fs.patch @@ -0,0 +1,15 @@ +--- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp.orig 2022-08-03 19:13:51.591055629 -0500 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2022-08-03 19:13:56.112348435 -0500 +@@ -73,7 +73,11 @@ + #include + #include + #include +-#include ++//#include ++#define FS_IOC_GETFLAGS _IOR('f', 1, long) ++#define FS_IOC_SETFLAGS _IOW('f', 2, long) ++#define FS_IOC_GETVERSION _IOR('v', 1, long) ++#define FS_IOC_SETVERSION _IOW('v', 2, long) + #include + #include + #include diff --git a/swift-lang.spec b/swift-lang.spec index dfff501..ded8940 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -19,7 +19,7 @@ Name: swift-lang Version: 5.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -62,6 +62,7 @@ Source33: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_ Patch0: temp-patches.patch Patch1: goldinclude.patch Patch2: enablelzma.patch +Patch3: fs.patch BuildRequires: clang BuildRequires: swig @@ -170,6 +171,8 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/h # Enable LZMA %patch2 -p0 +# Fix issues including linux/fs.h causing duplicate defintions +%patch3 -p0 %build export VERBOSE=1 @@ -214,6 +217,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Aug 04 2022 Ron Olson - 5.6.2-3 +Fixed issue of building Swift with glibc 2.36 on Fedora 37 + * Sat Jul 23 2022 Fedora Release Engineering - 5.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3aff529423fc9a3c9381411ec23f8a928135c59b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 6 Sep 2022 09:09:43 -0500 Subject: [PATCH 098/152] Updated to Swift-5.6.3-RELEASE --- sources | 42 +++++++++++++++++++++--------------------- swift-lang.spec | 10 ++++++---- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/sources b/sources index a4f05df..be23dcf 100644 --- a/sources +++ b/sources @@ -3,32 +3,32 @@ SHA512 (1.0.2.zip) = 38b63732b2b351c2e481ca5ec97000a4b704e19b0b886743523d5586af9 SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 -SHA512 (cmark.tar.gz) = a1e5fb5e3ee5b0f863c07c0288a82756e280eb28f68a38eb3944ec84f75db14605beaf8441d818458e63c48222193414cb6f4daa81c3ce64b4180327e6182287 -SHA512 (corelibs-foundation.tar.gz) = f02b538ecd18bd026a2436fac91d62a0fd98c0a7bcfd3ca13740caf3f61c17f87a138c6c2d8810e5e6cd5b23fc22d910c994cf0d65926e29c3ba44ad29749d55 -SHA512 (corelibs-libdispatch.tar.gz) = bd1a7c6eefadb1009448b937ddf3a388e3608bf1a2dff282c8eb5714679e2f17c4dd389b5a28c2898a32fd3609f3fdbf675ef04bc84fe63bffee0ca867f192ed -SHA512 (corelibs-xctest.tar.gz) = 9c1e3cbe6552d97f11ab3b2f3b6b245867257489fd1edf40ea8c2e434cf876e0a25f97dd4a9d80530b011662c1f763cc5d5ede0526860f6f9274793bd587ec33 -SHA512 (indexstore-db.tar.gz) = bec5df3d7e8c228008d4abbbeafb00d90db7cdd14214e686977b4dba5b3a79dbea1febc72b8d5f85be645e9a34fd9f3241908af711f320c291996e0204905aee -SHA512 (llbuild.tar.gz) = 1c26244704b64429770b310c0489ca6bd35d80a4180c9acfa0c5dbe0beecc347412c7039f77d30a41c0ff8e22432d8fbb4fc6c855605e426ce947c7f823062e4 -SHA512 (llvm-project.tar.gz) = 312ab094562488abce8e373460b3bd5571f177d2bba9f9515fe83ea6eaa8384ca36935d8cdcfacb5dc44aa0180b615eb9de98360eaf5008e123a9a492dc3b281 +SHA512 (cmark.tar.gz) = dda293e574906eeb24d3184b0bad5da0ee33ebe95ead2977bf4665de32ba9fdc7f8e79e27806bac364ab8ba3a174c359e9976780880e57e21f7ee71a38cd36b5 +SHA512 (corelibs-foundation.tar.gz) = 7d6869c52bbc22954686774695830abdf21a549864f5d54175a7567ce269e135e3b808cf6ab11dee9af4d16947a2e2d02a2afbae139b7de6af04035204e9e258 +SHA512 (corelibs-libdispatch.tar.gz) = 35f2b29205e2df552bf9b155be0955516d565d9903e4ca9bc9f1255d30e5284d8df25c131d1dc041d3881395c3835e58a1496167fff609465cf20aad513d22e3 +SHA512 (corelibs-xctest.tar.gz) = 506116ab24c24bd1fbcb09c747c205373a4f220b45f76f6228b029b26caecf0489bab168f1bdcf276d73d3522cbf5cd1f160972e677023e3be5738613be0ea8c +SHA512 (indexstore-db.tar.gz) = 26e19846c6f80b67c903b2d279f4aa0536e09246beff0a3dab9a38d7c87a7c6c0c7ce0e9d68593d75b962937ac5a2c9d8475a21bae5554f801c632c9a3be4203 +SHA512 (llbuild.tar.gz) = 852168b70f8599cea7a528a1201fcc077c586d5125a54cfbb249c8ca4727b76be630e3a8b3ee25c06030628295ce23986de72cebdd95c7485560ba4f241fff09 +SHA512 (llvm-project.tar.gz) = 96cd7e459c85ca28eb5f14da0709a82d8aa2eb108946df30aa3f7c5367c6df440d54cc460c95576d4827bf5f2b6c0fd099eb00bca8c7ddcef1afbc9391e23e3e SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = 7ade97bfc232fbfa539f2eeca610be4e257f4586b2ded9c9ff45435e9571a22ff55d1955b2a68eed853805fd69b3df2fa79d53aa389e08de40398942413d955e +SHA512 (package-manager.tar.gz) = 61fbeaca9eb1145d2217cf3109f26592b3ec456afe1059bec5bc289a1d17050ec8efdb9e97224fb3c79d3d1266c5dc09de473226c77195e2b2d45a93e28767d3 SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = ae92c3d318aee4666a7ae65b1a8e115f4c2b02b653114414d51147b4abe38556acc7dc445d321840a0d702e257fdbe4e9dc91eeb053a821eb9f51fb062c054cc +SHA512 (sourcekit-lsp.tar.gz) = d6f722caaaa1890cd4efccb160fd88541f1b20cec1ce667440cec7e21e17f674e7c824be475809e96aa3086fe96cba2ff753e917364705c83267a752d37e98ea SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 SHA512 (swift-collections.zip) = a883ccdfc2c2c9ead905c14102dbba0673f226671556d72d7c2458444dfed1681643976e4db8dd5184822a258361ec06e5cf7dfbdab64055bae313c4c346d25b -SHA512 (swift-docc-render-artifact.tar.gz) = 1ba9c3a37f580a4306691d574bec7f635495b43f92915b8b6716ab90b95cbd4b100edb627e032e1be15787048477c500652ff0048f48fe0bf9366ea77dd5ae8c -SHA512 (swift-docc-symbolkit.tar.gz) = e20e19c80d56ecdfb289161bdcd02724bb6d77b7c6f1fd58c88b5b6e6582ec9c60e585d488c050acdced338574e5246a1d95eaaaebbe9e204b173f67b613b0f0 -SHA512 (swift-docc.tar.gz) = e191868394311f0ae27d479c238f06ebcb41f09b36958204d1c62699d18e86bdbd93ba9e172767a8d2b276fb4b4be7883adb354132b240c324a824c4b69911f6 -SHA512 (swift-driver.tar.gz) = 936a3f5f3c48b4e68be9f06fe667631b0d9d151ac93a6713cffd2b19608efcc452fe71baaeb971545078fa33029ef4076eac9fb9ae63266b2d846dd8719a300c -SHA512 (swift-integration-tests.tar.gz) = b2fddd723492eef982ad426243d7bd46703fbd34ba86e244fb035bc66b86f15ab3f9adaf00306476960de9173a4bc6f7e12dfcc2f45521e7ed6994c14d402742 -SHA512 (swift-lmdb.tar.gz) = 5e963d8ee9a95b8495c51c3bbd7e984711d5f9a19f1e6d5169df866d6c768e3a5c9d4b3eda8233a8cbf385ddaa5ee7970459ee025ea3ec4f81bf602ea2be9534 -SHA512 (swift-markdown.tar.gz) = 03d458486ed0387a4cf6dd9daa32ebc173ee5c3b77dfb35cbf4d7a6b68300b58b19baeff2c70e01a75f8acd1af8517e47194c6461c64ec7d8f1f8aae98bed069 +SHA512 (swift-docc-render-artifact.tar.gz) = dde953565fa6bb9d83fc026c67405f4fd5f9c1ccc6057cbce5fb1005b1bfcfaae93c63d8093a2ca4aa33f4eadb1b83571fdba3107093417679b74e4b1a3dbfe5 +SHA512 (swift-docc-symbolkit.tar.gz) = 5b32cf222b4e4da67577f4ea7524381f4a48765f24b4f0f3208611be18e7bf1a851079ee2beb7f5c2319cb068d09a646161e6dba07f5bae87fef5da459c28946 +SHA512 (swift-docc.tar.gz) = 717a9e37b91f65113c6092110c0e6cb0e0a181392f7ce07dfa1c72a15151e41355f8a3dd6edaa05a6dcbc6e8b8be2a187bb1117ee989d0e98f3d127974c7e852 +SHA512 (swift-driver.tar.gz) = ac03fa9e8ab2b5215b388772f588f2ad30730f0eaea93156630d78aaf09db48457bdaa1a378bc3ed6cd22841e34b29274d18f31cc35ddbf0015ca79c3c3ccab6 +SHA512 (swift-integration-tests.tar.gz) = edf68e17876ebc154098338cea08242df759face44e449c5403fcbbbc53eadbcf2f1eacacd3dc55a51c9db6293328539fa6bdd7efcd8e7a94e6efa5a00a45585 +SHA512 (swift-lmdb.tar.gz) = 883a461ebe7bc17e99711a8deb46786f05c451338db661deda1c3b6ab3c53602abd40ee3d68ad1fe0d167816eeeec9e3c708aa62e20e7458eb098bab8521130b +SHA512 (swift-markdown.tar.gz) = c3a83009044cf9a184114364e7d82e8b6c8161b43e4d4085fab09141f33cb5f2da48b6cb1051d21081e04061bfbf22e733249713bd00f207700f071a71cba6ff SHA512 (swift-nio-ssl.zip) = ae44cf783ca7d16696532d0a9c0cdeb322b9eb6699087efbdb41d047e030492392858b7fa9f4cb80af9009a2af4f4442488b3673ea6675757bc1852542c8fd2a SHA512 (swift-nio.zip) = 788bef190b0bf786167da5882184c870a0a0636533677f7495cc9585bb39952be800088be109100d2b9bdf748b92511ff4c973f71326631bd313e2e9c26c7f8e SHA512 (swift-numerics.zip) = c7ccc01f9ca277b8aab2de9208bc9360b04f469e0ec811724772d558bb68f92056bb040f77ddf5c56bd9f18bf627f6cb48e4e11689722dadc92c0c4168134c39 -SHA512 (swift-stress-tester.tar.gz) = eba0e27e1671e6fbf0b48494fa5ba7b4380d5bfc0afca15abef03f4dbe17ba95b51f9ace78218ae6562904326c1b46746c918caaa7aa34cde59da1c7cade9fd8 -SHA512 (swift-syntax.tar.gz) = 9d2ba256e601e04565bf45522de6e78858e1630f5e4d1e32fae55c9c8dd6e69db415f20305f37f611c2b14395f25ad24e0e472ce3c947c4ba4ba70d4bb3f88b1 +SHA512 (swift-stress-tester.tar.gz) = fc6cd0ed04dafdd97a714028f540b610691303e3797680d96160ab3c80bcf3b6a1b4273e375ddc3f550fba35be5f2bf45c85a5e033fa0e7788142ec167f667d7 +SHA512 (swift-syntax.tar.gz) = 2cfacc5fb6392c90097faad4b32ca8fa19867bc878d2dc9a64430abdbf314472afd69702f0ffbeb11d6f4e214012003bcd9ab245129560f5abf2e209f39a9643 SHA512 (swift-system.zip) = 02d26bf01375168fc07be4bbc0cd6c39c2fd2cdabfbbd2a4c2d4e288118cdabab898b95c053afe1419e90bd85e86c1de0cf544505ecb154a70478c7d84b51bf5 -SHA512 (swift-tools-support-core.tar.gz) = 9a1c7cc30108d12ad041cdb6158300628ac951a71a2f188094a0eaeff8fe3e8ed3c9fcbee73fb9f13a7b69e000add3b9d37ce1a2adac9e434c64222a3e272114 -SHA512 (swift-xcode-playground-support.tar.gz) = c47bad89490ce793e3e5bffa69690e46eedc2ace2dc2001df7d9aff6e2694b54dc980b45788de0e5ed185cf51306985ad8ae062e629dd28ba3e80f2829532ce8 -SHA512 (swift.tar.gz) = fe989e50395f79f9b9f7e0891bc153f70963754015bc21958b79fbfda02aab85f6db059472bdc5ef6d06a9495f0babe7095cb668a91bb6d49a056f2539a78e9c +SHA512 (swift-tools-support-core.tar.gz) = 53c5e0e1d183add1947c3a4993ace3dd4205fe0c55c7a3b296a9242426c58bf67c9dd14dd75f76911e2b1cfb78a32ffa4af6985edacb6fcc70a8c5320777e380 +SHA512 (swift-xcode-playground-support.tar.gz) = 4170fdb398f42bebed94c60d3aa9243603333db773fa4cd49aedfb55cddcdb715105a3ed6d13a99a40bdd4b7763269570200839638571a89d8666cd0d1e0dd58 +SHA512 (swift.tar.gz) = fe09e90a907162a60bb448c0d7fe931df3b952ae1613592e0530b70357cddec7e73a68ebb70acb7a82f66e4d428ec3b986fe8672fea335025fbc2a68735d5f33 diff --git a/swift-lang.spec b/swift-lang.spec index ded8940..9c63830 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} %undefine _auto_set_build_flags -%global swifttag 5.6.2-RELEASE +%global swifttag 5.6.3-RELEASE %global swiftbuild swift-source %global icu_version 65-1 %global yams_version 4.0.2 @@ -18,8 +18,8 @@ %global swift_cmark_gfm_branch release/5.6-gfm Name: swift-lang -Version: 5.6.2 -Release: 3%{?dist} +Version: 5.6.3 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -217,8 +217,10 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Sep 02 2022 Ron Olson - 5.6.3-1 +- Updated to Swift 5.6.3-RELEASE * Thu Aug 04 2022 Ron Olson - 5.6.2-3 -Fixed issue of building Swift with glibc 2.36 on Fedora 37 +- Fixed issue of building Swift with glibc 2.36 on Fedora 37 * Sat Jul 23 2022 Fedora Release Engineering - 5.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d2c06e25db4ab9c4194fba58c52d467a02e26479 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 13 Sep 2022 14:43:30 -0500 Subject: [PATCH 099/152] Updated to Swift 5.7-RELEASE --- .gitignore | 12 +++ sources | 64 ++++++++-------- swift-lang.spec | 199 +++++++++++++++++++++++++----------------------- 3 files changed, 149 insertions(+), 126 deletions(-) diff --git a/.gitignore b/.gitignore index 178db02..9e4f6be 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,15 @@ /swift-numerics.zip /swift-stress-tester.tar.gz /swift-system.zip +/cmake.tar.gz +/icu.tar.gz +/swift-argument-parser.tar.gz +/swift-atomics.tar.gz +/swift-collections.tar.gz +/swift-crypto.tar.gz +/swift-format.tar.gz +/swift-nio-ssl.tar.gz +/swift-nio.tar.gz +/swift-numerics.tar.gz +/swift-system.tar.gz +/yams.tar.gz diff --git a/sources b/sources index be23dcf..8747b05 100644 --- a/sources +++ b/sources @@ -1,34 +1,34 @@ -SHA512 (0.4.3.tar.gz) = d5f4eefe7b7b215e76f8f035a2481c73fa716fe199894874122ea51a27c885ab7780647099fdbfbaebf7d8df1da1b59483d10e9fa869e26e3d34df881d14b665 -SHA512 (1.0.2.zip) = 38b63732b2b351c2e481ca5ec97000a4b704e19b0b886743523d5586af94daccf432ad4c6197bbdeb0e48918f4ac5ef4df947161dc53fcdd7530f2197f2cfbce -SHA512 (1.1.5.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 -SHA512 (4.0.2.zip) = b3568bf5d0db1d3ad9eb72a8d049ebe26219a68796771a5023d134e8648927805f9c476f0572c51bb171cfbf1f2aa511db0a069b73a39962b217b36594a885a8 -SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 -SHA512 (cmark.tar.gz) = dda293e574906eeb24d3184b0bad5da0ee33ebe95ead2977bf4665de32ba9fdc7f8e79e27806bac364ab8ba3a174c359e9976780880e57e21f7ee71a38cd36b5 -SHA512 (corelibs-foundation.tar.gz) = 7d6869c52bbc22954686774695830abdf21a549864f5d54175a7567ce269e135e3b808cf6ab11dee9af4d16947a2e2d02a2afbae139b7de6af04035204e9e258 -SHA512 (corelibs-libdispatch.tar.gz) = 35f2b29205e2df552bf9b155be0955516d565d9903e4ca9bc9f1255d30e5284d8df25c131d1dc041d3881395c3835e58a1496167fff609465cf20aad513d22e3 -SHA512 (corelibs-xctest.tar.gz) = 506116ab24c24bd1fbcb09c747c205373a4f220b45f76f6228b029b26caecf0489bab168f1bdcf276d73d3522cbf5cd1f160972e677023e3be5738613be0ea8c -SHA512 (indexstore-db.tar.gz) = 26e19846c6f80b67c903b2d279f4aa0536e09246beff0a3dab9a38d7c87a7c6c0c7ce0e9d68593d75b962937ac5a2c9d8475a21bae5554f801c632c9a3be4203 -SHA512 (llbuild.tar.gz) = 852168b70f8599cea7a528a1201fcc077c586d5125a54cfbb249c8ca4727b76be630e3a8b3ee25c06030628295ce23986de72cebdd95c7485560ba4f241fff09 -SHA512 (llvm-project.tar.gz) = 96cd7e459c85ca28eb5f14da0709a82d8aa2eb108946df30aa3f7c5367c6df440d54cc460c95576d4827bf5f2b6c0fd099eb00bca8c7ddcef1afbc9391e23e3e +SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 +SHA512 (cmark.tar.gz) = 014876ffe10d1a71ed91a2fe6bbbcca693cb5069938aeaee797a838513f845e674b91fd6ece67d0b66a79232bb7f8abe13c85bc47fdcc9e9201449a90fe8a61c +SHA512 (corelibs-foundation.tar.gz) = 47b15adeb6753347444cdb070a9e75a3fe2c8ff47a38188ee1029c38b59264cd5beb76e028abc08aea5d9fafe2d243018553cb708d8dda1e7b1bac3202e39260 +SHA512 (corelibs-libdispatch.tar.gz) = 9063feddef4607c94c6d47948fcdeb009afe15ca8a15cade9996c673c92d4b74231c81b68f5b835dc93e19116d1e57da329a43dd10d44b634c2e274d43e6309c +SHA512 (corelibs-xctest.tar.gz) = 79d8dee44f4a4205eb5b7f891604d9c0f837b4f0e48ca801c1c09ca633e1d8ac013656eaf60f0e31a4fe97176c7bd9be6c5cdecf965d8f7661918cb5e7c9a3d1 +SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 +SHA512 (indexstore-db.tar.gz) = 767c6d6f9d10b882fb1d6d04368c637d91ee8495c832c44db812a7e2c304b8a89d507cfde01780df7ce5e836cd7de9006d63b0e373c712d4821ed429d8919242 +SHA512 (llbuild.tar.gz) = ccb26b2de1dab95b26216962d519b8eec35f7512c3a58269f844d1e9d1d005d170d4dec712d7d6407754e024965b739f15a13b380b2810037395d2fe72c02679 +SHA512 (llvm-project.tar.gz) = a1633fc23c8a89a34201c505d8c33b695aa30d8c6e5b47cd0272387838cdbbbd1bc1348a97635139219fb95980b4345cb1ad43c07e3104167f1706f57252ccfe SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = 61fbeaca9eb1145d2217cf3109f26592b3ec456afe1059bec5bc289a1d17050ec8efdb9e97224fb3c79d3d1266c5dc09de473226c77195e2b2d45a93e28767d3 -SHA512 (release-65-1.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (sourcekit-lsp.tar.gz) = d6f722caaaa1890cd4efccb160fd88541f1b20cec1ce667440cec7e21e17f674e7c824be475809e96aa3086fe96cba2ff753e917364705c83267a752d37e98ea +SHA512 (package-manager.tar.gz) = f8955b6111d09d939f8a7e78b748aba3804f6a984ec54bc56b57c6ca1ca987932dcf9526050854308fa7e6767ae5a6375ebc62fb48cdb5e18390f86c0cd4e8ff +SHA512 (sourcekit-lsp.tar.gz) = 77c9d3c1c65c3886d1da2a18effccd64563b10cb5497e2973816b6b223f344161f01f23e52e2b3260d873d7cd3d38d91f34b50dd914f07ceb8f4a4ea425f1ddd +SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f +SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 -SHA512 (swift-collections.zip) = a883ccdfc2c2c9ead905c14102dbba0673f226671556d72d7c2458444dfed1681643976e4db8dd5184822a258361ec06e5cf7dfbdab64055bae313c4c346d25b -SHA512 (swift-docc-render-artifact.tar.gz) = dde953565fa6bb9d83fc026c67405f4fd5f9c1ccc6057cbce5fb1005b1bfcfaae93c63d8093a2ca4aa33f4eadb1b83571fdba3107093417679b74e4b1a3dbfe5 -SHA512 (swift-docc-symbolkit.tar.gz) = 5b32cf222b4e4da67577f4ea7524381f4a48765f24b4f0f3208611be18e7bf1a851079ee2beb7f5c2319cb068d09a646161e6dba07f5bae87fef5da459c28946 -SHA512 (swift-docc.tar.gz) = 717a9e37b91f65113c6092110c0e6cb0e0a181392f7ce07dfa1c72a15151e41355f8a3dd6edaa05a6dcbc6e8b8be2a187bb1117ee989d0e98f3d127974c7e852 -SHA512 (swift-driver.tar.gz) = ac03fa9e8ab2b5215b388772f588f2ad30730f0eaea93156630d78aaf09db48457bdaa1a378bc3ed6cd22841e34b29274d18f31cc35ddbf0015ca79c3c3ccab6 -SHA512 (swift-integration-tests.tar.gz) = edf68e17876ebc154098338cea08242df759face44e449c5403fcbbbc53eadbcf2f1eacacd3dc55a51c9db6293328539fa6bdd7efcd8e7a94e6efa5a00a45585 -SHA512 (swift-lmdb.tar.gz) = 883a461ebe7bc17e99711a8deb46786f05c451338db661deda1c3b6ab3c53602abd40ee3d68ad1fe0d167816eeeec9e3c708aa62e20e7458eb098bab8521130b -SHA512 (swift-markdown.tar.gz) = c3a83009044cf9a184114364e7d82e8b6c8161b43e4d4085fab09141f33cb5f2da48b6cb1051d21081e04061bfbf22e733249713bd00f207700f071a71cba6ff -SHA512 (swift-nio-ssl.zip) = ae44cf783ca7d16696532d0a9c0cdeb322b9eb6699087efbdb41d047e030492392858b7fa9f4cb80af9009a2af4f4442488b3673ea6675757bc1852542c8fd2a -SHA512 (swift-nio.zip) = 788bef190b0bf786167da5882184c870a0a0636533677f7495cc9585bb39952be800088be109100d2b9bdf748b92511ff4c973f71326631bd313e2e9c26c7f8e -SHA512 (swift-numerics.zip) = c7ccc01f9ca277b8aab2de9208bc9360b04f469e0ec811724772d558bb68f92056bb040f77ddf5c56bd9f18bf627f6cb48e4e11689722dadc92c0c4168134c39 -SHA512 (swift-stress-tester.tar.gz) = fc6cd0ed04dafdd97a714028f540b610691303e3797680d96160ab3c80bcf3b6a1b4273e375ddc3f550fba35be5f2bf45c85a5e033fa0e7788142ec167f667d7 -SHA512 (swift-syntax.tar.gz) = 2cfacc5fb6392c90097faad4b32ca8fa19867bc878d2dc9a64430abdbf314472afd69702f0ffbeb11d6f4e214012003bcd9ab245129560f5abf2e209f39a9643 -SHA512 (swift-system.zip) = 02d26bf01375168fc07be4bbc0cd6c39c2fd2cdabfbbd2a4c2d4e288118cdabab898b95c053afe1419e90bd85e86c1de0cf544505ecb154a70478c7d84b51bf5 -SHA512 (swift-tools-support-core.tar.gz) = 53c5e0e1d183add1947c3a4993ace3dd4205fe0c55c7a3b296a9242426c58bf67c9dd14dd75f76911e2b1cfb78a32ffa4af6985edacb6fcc70a8c5320777e380 -SHA512 (swift-xcode-playground-support.tar.gz) = 4170fdb398f42bebed94c60d3aa9243603333db773fa4cd49aedfb55cddcdb715105a3ed6d13a99a40bdd4b7763269570200839638571a89d8666cd0d1e0dd58 -SHA512 (swift.tar.gz) = fe09e90a907162a60bb448c0d7fe931df3b952ae1613592e0530b70357cddec7e73a68ebb70acb7a82f66e4d428ec3b986fe8672fea335025fbc2a68735d5f33 +SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca +SHA512 (swift-crypto.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 +SHA512 (swift-docc-render-artifact.tar.gz) = 6f353213dd151e1c947498b10258bef55acc327989cfda935991de566c7d2e6b2fa620fcef22904cea35153eb6ea825ebc1f67a4fc2494679a4884e96e7c97f1 +SHA512 (swift-docc-symbolkit.tar.gz) = 30e9009a5cb7b248740a96d4cd253c7f1b60a4849ac350d22749b6728fbcc0bc10f344a33257599cd1db43551aef45c9818911bcbfd438c9f9ac4dcd36c6cfed +SHA512 (swift-docc.tar.gz) = 810bbfa50ea5915b8766dce80a94da31c005f6365883c09e4956879542f2c3f6275c37ab175607b479e67cdbc292fdf34e229270a0d22a8503b0ca369cad214f +SHA512 (swift-driver.tar.gz) = 2bc93b833254ff2c4c6fe818cdc97259e1ccd32d9026ccc763c8e3dabd52ae0bf71ff9307c996fc768be004d289c76a546514e3f9ce2b9a650b51fa457826138 +SHA512 (swift-format.tar.gz) = e1c4b133c52afd27d10b37b5be909da77d711e9df1f64d684b0279449a425d2530600d7ce17d9a889f411719630f7b646eb6f228534201cf002d93f5d2e73f01 +SHA512 (swift-integration-tests.tar.gz) = ffcea7808cb7e807391df6ba636b74aef8ac08de6fbe8c3563848a78f5067b5e5da0c72817090cc7e4002c17a43d3f098ecb5f3bf57cc1754e4938db2c798682 +SHA512 (swift-lmdb.tar.gz) = 5c72a3b72f21d182095d53a1c85bd9c3e8049771ac2869c6f954945da4383b1ec9b4b11916c76dd39f5a481942a8290eea6af8e70552a07886f0645647c1fe3b +SHA512 (swift-markdown.tar.gz) = adf0931735b3dec0c2014902befb156b02ab537c53ee363ece6f1a8b5e77237349d83a98d22974b1c0d2bb9c799600c9c6f06ed930986bce631b41013345c4c2 +SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 +SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e +SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba +SHA512 (swift-syntax.tar.gz) = 1b1b5ced32406ad0598156e096e25ccae7d310dd50d28b8d5ffcc82c3aadf44f03143d253f723dee19bd5a95f586722207ed1f0d63e6f1b44ebf801eff763ec5 +SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c +SHA512 (swift-tools-support-core.tar.gz) = 9dd0a1d058b1b5efa0bb908258044062d370de2dc0d7a3cd090adff8cede1098dd824af12724338612e3681193aca41e6875097e0971b30800cd523a1dc4f678 +SHA512 (swift-xcode-playground-support.tar.gz) = c268f52a050585a6cbe65239fc98e96fdf7dccc4d54eeee6c5ae118519e2d7e5706b2ae5e7e6d2ce39944cd916fbfce56bfdc28302d5a152ffdbec286781dcb1 +SHA512 (swift.tar.gz) = 3ca36f0463027cc6c0db412e51dbd6dfce494d4245ea066b5ccd5354a9f9ffaaed68854fb28ec8f1f0d40db479c3ec1d40d5376b04011704f641fe431e9a3c15 +SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index 9c63830..fb8362e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,11 +1,14 @@ %global debug_package %{nil} %undefine _auto_set_build_flags -%global swifttag 5.6.3-RELEASE -%global swiftbuild swift-source -%global icu_version 65-1 -%global yams_version 4.0.2 +%global linux_version fedora +%global swift_version 5.7-RELEASE +%global package_version 5.7 +%global swift_source_location swift-source %global sap_version 0.4.3 +%global icu_version 65-1 +%global yams_version 5.0.1 +%global swift_argument_parser_version 1.0.3 %global swift_crypto_version 1.1.5 %global ninja_version 1.10.2 %global cmake_version 3.19.6 @@ -16,53 +19,54 @@ %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 %global swift_cmark_gfm_branch release/5.6-gfm +%global swift_format_version 0.50600.1 -Name: swift-lang -Version: 5.6.3 +Name: swiftlang +Version: %{package_version} Release: 1%{?dist} -Summary: Apple's Swift programming language -License: ASL 2.0 and Unicode -URL: https://swift.org +Summary: The Swift programming language +License: Apache 2.0 +URL: https://www.swift.org -Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz -Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz -Source10: https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz -Source11: https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{sap_version}.tar.gz -Source14: https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz +Source0: https://github.com/apple/swift/archive/refs/tags/swift-%{swift_version}.tar.gz#/swift.tar.gz +Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swift_version}.tar.gz#/corelibs-libdispatch.tar.gz +Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swift_version}.tar.gz#/corelibs-foundation.tar.gz +Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swift_version}.tar.gz#/swift-integration-tests.tar.gz +Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swift_version}.tar.gz#/corelibs-xctest.tar.gz +Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swift_version}.tar.gz#/package-manager.tar.gz +Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swift_version}.tar.gz#/llbuild.tar.gz +Source7: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}.tar.gz#/cmark.tar.gz +Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swift_version}.tar.gz#/swift-xcode-playground-support.tar.gz +Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swift_version}.tar.gz#/sourcekit-lsp.tar.gz +Source10: https://github.com/apple/indexstore-db/archive/swift-%{swift_version}.tar.gz#/indexstore-db.tar.gz +Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_version}.tar.gz#/llvm-project.tar.gz +Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz +Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz +Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source20: https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz -Source21: https://github.com/apple/swift-atomics/archive/refs/tags/%{swift_atomics_version}.zip -Source22: https://github.com/apple/swift-collections/archive/refs/tags/%{swift_collections_version}.zip#/swift-collections.zip -Source23: https://github.com/apple/swift-numerics/archive/refs/tags/%{swift_numerics_version}.zip#/swift-numerics.zip -Source24: https://github.com/apple/swift-system/archive/refs/tags/%{swift_system_version}.zip#/swift-system.zip -Source25: https://github.com/apple/swift-stress-tester/archive/swift-%{swifttag}.tar.gz#/swift-stress-tester.tar.gz -Source26: https://github.com/apple/swift-docc/archive/swift-%{swifttag}.tar.gz#/swift-docc.tar.gz -Source27: https://github.com/apple/swift-lmdb/archive/swift-%{swifttag}.tar.gz#/swift-lmdb.tar.gz -Source28: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swifttag}.tar.gz#/swift-docc-render-artifact.tar.gz -Source29: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swifttag}.tar.gz#/swift-docc-symbolkit.tar.gz -Source30: https://github.com/apple/swift-markdown/archive/swift-%{swifttag}.tar.gz#/swift-markdown.tar.gz -Source31: https://github.com/apple/swift-nio/archive/refs/tags/%{swift_nio_version}.zip#/swift-nio.zip -Source32: https://github.com/apple/swift-nio-ssl/archive/refs/tags/%{swift_nio_ssl_version}.zip#/swift-nio-ssl.zip -Source33: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_gfm_branch}.zip#/swift-cmark-gfm.zip +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_gfm_branch}.zip#/swift-cmark-gfm.zip +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz Patch0: temp-patches.patch Patch1: goldinclude.patch Patch2: enablelzma.patch -Patch3: fs.patch +Patch3: fs.patch BuildRequires: clang BuildRequires: swig @@ -82,16 +86,23 @@ BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six BuildRequires: /usr/bin/pathfix.py +#BuildRequires: cmake +BuildRequires: binutils-devel %if ! 0%{?el8} BuildRequires: python-unversioned-command %endif -BuildRequires: binutils-devel + +# Gotta do something special for EPEL8 apparently +# (9/12/22) +%if 0%{?rhel} && 0%{?rhel} == 8 +BuildRequires: gcc-toolset-11 +%endif Requires: glibc-devel %if 0%{?rhel} && 0%{?rhel} == 8 -Requires: binutils +Requires: binutils %else -Requires: binutils-gold +Requires: binutils-gold %endif Requires: gcc Requires: ncurses-devel @@ -113,40 +124,41 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swifttag} cmark -mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swifttag} swift-integration-tests -mv swift-llbuild-swift-%{swifttag} llbuild -mv swift-package-manager-swift-%{swifttag} swiftpm -mv swift-swift-%{swifttag} swift -mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp -mv indexstore-db-swift-%{swifttag} indexstore-db -mv llvm-project-swift-%{swifttag} llvm-project -mv swift-syntax-swift-%{swifttag} swift-syntax -mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core -mv swift-argument-parser-%{sap_version} swift-argument-parser -mv swift-driver-swift-%{swifttag} swift-driver +mv swift-cmark-swift-%{swift_version} cmark +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv indexstore-db-swift-%{swift_version} indexstore-db +mv llvm-project-swift-%{swift_version} llvm-project +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser +mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto -mv cmake-%{cmake_version} cmake +mv CMake-%{cmake_version} cmake mv swift-atomics-%{swift_atomics_version} swift-atomics -mv swift-numerics-%{swift_numerics_version} swift-numerics +#mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm +mv swift-docc-swift-%{swift_version} swift-docc +mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit mv swift-collections-%{swift_collections_version} swift-collections +mv swift-numerics-%{swift_numerics_version} swift-numerics mv swift-system-%{swift_system_version} swift-system mv swift-nio-%{swift_nio_version} swift-nio mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl -mv swift-stress-tester-swift-%{swifttag} swift-stress-tester -mv swift-docc-swift-%{swifttag} swift-docc -mv swift-lmdb-swift-%{swifttag} swift-lmdb -mv swift-docc-render-artifact-swift-%{swifttag} swift-docc-render-artifact -mv swift-docc-symbolkit-swift-%{swifttag} swift-docc-symbolkit -mv swift-markdown-swift-%{swifttag} swift-markdown +mv swift-format-%{swift_format_version} swift-format +mv swift-lmdb-swift-%{swift_version} swift-lmdb +mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-cmark-release-5.6-gfm swift-cmark-gfm # ICU @@ -163,17 +175,19 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize # Temp patch for testing building -%patch0 -p0 +#%patch0 -p0 # Gold Linker issue with LLVM under Fedora 36 -%patch1 -p0 +#%patch1 -p0 # Enable LZMA %patch2 -p0 -# Fix issues including linux/fs.h causing duplicate defintions +# Fix for glibc defining certain structs and enums twice that are flagged +# as redefined when including linux/fs.h %patch3 -p0 + %build export VERBOSE=1 # Before Fedora 34, we may not have /usr/bin/python, so we @@ -184,17 +198,18 @@ ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH %endif + # Here we go! -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz %install -mkdir -p %{buildroot}%{_libexecdir}/swift/ -cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift +mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version} +cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version} mkdir -p %{buildroot}%{_bindir} -ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift -ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc -ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp +ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift +ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc +ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 @@ -217,20 +232,12 @@ export QA_SKIP_RPATHS=1 %changelog -* Fri Sep 02 2022 Ron Olson - 5.6.3-1 -- Updated to Swift 5.6.3-RELEASE -* Thu Aug 04 2022 Ron Olson - 5.6.2-3 -- Fixed issue of building Swift with glibc 2.36 on Fedora 37 - -* Sat Jul 23 2022 Fedora Release Engineering - 5.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jun 19 2022 Ron Olson - 5.6.2-1 -- Updated to Swift 5.6.2-RELEASE -* Mon Jun 13 2022 Python Maint - 5.6.1-4 -- Rebuilt for Python 3.11 -* Tue May 10 2022 Ron Olson - 5.6.1-3 -- Discovered that EPEL-8 doesn't have binutils-gold (again) +* Tue Sep 13 2022 Ron Olson - 5.7-1 +- Updated to Swift 5.7-RELEASE +* Thu May 05 2022 Ron Olson - 5.7-1 +- First working version of Swift 5.7 +* Mon Apr 25 2022 Ron Olson - 5.7-1 +- First attempt to build swift-5.7 * Thu Apr 21 2022 Ron Olson - 5.6.1-2 - Removed ncurses-compat-libs as a runtime dependency as it has been removed from Fedora Rawhide @@ -238,6 +245,10 @@ export QA_SKIP_RPATHS=1 - Updated to Swift 5.6.1-RELEASE * Wed Mar 30 2022 Ron Olson - 5.6-1 - Updated to Swift 5.6-RELEASE +* Tue Feb 15 2022 Ron Olson - 5.5.3-1 +- Updated to Swift 5.5.3-RELEASE +* Sat Jan 22 2022 Fedora Release Engineering - 5.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Wed Jan 12 2022 Ron Olson - 5.6-1 - First build of Swift-5.6 * Tue Dec 14 2021 Ron Olson - 5.5.2-1 From 3d9d21ee37634ced05b190a0056ce71af3809612 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 15 Sep 2022 15:45:19 -0500 Subject: [PATCH 100/152] Had wrong package name --- swift-lang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index fb8362e..028f42e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -21,7 +21,7 @@ %global swift_cmark_gfm_branch release/5.6-gfm %global swift_format_version 0.50600.1 -Name: swiftlang +Name: swift-lang Version: %{package_version} Release: 1%{?dist} Summary: The Swift programming language @@ -86,7 +86,6 @@ BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six BuildRequires: /usr/bin/pathfix.py -#BuildRequires: cmake BuildRequires: binutils-devel %if ! 0%{?el8} BuildRequires: python-unversioned-command @@ -198,6 +197,10 @@ ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH %endif +%if 0%{?el8} +# Enable GCC Toolset 11 +. /opt/rh/gcc-toolset-11/enable +%endif # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz From 406711fa126b07625079ae9413eced6aad2d2778 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 27 Sep 2022 10:44:56 -0500 Subject: [PATCH 101/152] Added patch for unused variable --- swift-lang.spec | 16 ++++++++-------- unusedvars.patch | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 unusedvars.patch diff --git a/swift-lang.spec b/swift-lang.spec index 028f42e..fdbd2b7 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -23,7 +23,7 @@ Name: swift-lang Version: %{package_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Swift programming language License: Apache 2.0 URL: https://www.swift.org @@ -67,6 +67,7 @@ Patch0: temp-patches.patch Patch1: goldinclude.patch Patch2: enablelzma.patch Patch3: fs.patch +Patch4: unusedvars.patch BuildRequires: clang BuildRequires: swig @@ -146,7 +147,6 @@ mv swift-driver-swift-%{swift_version} swift-driver mv swift-crypto-%{swift_crypto_version} swift-crypto mv CMake-%{cmake_version} cmake mv swift-atomics-%{swift_atomics_version} swift-atomics -#mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm mv swift-docc-swift-%{swift_version} swift-docc mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit @@ -173,12 +173,6 @@ mv ninja-%{ninja_version} ninja pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Temp patch for testing building -#%patch0 -p0 - -# Gold Linker issue with LLVM under Fedora 36 -#%patch1 -p0 - # Enable LZMA %patch2 -p0 @@ -186,6 +180,9 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/h # as redefined when including linux/fs.h %patch3 -p0 +# Fix for variable that is initialized and not used +%patch4 -p0 + %build export VERBOSE=1 @@ -235,6 +232,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Sep 27 2022 Ron Olson - 5.7-2 +- Added patch to handle an initialized variable but not + used * Tue Sep 13 2022 Ron Olson - 5.7-1 - Updated to Swift 5.7-RELEASE * Thu May 05 2022 Ron Olson - 5.7-1 diff --git a/unusedvars.patch b/unusedvars.patch new file mode 100644 index 0000000..46e4bcf --- /dev/null +++ b/unusedvars.patch @@ -0,0 +1,14 @@ +--- swift-corelibs-libdispatch/src/shims/yield.c.orig 2022-09-16 12:04:16.691448773 -0500 ++++ swift-corelibs-libdispatch/src/shims/yield.c 2022-09-16 12:05:43.047145102 -0500 +@@ -25,6 +25,11 @@ + __DISPATCH_WAIT_FOR_ENQUEUER__(void **ptr) + { + int spins = 0; ++ int nothing = spins; ++ nothing = 23; ++ spins = nothing; ++ spins = 0; ++ + void *value; + while ((value = os_atomic_load(ptr, relaxed)) == NULL) { + _dispatch_preemption_yield(++spins); From b50c5c7d3900108cb5a72dc5bed74ea2009a95d2 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 27 Sep 2022 10:58:49 -0500 Subject: [PATCH 102/152] Fixes issue with unused variable (added BZ ticket number) --- swift-lang.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index fdbd2b7..14318d2 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -23,7 +23,7 @@ Name: swift-lang Version: %{package_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Swift programming language License: Apache 2.0 URL: https://www.swift.org @@ -92,12 +92,6 @@ BuildRequires: binutils-devel BuildRequires: python-unversioned-command %endif -# Gotta do something special for EPEL8 apparently -# (9/12/22) -%if 0%{?rhel} && 0%{?rhel} == 8 -BuildRequires: gcc-toolset-11 -%endif - Requires: glibc-devel %if 0%{?rhel} && 0%{?rhel} == 8 Requires: binutils @@ -194,11 +188,6 @@ ln -s /usr/bin/python3 $PWD/binforpython/python export PATH=$PWD/binforpython:$PATH %endif -%if 0%{?el8} -# Enable GCC Toolset 11 -. /opt/rh/gcc-toolset-11/enable -%endif - # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz @@ -232,6 +221,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Sep 27 2022 Ron Olson - 5.7-3 +- Resolves: rhbz#2130233 * Tue Sep 27 2022 Ron Olson - 5.7-2 - Added patch to handle an initialized variable but not used From 26db8d809d0f3b545c5698414fb8b5d257e77236 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 1 Nov 2022 07:19:49 +0100 Subject: [PATCH 103/152] Switch from pathfix.py to %py3_shebang_fix For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed --- swift-lang.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 14318d2..07d88db 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -86,7 +86,6 @@ BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six -BuildRequires: /usr/bin/pathfix.py BuildRequires: binutils-devel %if ! 0%{?el8} BuildRequires: python-unversioned-command @@ -164,8 +163,8 @@ mv Yams-%{yams_version} yams mv ninja-%{ninja_version} ninja # Fix python to python3 -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize +%py3_shebang_fix swift/utils/api_checker/swift-api-checker.py +%py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize # Enable LZMA %patch2 -p0 From dd3ad0aafa975722029c23bc96aa3e61dd65995f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 2 Nov 2022 15:16:36 -0500 Subject: [PATCH 104/152] Updated to Swift 5.7.1-RELEASE --- goldinclude.patch | 12 ------------ sources | 40 ++++++++++++++++++++-------------------- swift-lang.spec | 22 +++++++++++++++------- temp-patches.patch | 11 ----------- 4 files changed, 35 insertions(+), 50 deletions(-) delete mode 100644 goldinclude.patch delete mode 100644 temp-patches.patch diff --git a/goldinclude.patch b/goldinclude.patch deleted file mode 100644 index fd0b3d2..0000000 --- a/goldinclude.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur llvm-project-orig/llvm/cmake/config-ix.cmake llvm-project/llvm/cmake/config-ix.cmake ---- llvm-project-orig/llvm/cmake/config-ix.cmake 2022-02-14 16:28:34.599578465 -0600 -+++ llvm-project/llvm/cmake/config-ix.cmake 2022-02-14 16:30:08.863440853 -0600 -@@ -587,7 +587,7 @@ - endif() - - find_program(GOLD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.gold ld.gold ${LLVM_DEFAULT_TARGET_TRIPLE}-ld ld DOC "The gold linker") --set(LLVM_BINUTILS_INCDIR "" CACHE PATH -+set(LLVM_BINUTILS_INCDIR "/usr/include" CACHE PATH - "PATH to binutils/include containing plugin-api.h for gold plugin.") - - if(CMAKE_GENERATOR STREQUAL "Ninja") diff --git a/sources b/sources index 8747b05..ebf4918 100644 --- a/sources +++ b/sources @@ -1,34 +1,34 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 014876ffe10d1a71ed91a2fe6bbbcca693cb5069938aeaee797a838513f845e674b91fd6ece67d0b66a79232bb7f8abe13c85bc47fdcc9e9201449a90fe8a61c -SHA512 (corelibs-foundation.tar.gz) = 47b15adeb6753347444cdb070a9e75a3fe2c8ff47a38188ee1029c38b59264cd5beb76e028abc08aea5d9fafe2d243018553cb708d8dda1e7b1bac3202e39260 -SHA512 (corelibs-libdispatch.tar.gz) = 9063feddef4607c94c6d47948fcdeb009afe15ca8a15cade9996c673c92d4b74231c81b68f5b835dc93e19116d1e57da329a43dd10d44b634c2e274d43e6309c -SHA512 (corelibs-xctest.tar.gz) = 79d8dee44f4a4205eb5b7f891604d9c0f837b4f0e48ca801c1c09ca633e1d8ac013656eaf60f0e31a4fe97176c7bd9be6c5cdecf965d8f7661918cb5e7c9a3d1 +SHA512 (cmark.tar.gz) = 8ed05d2a76596e4e20ad201bd01ff05280ce75ca3ca8603e153fb471e355c8391c8e429330fefdba53569cb43467d86b9487b7bccd9bdf81758da530b4d1cf4d +SHA512 (corelibs-foundation.tar.gz) = b903b99c6a5796b313a66bbb8bef7cc80aa402295368a53ad19386b15294975ba810b20f52c46fbb8270f95d4d82807efb1be1a25cf4f400229811b5b24f9d08 +SHA512 (corelibs-libdispatch.tar.gz) = 7f04c14cfba214d99ffbb1d6d5ae2d0b83a0e3d3597c886093993f55adef53995477d9d88207ad36facc67cd36c46e1380f57fdc847f9a5f079aa41b820ecf4f +SHA512 (corelibs-xctest.tar.gz) = b27e8007665e1ccd2f0e605ceb2f17696151867dc0f50afae19cf9cc109380c078d2ca3d89acc9ebdff223e69d6d25508fc995b09a735a4cea4f3a0267f29456 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 767c6d6f9d10b882fb1d6d04368c637d91ee8495c832c44db812a7e2c304b8a89d507cfde01780df7ce5e836cd7de9006d63b0e373c712d4821ed429d8919242 -SHA512 (llbuild.tar.gz) = ccb26b2de1dab95b26216962d519b8eec35f7512c3a58269f844d1e9d1d005d170d4dec712d7d6407754e024965b739f15a13b380b2810037395d2fe72c02679 -SHA512 (llvm-project.tar.gz) = a1633fc23c8a89a34201c505d8c33b695aa30d8c6e5b47cd0272387838cdbbbd1bc1348a97635139219fb95980b4345cb1ad43c07e3104167f1706f57252ccfe +SHA512 (indexstore-db.tar.gz) = 01765351a6b4503d12cf98142c72b6805c7f5cb733845f1d8157a917d2c29dce784b043eacef24a76a1afa235127e37ccfd78152b64df27a6c02d0273ba554cd +SHA512 (llbuild.tar.gz) = bffe1c8b28c63d294b64077ca9502c1c3ff06e6db83fbbfc23c45b2f86cd4480ee45ff54ea2622f91f314e219cf8e1cf5dfdafd61af13809089363fe7bf8ebf1 +SHA512 (llvm-project.tar.gz) = c28c720e1519b847d2290fd587b86c06ae7980b028d830453a6dc080bb8029fbc456720f8dc726e09f2e401bf8d7e69240972f46bbe6db2d1612be9ef208aaa1 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = f8955b6111d09d939f8a7e78b748aba3804f6a984ec54bc56b57c6ca1ca987932dcf9526050854308fa7e6767ae5a6375ebc62fb48cdb5e18390f86c0cd4e8ff -SHA512 (sourcekit-lsp.tar.gz) = 77c9d3c1c65c3886d1da2a18effccd64563b10cb5497e2973816b6b223f344161f01f23e52e2b3260d873d7cd3d38d91f34b50dd914f07ceb8f4a4ea425f1ddd +SHA512 (package-manager.tar.gz) = be302c9b1b11d980d46784ed7d347f2fbf766253944fad99d3eef35eb372a56e874e891a1be70ef8635057649730b4752537a17847ff84b08e684ae0c2848bbc +SHA512 (sourcekit-lsp.tar.gz) = 23230ae142a7f6e03bebf6c22ccb8b311b07428ff6637b6d2fda8ace3ad7d1e014d42c074313089939dff56d94f15179cabe90cf9f67d3c1e4c564780949c7d5 SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca SHA512 (swift-crypto.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 -SHA512 (swift-docc-render-artifact.tar.gz) = 6f353213dd151e1c947498b10258bef55acc327989cfda935991de566c7d2e6b2fa620fcef22904cea35153eb6ea825ebc1f67a4fc2494679a4884e96e7c97f1 -SHA512 (swift-docc-symbolkit.tar.gz) = 30e9009a5cb7b248740a96d4cd253c7f1b60a4849ac350d22749b6728fbcc0bc10f344a33257599cd1db43551aef45c9818911bcbfd438c9f9ac4dcd36c6cfed -SHA512 (swift-docc.tar.gz) = 810bbfa50ea5915b8766dce80a94da31c005f6365883c09e4956879542f2c3f6275c37ab175607b479e67cdbc292fdf34e229270a0d22a8503b0ca369cad214f -SHA512 (swift-driver.tar.gz) = 2bc93b833254ff2c4c6fe818cdc97259e1ccd32d9026ccc763c8e3dabd52ae0bf71ff9307c996fc768be004d289c76a546514e3f9ce2b9a650b51fa457826138 +SHA512 (swift-docc-render-artifact.tar.gz) = 2f6eaf089727cda4852d5007f97adabaa9e601ca33d2f2edb12e2a34e99fe6e15508989999eacd1ea97ea393910234b8edc6c29159c8078fa8e49a1123ae230d +SHA512 (swift-docc-symbolkit.tar.gz) = fc00a1da656b54dab0b7d866f59d8a8ac52bc8d342ab2acf3e7c35bebb2f0bb560b20dcc17f1c245a6ea87e3cf17c5c291e0a1de766631f6f2a3b182b6fe3b36 +SHA512 (swift-docc.tar.gz) = c9fdd7ba3e690e846af47da78d343d59c516f039add6e6322a8a0cd6b1b012a0bd6f68f4ade6fb29bfe77e8030584ffad5d55ceda625fa56abc8d3265f5c4c4d +SHA512 (swift-driver.tar.gz) = ec6b16e44de63fc4ba44c4bd0860478dccf2535f6d86dba667beb35282d8655739a7524aaa68d66c5103e2007ebc5b774d5de34be96690ebc77ccaa9b58a6854 SHA512 (swift-format.tar.gz) = e1c4b133c52afd27d10b37b5be909da77d711e9df1f64d684b0279449a425d2530600d7ce17d9a889f411719630f7b646eb6f228534201cf002d93f5d2e73f01 -SHA512 (swift-integration-tests.tar.gz) = ffcea7808cb7e807391df6ba636b74aef8ac08de6fbe8c3563848a78f5067b5e5da0c72817090cc7e4002c17a43d3f098ecb5f3bf57cc1754e4938db2c798682 -SHA512 (swift-lmdb.tar.gz) = 5c72a3b72f21d182095d53a1c85bd9c3e8049771ac2869c6f954945da4383b1ec9b4b11916c76dd39f5a481942a8290eea6af8e70552a07886f0645647c1fe3b -SHA512 (swift-markdown.tar.gz) = adf0931735b3dec0c2014902befb156b02ab537c53ee363ece6f1a8b5e77237349d83a98d22974b1c0d2bb9c799600c9c6f06ed930986bce631b41013345c4c2 +SHA512 (swift-integration-tests.tar.gz) = 04aa84290e12d518572304d69f965345e40634db9a2609a97e0d81fd09ff063bcc6a527d1d598dc00e23116f94be9af3aca545a8342634268d355bbae39839eb +SHA512 (swift-lmdb.tar.gz) = 18676478a5a43332b9e3036a1250f93227b7d6b1e2a6b1158c24ab2550869124c86a0ced0e70921744ee2bf62fb3fc4bbe103972562b905fd14c0dc1131406c4 +SHA512 (swift-markdown.tar.gz) = d3780ef372ca1ce062054b1118449b8caf8a715ea01dc3f9e7bb0ac8d18c43a873ed4156e3466fb0426273310c1b3ae5c5509df2bfccd27e08421174ed9d0f19 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-syntax.tar.gz) = 1b1b5ced32406ad0598156e096e25ccae7d310dd50d28b8d5ffcc82c3aadf44f03143d253f723dee19bd5a95f586722207ed1f0d63e6f1b44ebf801eff763ec5 +SHA512 (swift-syntax.tar.gz) = dbfdfbf7d5a835a3ca0dcb08ef4c9a92be5142469a94f3ca7c55a82639209703b52b89ce19dd175f07d2ba8a879fee40f69a4cbb2947b67a9c205b429676c82d SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = 9dd0a1d058b1b5efa0bb908258044062d370de2dc0d7a3cd090adff8cede1098dd824af12724338612e3681193aca41e6875097e0971b30800cd523a1dc4f678 -SHA512 (swift-xcode-playground-support.tar.gz) = c268f52a050585a6cbe65239fc98e96fdf7dccc4d54eeee6c5ae118519e2d7e5706b2ae5e7e6d2ce39944cd916fbfce56bfdc28302d5a152ffdbec286781dcb1 -SHA512 (swift.tar.gz) = 3ca36f0463027cc6c0db412e51dbd6dfce494d4245ea066b5ccd5354a9f9ffaaed68854fb28ec8f1f0d40db479c3ec1d40d5376b04011704f641fe431e9a3c15 +SHA512 (swift-tools-support-core.tar.gz) = 1922a57d6dcb57b8a6de945c4cba652da7498d48df5b34cccccaa4d9e946956613f612b25c907159d3fd059e0fbef26ce77f5ff774037fdf6fb99eaba3cf670e +SHA512 (swift-xcode-playground-support.tar.gz) = da9da77791a202d6abb76e8daf2a31a96ec7a39d1d20a2d513cfcf38a5b5aa64aca321cd03f49319e886b9b0dcf91c95d8db13e97a47e359ae55d4c504b713f3 +SHA512 (swift.tar.gz) = 63b3acbbd5b23e0b5dcb638c6b02854debeefa12486be3b3ae2c00f9bce403e58f8732cbf407c9ea1038e4f2e0649063d65a23c73aeaa4092428915234f15c48 SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index 07d88db..ce05310 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -2,8 +2,9 @@ %undefine _auto_set_build_flags %global linux_version fedora -%global swift_version 5.7-RELEASE -%global package_version 5.7 +%global swift_version 5.7.1-RELEASE +%global fedora_release 1 +%global package_version 5.7.1 %global swift_source_location swift-source %global sap_version 0.4.3 %global icu_version 65-1 @@ -23,7 +24,7 @@ Name: swift-lang Version: %{package_version} -Release: 3%{?dist} +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache 2.0 URL: https://www.swift.org @@ -63,8 +64,6 @@ Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_ Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Patch0: temp-patches.patch -Patch1: goldinclude.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch @@ -99,6 +98,7 @@ Requires: binutils-gold %endif Requires: gcc Requires: ncurses-devel +Requires: lldb ExclusiveArch: x86_64 aarch64 @@ -182,8 +182,10 @@ export VERBOSE=1 # Before Fedora 34, we may not have /usr/bin/python, so we # roll our own because the build script expects there to be one. %if 0%{?fedora} < 34 || 0%{?el8} -mkdir $PWD/binforpython -ln -s /usr/bin/python3 $PWD/binforpython/python +if [ ! -d $PWD/binforpython ] ; then + mkdir -p $PWD/binforpython + ln -s /usr/bin/python3 $PWD/binforpython/python +fi export PATH=$PWD/binforpython:$PATH %endif @@ -220,6 +222,12 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Nov 02 2022 Ron Olson - 5.7.1-1 +- Updated to Swift 5.7.1-RELEASE + Resolves: rhbz#2139320 +* Tue Nov 01 2022 Ron Olson - 5.7-4 +- Merged fix from Lumír Balhar to replace the pathfix.py tool + with the new way for Python 3.12 * Tue Sep 27 2022 Ron Olson - 5.7-3 - Resolves: rhbz#2130233 * Tue Sep 27 2022 Ron Olson - 5.7-2 diff --git a/temp-patches.patch b/temp-patches.patch deleted file mode 100644 index 7569990..0000000 --- a/temp-patches.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift-docc/build-script-helper.py.orig 2022-01-18 12:34:07.014018324 -0600 -+++ swift-docc/build-script-helper.py 2022-01-18 12:34:35.002731959 -0600 -@@ -261,7 +261,7 @@ - if verbose: - print(' '.join([escape_cmd_arg(arg) for arg in cmd])) - return os.path.join( -- subprocess.check_output(cmd, env=env).strip(), 'docc') -+ subprocess.check_output(cmd, env=env).strip().decode(), 'docc') - - def create_intermediate_directories(dir_path, verbose): - cmd = ["mkdir", "-p", dir_path] From 041fe398dc9fb8c503f82f696272966085319452 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 14 Dec 2022 13:42:07 -0600 Subject: [PATCH 105/152] Updated to Swift-5.7.2-RELEASE --- sources | 40 ++++++++++++++++++++-------------------- swift-lang.spec | 11 +++++++++-- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/sources b/sources index ebf4918..7fda1ee 100644 --- a/sources +++ b/sources @@ -1,34 +1,34 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 8ed05d2a76596e4e20ad201bd01ff05280ce75ca3ca8603e153fb471e355c8391c8e429330fefdba53569cb43467d86b9487b7bccd9bdf81758da530b4d1cf4d -SHA512 (corelibs-foundation.tar.gz) = b903b99c6a5796b313a66bbb8bef7cc80aa402295368a53ad19386b15294975ba810b20f52c46fbb8270f95d4d82807efb1be1a25cf4f400229811b5b24f9d08 -SHA512 (corelibs-libdispatch.tar.gz) = 7f04c14cfba214d99ffbb1d6d5ae2d0b83a0e3d3597c886093993f55adef53995477d9d88207ad36facc67cd36c46e1380f57fdc847f9a5f079aa41b820ecf4f -SHA512 (corelibs-xctest.tar.gz) = b27e8007665e1ccd2f0e605ceb2f17696151867dc0f50afae19cf9cc109380c078d2ca3d89acc9ebdff223e69d6d25508fc995b09a735a4cea4f3a0267f29456 +SHA512 (cmark.tar.gz) = e8adab21664a589aa167725d6f683d18f7a6005965a2c56f8925c434d4af868a2e6360eab39b87b753cc09e6b95f1fd843bdca168142013975a30bf2d65703d0 +SHA512 (corelibs-foundation.tar.gz) = d5299bf1dcb9b47e7905ffd7bf5ebbfe3147f9bd90b543aa70876f0054e2ff241c39c986afb363738d26d47d254ec33d6f4b417f69d88aa4ce3ebd9e15d5ea4e +SHA512 (corelibs-libdispatch.tar.gz) = 558495e5055d5a67b81d0cfcb1376b9b24b49ac80e9805b38e58134f3093aab8809d584abe9e1e977a3e7bdc57b1e127d43e7f1e9c33eb59df536341637db653 +SHA512 (corelibs-xctest.tar.gz) = d0e90764cfc0a70be3ba62d729e2b8ef4d26bdfe666106064036e505935c10d91abf63024e3a2512f42eaf86e631331010ae08a90ee4a739eca4c22fe99a4f13 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 01765351a6b4503d12cf98142c72b6805c7f5cb733845f1d8157a917d2c29dce784b043eacef24a76a1afa235127e37ccfd78152b64df27a6c02d0273ba554cd -SHA512 (llbuild.tar.gz) = bffe1c8b28c63d294b64077ca9502c1c3ff06e6db83fbbfc23c45b2f86cd4480ee45ff54ea2622f91f314e219cf8e1cf5dfdafd61af13809089363fe7bf8ebf1 -SHA512 (llvm-project.tar.gz) = c28c720e1519b847d2290fd587b86c06ae7980b028d830453a6dc080bb8029fbc456720f8dc726e09f2e401bf8d7e69240972f46bbe6db2d1612be9ef208aaa1 +SHA512 (indexstore-db.tar.gz) = 66c7fa349f5ec29844e3b9c4a738ddcaea5a378463351f6af5298be132aa6a9ab0805db7e42917d3d5e2cf371f391b5662d66d5d8fb17b043d248c6cc3e1a524 +SHA512 (llbuild.tar.gz) = 57048f370de12fba6d86e100e5c09ed3649e43e89bb5050e68da482030287d8727eac2f36c17c87f9f17c35b227afc6b12e316d244a28c3bad532c7f9b08e456 +SHA512 (llvm-project.tar.gz) = 54c114cce55e497509217003f6e0be32b846bb792acd9125c9a1d11df414e35856d639a16b96272076c1577969fc9c1f8c3c97899d19086ba61c5c348dbe5166 SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = be302c9b1b11d980d46784ed7d347f2fbf766253944fad99d3eef35eb372a56e874e891a1be70ef8635057649730b4752537a17847ff84b08e684ae0c2848bbc -SHA512 (sourcekit-lsp.tar.gz) = 23230ae142a7f6e03bebf6c22ccb8b311b07428ff6637b6d2fda8ace3ad7d1e014d42c074313089939dff56d94f15179cabe90cf9f67d3c1e4c564780949c7d5 +SHA512 (package-manager.tar.gz) = 2aeca63bab577071dc560f621c1f1d1417d768a6ae04be0b718a8da22b93cdbd034fce7199d0151cdde00af8f7457a82e4f96f9c2692d0b1c04352f5b9045985 +SHA512 (sourcekit-lsp.tar.gz) = 9f83fe2038d0ea434032daa629c828b5623e8f6583012308ce01153a1e1d74d66cf50e3458210e7db42ed42b7abc071d754948e85b1bed2b7e7188e717bc4197 SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca SHA512 (swift-crypto.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 -SHA512 (swift-docc-render-artifact.tar.gz) = 2f6eaf089727cda4852d5007f97adabaa9e601ca33d2f2edb12e2a34e99fe6e15508989999eacd1ea97ea393910234b8edc6c29159c8078fa8e49a1123ae230d -SHA512 (swift-docc-symbolkit.tar.gz) = fc00a1da656b54dab0b7d866f59d8a8ac52bc8d342ab2acf3e7c35bebb2f0bb560b20dcc17f1c245a6ea87e3cf17c5c291e0a1de766631f6f2a3b182b6fe3b36 -SHA512 (swift-docc.tar.gz) = c9fdd7ba3e690e846af47da78d343d59c516f039add6e6322a8a0cd6b1b012a0bd6f68f4ade6fb29bfe77e8030584ffad5d55ceda625fa56abc8d3265f5c4c4d -SHA512 (swift-driver.tar.gz) = ec6b16e44de63fc4ba44c4bd0860478dccf2535f6d86dba667beb35282d8655739a7524aaa68d66c5103e2007ebc5b774d5de34be96690ebc77ccaa9b58a6854 +SHA512 (swift-docc-render-artifact.tar.gz) = 41bb9b2af908cac7f8f2f97d1a75596a1e4f1f58bf9d7c680c94d565cc77e165a24de2e2f9fa31eca3a8fb0f61a86328ea52832dc2ca18b78a401b0aa8198e81 +SHA512 (swift-docc-symbolkit.tar.gz) = b323a46b4995fc419572ebca17a3117fb62e04117d77d82831835e04d3ca2d47264faf81d0196de81042d04a2745592a065c2a553abb540f56d5a5eb71b9ba56 +SHA512 (swift-docc.tar.gz) = d8c52e86f73a658a5a64e796fd904b01e7a52f5c7e0a4f63daa1e838223dd50f6a6075394fbd6cbfae1cbb8e30846ce58a87b8b6c406c62b914ad0cf03a3e394 +SHA512 (swift-driver.tar.gz) = 5f938977455fccdca16b699d7ff30513621f33720bb2b41ee1850969fa1bc6fc733384f85d53a0ee95dfe9045392ba3990aaa629a0ab067b0ecdb1a802c4a53e SHA512 (swift-format.tar.gz) = e1c4b133c52afd27d10b37b5be909da77d711e9df1f64d684b0279449a425d2530600d7ce17d9a889f411719630f7b646eb6f228534201cf002d93f5d2e73f01 -SHA512 (swift-integration-tests.tar.gz) = 04aa84290e12d518572304d69f965345e40634db9a2609a97e0d81fd09ff063bcc6a527d1d598dc00e23116f94be9af3aca545a8342634268d355bbae39839eb -SHA512 (swift-lmdb.tar.gz) = 18676478a5a43332b9e3036a1250f93227b7d6b1e2a6b1158c24ab2550869124c86a0ced0e70921744ee2bf62fb3fc4bbe103972562b905fd14c0dc1131406c4 -SHA512 (swift-markdown.tar.gz) = d3780ef372ca1ce062054b1118449b8caf8a715ea01dc3f9e7bb0ac8d18c43a873ed4156e3466fb0426273310c1b3ae5c5509df2bfccd27e08421174ed9d0f19 +SHA512 (swift-integration-tests.tar.gz) = 788062c4e195649ce9eb17c6360a6d2693bc25b9e4c1957541c1ae1e974fa7fb12235640a60a3eb9be85eba04aa36e44046d86f689305886bf11c7ed05227ad7 +SHA512 (swift-lmdb.tar.gz) = 5180c024caef98dfdec10086d7ef818e5b09ff57bbaf83426850f4910e74a3d8c132b90331e44ef5e45f9af85063085033ad9292f6d79c6cc2711e3daa3d904a +SHA512 (swift-markdown.tar.gz) = 7fabe11cc787b6ae12af8d07c7eaee05e7ba2bf47e2a4ae805dc0bb49ad7c5e5b07f307f651fdc509cf1a29e4b9be79b7e83f5293aff29293722aec12406a335 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-syntax.tar.gz) = dbfdfbf7d5a835a3ca0dcb08ef4c9a92be5142469a94f3ca7c55a82639209703b52b89ce19dd175f07d2ba8a879fee40f69a4cbb2947b67a9c205b429676c82d +SHA512 (swift-syntax.tar.gz) = 498b06b8094a01f4979e476cc3ce4b8babd983250859ea6c4b1d725cf5dc1bc217134a6dc3f46575885f6af2642639b5a47dd57744aaaa6fddb346f5644410d3 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = 1922a57d6dcb57b8a6de945c4cba652da7498d48df5b34cccccaa4d9e946956613f612b25c907159d3fd059e0fbef26ce77f5ff774037fdf6fb99eaba3cf670e -SHA512 (swift-xcode-playground-support.tar.gz) = da9da77791a202d6abb76e8daf2a31a96ec7a39d1d20a2d513cfcf38a5b5aa64aca321cd03f49319e886b9b0dcf91c95d8db13e97a47e359ae55d4c504b713f3 -SHA512 (swift.tar.gz) = 63b3acbbd5b23e0b5dcb638c6b02854debeefa12486be3b3ae2c00f9bce403e58f8732cbf407c9ea1038e4f2e0649063d65a23c73aeaa4092428915234f15c48 +SHA512 (swift-tools-support-core.tar.gz) = a09e514437e3e5360a814b94ddf1dd159d651a508abe0f7d2dfc06e598cb483e3205cbfc4e9cb313b952484b534b806473fa42bfcd06af16730deec20077686a +SHA512 (swift-xcode-playground-support.tar.gz) = deb9881720bf9e3e1e0e720b8b46b350e6e7d492f166d90e95c177edfcf193ff217b4bea5e0674151c5e3be6ff69069a053dd11d29a60530201352432dfd8139 +SHA512 (swift.tar.gz) = 59c77c53db68bb3aeffde0a2f1d2003b7c89785f5e45fdcd371e7f91f2079a64052e8d9b8f2cc4d5e05f39fa0c33edc99a386a3e6da17f08c00c968dbe1a5bbe SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index ce05310..6279497 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -2,9 +2,13 @@ %undefine _auto_set_build_flags %global linux_version fedora -%global swift_version 5.7.1-RELEASE + +# Make sure these are changed for every release! +%global swift_version 5.7.2-RELEASE %global fedora_release 1 -%global package_version 5.7.1 +%global package_version 5.7.2 + +# Set to the right version per the json file %global swift_source_location swift-source %global sap_version 0.4.3 %global icu_version 65-1 @@ -222,6 +226,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Dec 14 2022 Ron Olson - 5.7.2-1 +- Updated to Swift 5.7.2-RELEASE + Resolves: rhbz#2153189 * Wed Nov 02 2022 Ron Olson - 5.7.1-1 - Updated to Swift 5.7.1-RELEASE Resolves: rhbz#2139320 From 92dd1dbf17961e7a4ad1d8e387601e317324ed8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:26:07 +0000 Subject: [PATCH 106/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 6279497..ea6de9b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -28,7 +28,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache 2.0 URL: https://www.swift.org @@ -226,6 +226,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 14 2022 Ron Olson - 5.7.2-1 - Updated to Swift 5.7.2-RELEASE Resolves: rhbz#2153189 From 5416e1c22228d2cf0ae1f4f56c9e4516856b8ec1 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 23 Jan 2023 08:40:14 -0600 Subject: [PATCH 107/152] Updated to Swift-5.7.3-RELEASE --- sources | 46 +++++++++++++++++++++++----------------------- swift-lang.spec | 28 +++++++++++++++++----------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/sources b/sources index 7fda1ee..a180cbf 100644 --- a/sources +++ b/sources @@ -1,34 +1,34 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = e8adab21664a589aa167725d6f683d18f7a6005965a2c56f8925c434d4af868a2e6360eab39b87b753cc09e6b95f1fd843bdca168142013975a30bf2d65703d0 -SHA512 (corelibs-foundation.tar.gz) = d5299bf1dcb9b47e7905ffd7bf5ebbfe3147f9bd90b543aa70876f0054e2ff241c39c986afb363738d26d47d254ec33d6f4b417f69d88aa4ce3ebd9e15d5ea4e -SHA512 (corelibs-libdispatch.tar.gz) = 558495e5055d5a67b81d0cfcb1376b9b24b49ac80e9805b38e58134f3093aab8809d584abe9e1e977a3e7bdc57b1e127d43e7f1e9c33eb59df536341637db653 -SHA512 (corelibs-xctest.tar.gz) = d0e90764cfc0a70be3ba62d729e2b8ef4d26bdfe666106064036e505935c10d91abf63024e3a2512f42eaf86e631331010ae08a90ee4a739eca4c22fe99a4f13 +SHA512 (cmark.tar.gz) = 85274c6f22e7e719e9679da95469ad81ff671f05cc9c7d800262927f259e6fa5499086c0489157bd2c572dfa938b568a1ce790adc26dd2df548b197f14e74e20 +SHA512 (corelibs-foundation.tar.gz) = e6d5502daa688d6c4fe7691cc7d20291af5550deb3d1f63f57ba4cab69517f42a75c043caa33fe43a146a94c7258d46eac587e752a433ca448d53a18b64617e3 +SHA512 (corelibs-libdispatch.tar.gz) = 7d8f40ff7a43ac0367552855317e73e140ba7ff7d2b6494aa772ba052fd7d1a151b0122465b6a82a7e4483e8dd951e77d6b626d63e0997c9a64e3a2bc6d66250 +SHA512 (corelibs-xctest.tar.gz) = d0895f9e2bde93d163c68f517b4adfa89eed0061132157eecbcb1edb8bc8fa1bc456d108b4bf427ceb0807945fb478628bd189f55867989f9eca91f0d8361cd6 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 66c7fa349f5ec29844e3b9c4a738ddcaea5a378463351f6af5298be132aa6a9ab0805db7e42917d3d5e2cf371f391b5662d66d5d8fb17b043d248c6cc3e1a524 -SHA512 (llbuild.tar.gz) = 57048f370de12fba6d86e100e5c09ed3649e43e89bb5050e68da482030287d8727eac2f36c17c87f9f17c35b227afc6b12e316d244a28c3bad532c7f9b08e456 -SHA512 (llvm-project.tar.gz) = 54c114cce55e497509217003f6e0be32b846bb792acd9125c9a1d11df414e35856d639a16b96272076c1577969fc9c1f8c3c97899d19086ba61c5c348dbe5166 -SHA512 (ninja.tar.gz) = 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 -SHA512 (package-manager.tar.gz) = 2aeca63bab577071dc560f621c1f1d1417d768a6ae04be0b718a8da22b93cdbd034fce7199d0151cdde00af8f7457a82e4f96f9c2692d0b1c04352f5b9045985 -SHA512 (sourcekit-lsp.tar.gz) = 9f83fe2038d0ea434032daa629c828b5623e8f6583012308ce01153a1e1d74d66cf50e3458210e7db42ed42b7abc071d754948e85b1bed2b7e7188e717bc4197 +SHA512 (indexstore-db.tar.gz) = d15338505df98e807064d7064bd217110019699e1b6f5028a8b9dfd1eb44648d52192ecf0786114618b10310f6b16492b28f27f00bd68a8547817028f4810622 +SHA512 (llbuild.tar.gz) = 21179d62d930f06a3d9a907be635dd268958a36f782dbf4f1f3531dea1d28b664f95961660a2c0cf02e5d6c755294d864608e8cb7517df748deac7816754d8e0 +SHA512 (llvm-project.tar.gz) = 0183db8f8885a466f8cdac8775e4cbda10603d35f885fa97a12ccc21a1b8079b9c3ee370d5b4d88df2e68bfb0946b0f1c7c12d2ce552f7a8bd0170d4df3a39e4 +SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 +SHA512 (package-manager.tar.gz) = 36c556c92c6b6eccef5420f0e9e43b8922a5ccdc8580262caca260e111c45958f50856f0ac74b7021056e3ef0873c32d1157a234d128dfad9decb91344327075 +SHA512 (sourcekit-lsp.tar.gz) = 15004189d61631cdd2fb6c157d8d0e1ff79be713730a7e8dc4ce598e76599f9d90a5f2e3a4d2d99b97bb86b16278f39b75ca240aec60bef1ebaa762ff2843217 SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-cmark-gfm.zip) = 9dfeb8d4c515f92b8fa40a8810a78dc369cd6ba020149815a390b133c47e4db28f012bbf8e2f21d6ccb9736d13cb20f887cfd160ad2538f09d4a8d598cca6cc1 +SHA512 (swift-cmark-gfm.zip) = 7050dce76d5143d718e2d6f6789dcb2cf3cf0a5ca545e23ab5801bcf949edf05fbf90e8931dd2157c01d4f44205e8b7312d2f930bd57b81864982b69bedde3de SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca SHA512 (swift-crypto.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 -SHA512 (swift-docc-render-artifact.tar.gz) = 41bb9b2af908cac7f8f2f97d1a75596a1e4f1f58bf9d7c680c94d565cc77e165a24de2e2f9fa31eca3a8fb0f61a86328ea52832dc2ca18b78a401b0aa8198e81 -SHA512 (swift-docc-symbolkit.tar.gz) = b323a46b4995fc419572ebca17a3117fb62e04117d77d82831835e04d3ca2d47264faf81d0196de81042d04a2745592a065c2a553abb540f56d5a5eb71b9ba56 -SHA512 (swift-docc.tar.gz) = d8c52e86f73a658a5a64e796fd904b01e7a52f5c7e0a4f63daa1e838223dd50f6a6075394fbd6cbfae1cbb8e30846ce58a87b8b6c406c62b914ad0cf03a3e394 -SHA512 (swift-driver.tar.gz) = 5f938977455fccdca16b699d7ff30513621f33720bb2b41ee1850969fa1bc6fc733384f85d53a0ee95dfe9045392ba3990aaa629a0ab067b0ecdb1a802c4a53e -SHA512 (swift-format.tar.gz) = e1c4b133c52afd27d10b37b5be909da77d711e9df1f64d684b0279449a425d2530600d7ce17d9a889f411719630f7b646eb6f228534201cf002d93f5d2e73f01 -SHA512 (swift-integration-tests.tar.gz) = 788062c4e195649ce9eb17c6360a6d2693bc25b9e4c1957541c1ae1e974fa7fb12235640a60a3eb9be85eba04aa36e44046d86f689305886bf11c7ed05227ad7 -SHA512 (swift-lmdb.tar.gz) = 5180c024caef98dfdec10086d7ef818e5b09ff57bbaf83426850f4910e74a3d8c132b90331e44ef5e45f9af85063085033ad9292f6d79c6cc2711e3daa3d904a -SHA512 (swift-markdown.tar.gz) = 7fabe11cc787b6ae12af8d07c7eaee05e7ba2bf47e2a4ae805dc0bb49ad7c5e5b07f307f651fdc509cf1a29e4b9be79b7e83f5293aff29293722aec12406a335 +SHA512 (swift-docc-render-artifact.tar.gz) = 241a5c8dac9058fbecca083cec0a13bb4f7ae481da0128eeb96c3f5ace870726a5253bd85e193c5c7268a8b28ad780cd5ef75443a8085e887ae2a2bbfebcd2f4 +SHA512 (swift-docc-symbolkit.tar.gz) = 646fb22f0e0c9e66efc1d9f18c04fe92ea2bf5b3c4ab04ddbfb4df95e47727291d2f83eb53cddf49c70fce15e634bb8430aea9fff8afe490f2a825bb71979083 +SHA512 (swift-docc.tar.gz) = 8ec63b77375b7b933bac0e7b5c0b12f71bfd881a88ffca31a88c473cb210f4f9067d0fc9d45423ef61b4b85bb921a1338a47311e6045d3b915212eefc96e8aad +SHA512 (swift-driver.tar.gz) = 13b7c28b9acf311a1bad0640600022a89acd11e99fc4ee5bf7d8e60e21bb1af916c905cd09dc6977a1b7577a66cecea9c577db26d1523d20508a7c509052c5c9 +SHA512 (swift-format.tar.gz) = fc4e7f3ecb6504ac1e74a19d19738b436fae7f1e41152a96ddd734648435ffc0b35daf309fd99141282411850c317a83d43138a79ff51465551f4aeb51493ffc +SHA512 (swift-integration-tests.tar.gz) = 7a4ca93a59d09911cfb99202bcf2c03476e6b1d63c3d198ef1c636146a3ec8390aa275b9a54190c6168460553f1f07c0b6af311a8bdef82180e57cbb7321e46d +SHA512 (swift-lmdb.tar.gz) = a3596def12e02b07a9b70eb44bff6ecc04126091f0dcf92abb7affc69aedc2b5ed341f42e53ebe6b02562c1fd0d58716902af2907aa29da1b1605bc85ac6a78a +SHA512 (swift-markdown.tar.gz) = 042b2f63996ebe0c243597b4713a87ae5260fe0eef0aab1ddd1109b1322becf32e35567fe6ec6ba2bae5905c472a4df4db63b91fe170576d8e6c03a778a31c6c SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-syntax.tar.gz) = 498b06b8094a01f4979e476cc3ce4b8babd983250859ea6c4b1d725cf5dc1bc217134a6dc3f46575885f6af2642639b5a47dd57744aaaa6fddb346f5644410d3 +SHA512 (swift-syntax.tar.gz) = a78badd0eeaeb3abbb1c1cf9b4d1d204129cb4b3235c51f831e3e1735e0f50ebc0c789944fa8cbac129de9e8dad9623383f25f533223550e0780be2a941cd4e5 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = a09e514437e3e5360a814b94ddf1dd159d651a508abe0f7d2dfc06e598cb483e3205cbfc4e9cb313b952484b534b806473fa42bfcd06af16730deec20077686a -SHA512 (swift-xcode-playground-support.tar.gz) = deb9881720bf9e3e1e0e720b8b46b350e6e7d492f166d90e95c177edfcf193ff217b4bea5e0674151c5e3be6ff69069a053dd11d29a60530201352432dfd8139 -SHA512 (swift.tar.gz) = 59c77c53db68bb3aeffde0a2f1d2003b7c89785f5e45fdcd371e7f91f2079a64052e8d9b8f2cc4d5e05f39fa0c33edc99a386a3e6da17f08c00c968dbe1a5bbe +SHA512 (swift-tools-support-core.tar.gz) = e3d1cd64899f34285d22a79f30c5c6835810638b74830ee99926f1faee304c10b2b192d2fb7188450c7df007c93f8cdba48443e9cedeed96aff2e9283c7a67fd +SHA512 (swift-xcode-playground-support.tar.gz) = a1309ac3ea7edb15628b93ad261958ccd27c60ccc8a36af6d224c9e94a58b172862b26689acfc1bf6efbc0a218e7857caf5f99d57ec1db158ce485224ac5dfc9 +SHA512 (swift.tar.gz) = fafa80ff4d7e55ded58b3de942d25c8a9cf24ccbdd4f949e85d9d7a1119998825cd48be6ce9121bcbeb04d1755b63617e055a73f05748339528ecf432b9946fa SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index ea6de9b..5b8d3d1 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -4,9 +4,9 @@ %global linux_version fedora # Make sure these are changed for every release! -%global swift_version 5.7.2-RELEASE +%global swift_version 5.7.3-RELEASE %global fedora_release 1 -%global package_version 5.7.2 +%global package_version 5.7.3 # Set to the right version per the json file %global swift_source_location swift-source @@ -15,7 +15,7 @@ %global yams_version 5.0.1 %global swift_argument_parser_version 1.0.3 %global swift_crypto_version 1.1.5 -%global ninja_version 1.10.2 +%global ninja_version 1.11.1 %global cmake_version 3.19.6 %global swift_atomics_version 1.0.2 %global swift_collections_version 1.0.1 @@ -23,14 +23,16 @@ %global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 -%global swift_cmark_gfm_branch release/5.6-gfm -%global swift_format_version 0.50600.1 +# HEY! Are you changing the version of the project below? +# Make sure to change it in the %prep section as well in +# the renaming part +%global swift_cmark_gfm_branch release/5.7-gfm Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language -License: Apache 2.0 +License: Apache-2.0 URL: https://www.swift.org Source0: https://github.com/apple/swift/archive/refs/tags/swift-%{swift_version}.tar.gz#/swift.tar.gz @@ -64,7 +66,7 @@ Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz @@ -152,10 +154,10 @@ mv swift-numerics-%{swift_numerics_version} swift-numerics mv swift-system-%{swift_system_version} swift-system mv swift-nio-%{swift_nio_version} swift-nio mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl -mv swift-format-%{swift_format_version} swift-format +mv swift-format-swift-%{swift_version} swift-format mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown -mv swift-cmark-release-5.6-gfm swift-cmark-gfm +mv swift-cmark-release-5.7-gfm swift-cmark-gfm # ICU mv icu-release-%{icu_version} icu @@ -228,7 +230,11 @@ export QA_SKIP_RPATHS=1 %changelog * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - +* Fri Jan 20 2023 Ron Olson - 5.7.3-1 +- Updated to Swift 5.7.3-RELEASE + Resolves: rhbz#2162626 +* Fri Dec 16 2022 Ron Olson - 5.7.2-2 +- SPDX migration * Wed Dec 14 2022 Ron Olson - 5.7.2-1 - Updated to Swift 5.7.2-RELEASE Resolves: rhbz#2153189 From c00ff42793e1a6348c61372262504cba54bb9910 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 25 Jan 2023 12:55:01 -0600 Subject: [PATCH 108/152] Updated to Swift 5.7.3-RELEASE with patch for missing header declaration --- swift-lang.spec | 10 +++++++++- uintptr.patch | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 uintptr.patch diff --git a/swift-lang.spec b/swift-lang.spec index 5b8d3d1..1adda19 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -5,7 +5,7 @@ # Make sure these are changed for every release! %global swift_version 5.7.3-RELEASE -%global fedora_release 1 +%global fedora_release 2 %global package_version 5.7.3 # Set to the right version per the json file @@ -70,6 +70,7 @@ Source31: https://github.com/apple/swift-format/archive/swift-%{swift_vers Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch @@ -172,6 +173,10 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize +# Fix for uintptr_t not being declared because the header wasn't +# explicitly declared +%patch1 -p0 + # Enable LZMA %patch2 -p0 @@ -228,6 +233,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Jan 25 2023 Ron Olson - 5.7.3-2 +- Added patch for missing includes + Resolves: rhbz#2162626 * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Fri Jan 20 2023 Ron Olson - 5.7.3-1 diff --git a/uintptr.patch b/uintptr.patch new file mode 100644 index 0000000..8bfc97e --- /dev/null +++ b/uintptr.patch @@ -0,0 +1,10 @@ +--- llvm-project/llvm/include/llvm/Support/Signals.h.orig 2023-01-25 12:42:42.006799309 -0600 ++++ llvm-project/llvm/include/llvm/Support/Signals.h 2023-01-25 12:43:15.856946625 -0600 +@@ -15,6 +15,7 @@ + #define LLVM_SUPPORT_SIGNALS_H + + #include ++#include + + namespace llvm { + class StringRef; From ed1e815a8872624ab0966d8eb46b5259b2369795 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 31 Mar 2023 14:37:24 -0500 Subject: [PATCH 109/152] Updated to Swift 5.8-RELEASE --- .gitignore | 1 + no-test.patch | 11 +++++++++ sources | 47 ++++++++++++++++++------------------ swift-lang.spec | 63 ++++++++++++++++++++++++++----------------------- 4 files changed, 69 insertions(+), 53 deletions(-) create mode 100644 no-test.patch diff --git a/.gitignore b/.gitignore index 9e4f6be..c3d26bc 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /swift-numerics.tar.gz /swift-system.tar.gz /yams.tar.gz +/swift-experimental-string-processing.tar.gz diff --git a/no-test.patch b/no-test.patch new file mode 100644 index 0000000..3df50ca --- /dev/null +++ b/no-test.patch @@ -0,0 +1,11 @@ +--- swift/utils/build-presets.ini.orig 2023-02-06 19:59:52.297617075 -0600 ++++ swift/utils/build-presets.ini 2023-02-06 20:00:17.131186971 -0600 +@@ -834,7 +834,7 @@ + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out + +-test-installable-package ++#test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks diff --git a/sources b/sources index a180cbf..3c588c8 100644 --- a/sources +++ b/sources @@ -1,34 +1,35 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 85274c6f22e7e719e9679da95469ad81ff671f05cc9c7d800262927f259e6fa5499086c0489157bd2c572dfa938b568a1ce790adc26dd2df548b197f14e74e20 -SHA512 (corelibs-foundation.tar.gz) = e6d5502daa688d6c4fe7691cc7d20291af5550deb3d1f63f57ba4cab69517f42a75c043caa33fe43a146a94c7258d46eac587e752a433ca448d53a18b64617e3 -SHA512 (corelibs-libdispatch.tar.gz) = 7d8f40ff7a43ac0367552855317e73e140ba7ff7d2b6494aa772ba052fd7d1a151b0122465b6a82a7e4483e8dd951e77d6b626d63e0997c9a64e3a2bc6d66250 -SHA512 (corelibs-xctest.tar.gz) = d0895f9e2bde93d163c68f517b4adfa89eed0061132157eecbcb1edb8bc8fa1bc456d108b4bf427ceb0807945fb478628bd189f55867989f9eca91f0d8361cd6 +SHA512 (cmark.tar.gz) = 429bc1400b0d16b32caaa11ec5fc2f29feffc60410ad36ce49d4c65abf58065b08b980d9598fe259ea6ca545dd469829f64b55ec9e949b429ad08c87c7906723 +SHA512 (corelibs-foundation.tar.gz) = de22d7c246c7a0aa01e5071b114597cbbef59fc3f8caf397c632214fda44c80ac3011f06f53413a107de8501959fe4c42d4f4fdaa046c9b0b1073a63f59540fc +SHA512 (corelibs-libdispatch.tar.gz) = 913885f00c2010a88ceeb2f9414f2b39e9884ca3fd58e927248dcfafa2205560468114de5627e1225d23ea9e3a50e39670b3afd03defba3de54268653888c32c +SHA512 (corelibs-xctest.tar.gz) = d285f73ac9054e1ca6c5f2864cfd95a05305199d3feef7ca9ea76916d20cc0221b5ce969970ed51c5b3664e0c055c7a20952a342713f08172d87c2043d8c5a27 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = d15338505df98e807064d7064bd217110019699e1b6f5028a8b9dfd1eb44648d52192ecf0786114618b10310f6b16492b28f27f00bd68a8547817028f4810622 -SHA512 (llbuild.tar.gz) = 21179d62d930f06a3d9a907be635dd268958a36f782dbf4f1f3531dea1d28b664f95961660a2c0cf02e5d6c755294d864608e8cb7517df748deac7816754d8e0 -SHA512 (llvm-project.tar.gz) = 0183db8f8885a466f8cdac8775e4cbda10603d35f885fa97a12ccc21a1b8079b9c3ee370d5b4d88df2e68bfb0946b0f1c7c12d2ce552f7a8bd0170d4df3a39e4 +SHA512 (indexstore-db.tar.gz) = 0b331d384c3e0b78ffc88c3f791f8f0520725250d38e40065bf760100116c24f51d19765a9bc110ee4ebc3e19245209e76d36c5ea3f742779c9c828fd2941201 +SHA512 (llbuild.tar.gz) = 8ea20d9d2c16dd6062a5562324d1d9fd15f3642b7e22f9ad9715c25328e3a94a33b2fafaec3dc5ecf99f7686426f56dae99618b03537a83dd70d6002933c79a5 +SHA512 (llvm-project.tar.gz) = 9cea24ded3e5a5180f0d95ee3ccd2d4ff3403874b327f1aeb038e278c510f2ac5a4b39dc0b92f05c61183c0d39eb29ad10fee7e0f839037a10eb3af0433b7a49 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 36c556c92c6b6eccef5420f0e9e43b8922a5ccdc8580262caca260e111c45958f50856f0ac74b7021056e3ef0873c32d1157a234d128dfad9decb91344327075 -SHA512 (sourcekit-lsp.tar.gz) = 15004189d61631cdd2fb6c157d8d0e1ff79be713730a7e8dc4ce598e76599f9d90a5f2e3a4d2d99b97bb86b16278f39b75ca240aec60bef1ebaa762ff2843217 +SHA512 (package-manager.tar.gz) = 05ff587cc07015828883d8effdafc2da12836e8ef5926a54f61900fb73586fc9198988c8819f3a3ac42571d877950b20a5c12418d02fe04f293512ea2ec65a8e +SHA512 (sourcekit-lsp.tar.gz) = 77f32a3be6247093c2c4c188b567be62c1ec7b0116fb0b311ec50f70c3809576595f009a67acc5d25b4dae65651a3627d82ffbddf0f17b0b7b28e2da4847cd0f SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-cmark-gfm.zip) = 7050dce76d5143d718e2d6f6789dcb2cf3cf0a5ca545e23ab5801bcf949edf05fbf90e8931dd2157c01d4f44205e8b7312d2f930bd57b81864982b69bedde3de SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 -SHA512 (swift-docc-render-artifact.tar.gz) = 241a5c8dac9058fbecca083cec0a13bb4f7ae481da0128eeb96c3f5ace870726a5253bd85e193c5c7268a8b28ad780cd5ef75443a8085e887ae2a2bbfebcd2f4 -SHA512 (swift-docc-symbolkit.tar.gz) = 646fb22f0e0c9e66efc1d9f18c04fe92ea2bf5b3c4ab04ddbfb4df95e47727291d2f83eb53cddf49c70fce15e634bb8430aea9fff8afe490f2a825bb71979083 -SHA512 (swift-docc.tar.gz) = 8ec63b77375b7b933bac0e7b5c0b12f71bfd881a88ffca31a88c473cb210f4f9067d0fc9d45423ef61b4b85bb921a1338a47311e6045d3b915212eefc96e8aad -SHA512 (swift-driver.tar.gz) = 13b7c28b9acf311a1bad0640600022a89acd11e99fc4ee5bf7d8e60e21bb1af916c905cd09dc6977a1b7577a66cecea9c577db26d1523d20508a7c509052c5c9 -SHA512 (swift-format.tar.gz) = fc4e7f3ecb6504ac1e74a19d19738b436fae7f1e41152a96ddd734648435ffc0b35daf309fd99141282411850c317a83d43138a79ff51465551f4aeb51493ffc -SHA512 (swift-integration-tests.tar.gz) = 7a4ca93a59d09911cfb99202bcf2c03476e6b1d63c3d198ef1c636146a3ec8390aa275b9a54190c6168460553f1f07c0b6af311a8bdef82180e57cbb7321e46d -SHA512 (swift-lmdb.tar.gz) = a3596def12e02b07a9b70eb44bff6ecc04126091f0dcf92abb7affc69aedc2b5ed341f42e53ebe6b02562c1fd0d58716902af2907aa29da1b1605bc85ac6a78a -SHA512 (swift-markdown.tar.gz) = 042b2f63996ebe0c243597b4713a87ae5260fe0eef0aab1ddd1109b1322becf32e35567fe6ec6ba2bae5905c472a4df4db63b91fe170576d8e6c03a778a31c6c +SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 +SHA512 (swift-docc-render-artifact.tar.gz) = b3ca9b9734c5ae333fb521a995a47cb8af3a4097f4d250a0ec1194dbc239adc9285065478bbd507867167122826d93fc55f15bd18717118b4474e044b9b7edb4 +SHA512 (swift-docc-symbolkit.tar.gz) = 639521f8ce28974e02d24be3270ddf39766db57d568e682a2f7c8ec31d7ee7fb0c24ddc4a2173aae2e35c4bee9e51012dae6fd46e5c9e6cec294971c8cb5bf26 +SHA512 (swift-docc.tar.gz) = 4317a94b2018a1c12f50547bd002bca47231d0fa85a0fc18fc5035bad2197bb581d55083767e9a20458b2ae331c6f47a0c4b643a25925453e2d2460dabf80366 +SHA512 (swift-driver.tar.gz) = 391a8b8ff984ed9619285605432a752c80444ffc7d6b8cbd4a1caf1e48c6d64b010ed3a68dfce054f897240c210d68c65a534cd709eb7bec950add2454bf6b10 +SHA512 (swift-experimental-string-processing.tar.gz) = 1632126dead4b5fa6d975d2cae79da9cabaf600bac4fc8e1f95b5e82a1bc382949dce6f935e556e32dedb8644c8de771897266fab74b6d7cee27e39e3f8dff9e +SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 +SHA512 (swift-integration-tests.tar.gz) = a4b54659d77afecab1d32917f9dc595c3e7ecc6ee9d44c1e14ebc8fea0881f1ea9d9af16be65db38600da6923ac0f0cf7fffc8ed8fcc8262ef949d49c6b56845 +SHA512 (swift-lmdb.tar.gz) = bf361096ba201ecf9bdff6982b2f1ed35d4c00dd47ca4fc4dd65fa6df393249031978c007551a824d2708e2d3cce7f4b345357952f091874b95b888b27ea95e9 +SHA512 (swift-markdown.tar.gz) = 11cf2d6f23c97c0d0f017fb3ab309687d0f8726679bb5a502b538e588a6d47607cddf67c6418714dfb453fe226016903b246c439dfa9834308c2103730373c64 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-syntax.tar.gz) = a78badd0eeaeb3abbb1c1cf9b4d1d204129cb4b3235c51f831e3e1735e0f50ebc0c789944fa8cbac129de9e8dad9623383f25f533223550e0780be2a941cd4e5 +SHA512 (swift-stress-tester.tar.gz) = 9213c73dd7303ca95a42e9a5c8379a7e123bae8eec70939154008d918cbf16472a8f73f5b930e9fbd1aa0388fe93c9ddc1c64f40145808c03d36856b3dba8f8c +SHA512 (swift-syntax.tar.gz) = 273106efe463a4105fd234c4b25671636e811ee87221f68d36a204f0c82d40dddcd75f9808ba5479bab1efc0d61bd6afc84f780aea02ac5186552b19a9777d23 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = e3d1cd64899f34285d22a79f30c5c6835810638b74830ee99926f1faee304c10b2b192d2fb7188450c7df007c93f8cdba48443e9cedeed96aff2e9283c7a67fd -SHA512 (swift-xcode-playground-support.tar.gz) = a1309ac3ea7edb15628b93ad261958ccd27c60ccc8a36af6d224c9e94a58b172862b26689acfc1bf6efbc0a218e7857caf5f99d57ec1db158ce485224ac5dfc9 -SHA512 (swift.tar.gz) = fafa80ff4d7e55ded58b3de942d25c8a9cf24ccbdd4f949e85d9d7a1119998825cd48be6ce9121bcbeb04d1755b63617e055a73f05748339528ecf432b9946fa +SHA512 (swift-tools-support-core.tar.gz) = cbe9f3b77fd11a8f72b5f97554d605810025a185fad7b5431cfbb703946ddf13cb8ce7f511ce6b1b9ffca141048ae988c31b68a044bfeebde86808f5e039f807 +SHA512 (swift-xcode-playground-support.tar.gz) = f66c839e4b78cdecb7f8dfac8bf78e026671cfcbc6df4c176d4f06f4c7d61bdb84988032f994628ed489941081a6073d2686852b6b3c54b984b0198d82df971d +SHA512 (swift.tar.gz) = 3c3568b42572c37b0d5ef261bc6fbd28c0b7907ae389ec5d5be25ae6fda6e4d5582bce7c3d92551f0a0412c39bb663768ca807f199054450826ed0062776e4ea SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index 1adda19..fac3073 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -3,18 +3,19 @@ %global linux_version fedora +################################################# # Make sure these are changed for every release! -%global swift_version 5.7.3-RELEASE -%global fedora_release 2 -%global package_version 5.7.3 +################################################# +%global swift_version 5.8-RELEASE +%global fedora_release 1 +%global package_version 5.8 # Set to the right version per the json file %global swift_source_location swift-source -%global sap_version 0.4.3 %global icu_version 65-1 %global yams_version 5.0.1 %global swift_argument_parser_version 1.0.3 -%global swift_crypto_version 1.1.5 +%global swift_crypto_version 2.2.3 %global ninja_version 1.11.1 %global cmake_version 3.19.6 %global swift_atomics_version 1.0.2 @@ -23,10 +24,11 @@ %global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 -# HEY! Are you changing the version of the project below? -# Make sure to change it in the %prep section as well in -# the renaming part -%global swift_cmark_gfm_branch release/5.7-gfm + +# Temporary I presume as the json file suggests there should +# be eventually a release version of swift-format +%global swift_format_version 0.50700.1 + Name: swift-lang Version: %{package_version} @@ -57,7 +59,7 @@ Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_ Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source22: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_gfm_branch}.zip#/swift-cmark-gfm.zip +Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz @@ -66,14 +68,18 @@ Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +%dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +%dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch +Patch5: no-test.patch BuildRequires: clang BuildRequires: swig @@ -111,6 +117,7 @@ ExclusiveArch: x86_64 aarch64 Provides: swiftlang = %{version}-%{release} + %description Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design @@ -124,7 +131,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -155,10 +162,12 @@ mv swift-numerics-%{swift_numerics_version} swift-numerics mv swift-system-%{swift_system_version} swift-system mv swift-nio-%{swift_nio_version} swift-nio mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl -mv swift-format-swift-%{swift_version} swift-format +%dnl mv swift-format-swift-%{swift_version} swift-format +mv swift-format-%{swift_format_version} swift-format mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown -mv swift-cmark-release-5.7-gfm swift-cmark-gfm +mv swift-stress-tester-swift-%{swift_version} swift-stress-tester +mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing # ICU mv icu-release-%{icu_version} icu @@ -173,26 +182,21 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Fix for uintptr_t not being declared because the header wasn't -# explicitly declared +# Fix for uinit_ptr not being declared implicitly %patch1 -p0 # Enable LZMA %patch2 -p0 -# Fix for glibc defining certain structs and enums twice that are flagged -# as redefined when including linux/fs.h -%patch3 -p0 - -# Fix for variable that is initialized and not used -%patch4 -p0 +# Tests fail for some reason preventing the package from being built +%patch5 -p0 %build export VERBOSE=1 -# Before Fedora 34, we may not have /usr/bin/python, so we +# EPEL8 may not have /usr/bin/python, so we # roll our own because the build script expects there to be one. -%if 0%{?fedora} < 34 || 0%{?el8} +%if 0%{?el8} if [ ! -d $PWD/binforpython ] ; then mkdir -p $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python @@ -233,14 +237,13 @@ export QA_SKIP_RPATHS=1 %changelog -* Wed Jan 25 2023 Ron Olson - 5.7.3-2 -- Added patch for missing includes - Resolves: rhbz#2162626 +* Fri Mar 31 2023 Ron Olson - 5.8-1 +- Updated to Swift 5.8-RELEASE + Resolves: rhbz#2183429 * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Jan 20 2023 Ron Olson - 5.7.3-1 -- Updated to Swift 5.7.3-RELEASE - Resolves: rhbz#2162626 +* Tue Dec 27 2022 Ron Olson - 5.8-1 +- Cleanup and first attempt at getting 5.8 going * Fri Dec 16 2022 Ron Olson - 5.7.2-2 - SPDX migration * Wed Dec 14 2022 Ron Olson - 5.7.2-1 From 52cfd81902d1f9785bba6873a428263c2d9c1f24 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 2 Jun 2023 11:19:19 -0500 Subject: [PATCH 110/152] Updated to Swift-5.8.1-RELEASE --- sources | 44 ++++++++++++++++++++++---------------------- swift-lang.spec | 7 +++++-- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/sources b/sources index 3c588c8..a45c2ce 100644 --- a/sources +++ b/sources @@ -1,35 +1,35 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 429bc1400b0d16b32caaa11ec5fc2f29feffc60410ad36ce49d4c65abf58065b08b980d9598fe259ea6ca545dd469829f64b55ec9e949b429ad08c87c7906723 -SHA512 (corelibs-foundation.tar.gz) = de22d7c246c7a0aa01e5071b114597cbbef59fc3f8caf397c632214fda44c80ac3011f06f53413a107de8501959fe4c42d4f4fdaa046c9b0b1073a63f59540fc -SHA512 (corelibs-libdispatch.tar.gz) = 913885f00c2010a88ceeb2f9414f2b39e9884ca3fd58e927248dcfafa2205560468114de5627e1225d23ea9e3a50e39670b3afd03defba3de54268653888c32c -SHA512 (corelibs-xctest.tar.gz) = d285f73ac9054e1ca6c5f2864cfd95a05305199d3feef7ca9ea76916d20cc0221b5ce969970ed51c5b3664e0c055c7a20952a342713f08172d87c2043d8c5a27 +SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d +SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 +SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 +SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 0b331d384c3e0b78ffc88c3f791f8f0520725250d38e40065bf760100116c24f51d19765a9bc110ee4ebc3e19245209e76d36c5ea3f742779c9c828fd2941201 -SHA512 (llbuild.tar.gz) = 8ea20d9d2c16dd6062a5562324d1d9fd15f3642b7e22f9ad9715c25328e3a94a33b2fafaec3dc5ecf99f7686426f56dae99618b03537a83dd70d6002933c79a5 -SHA512 (llvm-project.tar.gz) = 9cea24ded3e5a5180f0d95ee3ccd2d4ff3403874b327f1aeb038e278c510f2ac5a4b39dc0b92f05c61183c0d39eb29ad10fee7e0f839037a10eb3af0433b7a49 +SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 +SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 +SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 05ff587cc07015828883d8effdafc2da12836e8ef5926a54f61900fb73586fc9198988c8819f3a3ac42571d877950b20a5c12418d02fe04f293512ea2ec65a8e -SHA512 (sourcekit-lsp.tar.gz) = 77f32a3be6247093c2c4c188b567be62c1ec7b0116fb0b311ec50f70c3809576595f009a67acc5d25b4dae65651a3627d82ffbddf0f17b0b7b28e2da4847cd0f +SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 +SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 -SHA512 (swift-docc-render-artifact.tar.gz) = b3ca9b9734c5ae333fb521a995a47cb8af3a4097f4d250a0ec1194dbc239adc9285065478bbd507867167122826d93fc55f15bd18717118b4474e044b9b7edb4 -SHA512 (swift-docc-symbolkit.tar.gz) = 639521f8ce28974e02d24be3270ddf39766db57d568e682a2f7c8ec31d7ee7fb0c24ddc4a2173aae2e35c4bee9e51012dae6fd46e5c9e6cec294971c8cb5bf26 -SHA512 (swift-docc.tar.gz) = 4317a94b2018a1c12f50547bd002bca47231d0fa85a0fc18fc5035bad2197bb581d55083767e9a20458b2ae331c6f47a0c4b643a25925453e2d2460dabf80366 -SHA512 (swift-driver.tar.gz) = 391a8b8ff984ed9619285605432a752c80444ffc7d6b8cbd4a1caf1e48c6d64b010ed3a68dfce054f897240c210d68c65a534cd709eb7bec950add2454bf6b10 -SHA512 (swift-experimental-string-processing.tar.gz) = 1632126dead4b5fa6d975d2cae79da9cabaf600bac4fc8e1f95b5e82a1bc382949dce6f935e556e32dedb8644c8de771897266fab74b6d7cee27e39e3f8dff9e +SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 +SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 +SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa +SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 +SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 -SHA512 (swift-integration-tests.tar.gz) = a4b54659d77afecab1d32917f9dc595c3e7ecc6ee9d44c1e14ebc8fea0881f1ea9d9af16be65db38600da6923ac0f0cf7fffc8ed8fcc8262ef949d49c6b56845 -SHA512 (swift-lmdb.tar.gz) = bf361096ba201ecf9bdff6982b2f1ed35d4c00dd47ca4fc4dd65fa6df393249031978c007551a824d2708e2d3cce7f4b345357952f091874b95b888b27ea95e9 -SHA512 (swift-markdown.tar.gz) = 11cf2d6f23c97c0d0f017fb3ab309687d0f8726679bb5a502b538e588a6d47607cddf67c6418714dfb453fe226016903b246c439dfa9834308c2103730373c64 +SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 +SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 +SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-stress-tester.tar.gz) = 9213c73dd7303ca95a42e9a5c8379a7e123bae8eec70939154008d918cbf16472a8f73f5b930e9fbd1aa0388fe93c9ddc1c64f40145808c03d36856b3dba8f8c -SHA512 (swift-syntax.tar.gz) = 273106efe463a4105fd234c4b25671636e811ee87221f68d36a204f0c82d40dddcd75f9808ba5479bab1efc0d61bd6afc84f780aea02ac5186552b19a9777d23 +SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e +SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = cbe9f3b77fd11a8f72b5f97554d605810025a185fad7b5431cfbb703946ddf13cb8ce7f511ce6b1b9ffca141048ae988c31b68a044bfeebde86808f5e039f807 -SHA512 (swift-xcode-playground-support.tar.gz) = f66c839e4b78cdecb7f8dfac8bf78e026671cfcbc6df4c176d4f06f4c7d61bdb84988032f994628ed489941081a6073d2686852b6b3c54b984b0198d82df971d -SHA512 (swift.tar.gz) = 3c3568b42572c37b0d5ef261bc6fbd28c0b7907ae389ec5d5be25ae6fda6e4d5582bce7c3d92551f0a0412c39bb663768ca807f199054450826ed0062776e4ea +SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 +SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc +SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index fac3073..759f8e3 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,9 +6,9 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.8-RELEASE +%global swift_version 5.8.1-RELEASE %global fedora_release 1 -%global package_version 5.8 +%global package_version 5.8.1 # Set to the right version per the json file %global swift_source_location swift-source @@ -237,6 +237,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Jun 02 2023 Ron Olson - 5.8.1-1 +- Updated to Swift 5.8.1-RELEASE + Resolves: rhbz#2211845 * Fri Mar 31 2023 Ron Olson - 5.8-1 - Updated to Swift 5.8-RELEASE Resolves: rhbz#2183429 From 141177a3f6d8b340d076d4945309004eff57614b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 00:43:23 +0200 Subject: [PATCH 111/152] Rebuilt for Python 3.12 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 759f8e3..12fc5de 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -32,7 +32,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -237,6 +237,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Jun 13 2023 Python Maint - 5.8.1-1.1 +- Rebuilt for Python 3.12 + * Fri Jun 02 2023 Ron Olson - 5.8.1-1 - Updated to Swift 5.8.1-RELEASE Resolves: rhbz#2211845 From 8a32b18a7d911407c18a3f70e59c8558a4e04b64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:57:02 +0000 Subject: [PATCH 112/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 12fc5de..6d8566d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -32,7 +32,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist}.2 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -237,6 +237,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 5.8.1-1.1 - Rebuilt for Python 3.12 From d47722a2f838a167333c62b84d0b6d8b1ed97f81 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 22 Aug 2023 12:59:52 -0500 Subject: [PATCH 113/152] Added patches to make Swift buildable with glibc 2.38 --- fclose_issues.patch | 20 ++++++++++++++++++++ new_glibc.patch | 27 +++++++++++++++++++++++++++ swift-lang.spec | 26 ++++++++++++++++++++++---- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 fclose_issues.patch create mode 100644 new_glibc.patch diff --git a/fclose_issues.patch b/fclose_issues.patch new file mode 100644 index 0000000..b2b0f8d --- /dev/null +++ b/fclose_issues.patch @@ -0,0 +1,20 @@ +--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-08-15 14:01:48.975819260 -0500 ++++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-08-15 14:02:09.449066299 -0500 +@@ -473,7 +473,7 @@ + if fp == nil { + throw FileSystemError(errno: errno, path) + } +- defer { fclose(fp) } ++ defer { fclose(fp!) } + + // Read the data one block at a time. + let data = BufferedOutputByteStream() +@@ -503,7 +503,7 @@ + if fp == nil { + throw FileSystemError(errno: errno, path) + } +- defer { fclose(fp) } ++ defer { fclose(fp!) } + + // Write the data in one chunk. + var contents = bytes.contents diff --git a/new_glibc.patch b/new_glibc.patch new file mode 100644 index 0000000..6a84f8c --- /dev/null +++ b/new_glibc.patch @@ -0,0 +1,27 @@ +diff --color -Naur swift-corelibs-foundation-orig/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h +--- swift-corelibs-foundation-orig/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-06 10:02:48.000000000 -0500 ++++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-08-16 12:53:42.332226574 -0500 +@@ -189,7 +189,7 @@ + #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) + #endif + +-#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 ++#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN && !ALREADY_HAVE_STRL_FUNCS) || TARGET_OS_WIN32 + CF_INLINE size_t + strlcpy(char * dst, const char * src, size_t maxlen) { + const size_t srclen = strlen(src); +diff --color -Naur swift-corelibs-foundation-orig/CoreFoundation/CMakeLists.txt swift-corelibs-foundation/CoreFoundation/CMakeLists.txt +--- swift-corelibs-foundation-orig/CoreFoundation/CMakeLists.txt 2023-07-06 10:02:48.000000000 -0500 ++++ swift-corelibs-foundation/CoreFoundation/CMakeLists.txt 2023-08-16 12:53:44.851386844 -0500 +@@ -80,6 +80,11 @@ + add_compile_definitions($<$:HAVE_SCHED_GETAFFINITY>) + endif() + endif() ++ # XYZZY ++ check_symbol_exists(strlcpy "string.h" HAVE_NEW_GLIBC) ++ if(HAVE_NEW_GLIBC) ++ add_compile_definitions($<$:ALREADY_HAVE_STRL_FUNCS>) ++ endif() + endif() + elseif(CMAKE_SYSTEM_NAME STREQUAL Windows) + # NOTE(compnerd) we only support building with the dynamic CRT as using the diff --git a/swift-lang.spec b/swift-lang.spec index 6d8566d..95cace0 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -32,7 +32,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.2 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -80,6 +80,9 @@ Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch Patch5: no-test.patch +Patch7: fclose_issues.patch +Patch8: new_glibc.patch + BuildRequires: clang BuildRequires: swig @@ -183,14 +186,25 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize # Fix for uinit_ptr not being declared implicitly -%patch1 -p0 +%patch -P1 -p0 # Enable LZMA -%patch2 -p0 +%patch -P2 -p0 # Tests fail for some reason preventing the package from being built -%patch5 -p0 +%patch -P5 -p0 +# Issue with >= F39 not liking not having the file object +# explicitly forced in an fclose() +%if 0%{?fedora} >= 39 +%patch -P7 -p0 +%endif + +# 39 and later, so this patch modifies the CMakeLists.txt file +# to add a check for them, along with a patch to the header +# file that if they are present, don't define the functions +# seperately. +%patch -P8 -p0 %build export VERBOSE=1 @@ -237,6 +251,10 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Aug 22 2023 Ron Olson 5.8.1-2 +- Added patch to work with glibc 2.38 + Resolves: rhbz#2226476 + * Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 77885c532d3786061eb733e374547495958ee5c4 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 23 Aug 2023 14:19:45 -0500 Subject: [PATCH 114/152] Forgot to increment the version number --- swift-lang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 95cace0..bb99d66 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.8.1-RELEASE -%global fedora_release 1 +%global fedora_release 2 %global package_version 5.8.1 # Set to the right version per the json file From b1cf890222c620e4be45ae54a48fb6c1ac52465a Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 18 Sep 2023 20:55:05 -0500 Subject: [PATCH 115/152] Updated to Swift-5.9-RELEASE --- .gitignore | 2 + enablelzma.patch | 10 ++--- sources | 52 +++++++++++++------------ strlcpy_issues.patch | 11 ++++++ swift-lang.spec | 93 +++++++++++++++++++++----------------------- 5 files changed, 89 insertions(+), 79 deletions(-) create mode 100644 strlcpy_issues.patch diff --git a/.gitignore b/.gitignore index c3d26bc..3ec086d 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ /swift-system.tar.gz /yams.tar.gz /swift-experimental-string-processing.tar.gz +/swift-asn1.tar.gz +/swift-certificates.tar.gz diff --git a/enablelzma.patch b/enablelzma.patch index 5371a21..7d6f831 100644 --- a/enablelzma.patch +++ b/enablelzma.patch @@ -1,11 +1,11 @@ ---- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 -+++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 -@@ -2272,7 +2272,7 @@ +--- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 ++++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 +@@ -2209,7 +2209,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON - -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LZMA=ON -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) - -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" + -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" + -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" diff --git a/sources b/sources index a45c2ce..735cdd9 100644 --- a/sources +++ b/sources @@ -1,35 +1,37 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d -SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 -SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 -SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 +SHA512 (cmark.tar.gz) = 8588d884a587342599320f9326a819eda453042721bfa531ecb49ce371aa17a57d691124267e1918d09e77f3789cd97dd46ff1c74db95ffeb6eb383643d7a813 +SHA512 (corelibs-foundation.tar.gz) = 69eedc4fd77fe1177744e9ad2869f5d20c9f94f700db1d175fee4cb6aea91f1f37e933a9c4ab50decc7431d6acb52b811d003fa3278db73e6263dafb63dbfc15 +SHA512 (corelibs-libdispatch.tar.gz) = f7a6e8e5f450d63c8b6c9ed70f2099b669105f5f6d7ec1f6139fc3b4b5d30cc584b52d7d3c1e89a43252ab1dd56044417d57c6b9dcbf41edcabca0160c349165 +SHA512 (corelibs-xctest.tar.gz) = 894e9e795ed55fc49e12a1f588615375f5f692601ceb6be8cf5b1d505c1b9de251db981580be8d7e3e7ea693ebecf83c82f4941b347a296317f2233e3af6ec4e SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 -SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 -SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 +SHA512 (indexstore-db.tar.gz) = a3f48cc3d7f41232646ca753be0ba8ad17a5a6ce4f95b1e9e2c9587f31a15ba4395cc3a18bf20c2ccb2ded48fa725ecebee1e275eb51b48a4974dc68a21e99c4 +SHA512 (llbuild.tar.gz) = 41e1e434c8ccb30ff6c84d1a440e1a4d935f77db53489611f62ac9b3d717c6fe207c33b274df8be547eb20c85ff288416d7fcda67ae257ed55e5aa60df22306d +SHA512 (llvm-project.tar.gz) = 2ed9d1a2a38c9792c3a31cdf75a3d09a414a8f13a81cf93b0b4da39d59202ffa9f7c03502769c50a78d0c60ccfbebfce4a4cfd8f8c283bb29eb67a19ebc49294 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 -SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 -SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f +SHA512 (package-manager.tar.gz) = 2143e7b7e947dc70333a84efc5bf00bb4e905e0894cdb9309e4c349ffe601a00e778a403654600523ab8716716b147c6de7b80609eea4c34eb164873115427a3 +SHA512 (sourcekit-lsp.tar.gz) = cee8bec5c82a332d34502659fb39e7287edd8349bc3427263ee0e87a6e3514f95b089457ce3fd9918260903f0ac0bcaded6adce8a0cbaaf6a500392e6eb311fa +SHA512 (swift-argument-parser.tar.gz) = 626837261015505348a9ca8e75439566fc9263c5451093af17fabcdbd94067c9eb171ce0ccf1c77df3b245927bc4e860b95b6a0932434d6ddda6beb6aff59877 +SHA512 (swift-asn1.tar.gz) = 53012967696474cbf425a683e850fe45782f85d6023fbc40e6f3d36fea1cd560cc2dd564afce6561012d7ddbc8c4e89bbf9db678ad8d782a3103fef8fda21544 SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f +SHA512 (swift-certificates.tar.gz) = e75a7aac0e89a7a26926d1095f81db53b9b5e3117fa0402958e97710ca2c72ed42f07191d7bd6dbecf46c692f1e5247ddf23da8e5b653ff3892626e5139b7b75 SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 -SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 -SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 -SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa -SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 -SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 -SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 -SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 -SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 -SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 +SHA512 (swift-crypto.tar.gz) = 4a259a1d5827467afbf0d8ba36b680748065f58bcaba8a03fe33fa729de58d36280aaf99d5c198207a310a7ad4edd836061f8a9ebdab0622ba3a128076b90576 +SHA512 (swift-docc-render-artifact.tar.gz) = 555df7a6ef22450ee498c3e92145e875548f198fbba3f3c4bc28be3830af4b6f6598442083bf44d3652121e4fce8b961c95c2ff2e02f4edabaaadc5ff67763b0 +SHA512 (swift-docc-symbolkit.tar.gz) = 703ce3cb1a823ebdb104f88cb1ef506bafd74b03c0441cf1663156e474eb4710b4eb2cdd5722fb8cca9fb9fdcbb89adcc654519b72fa2de75f310362fad11018 +SHA512 (swift-docc.tar.gz) = ff1ffb4c6e3b2b443378f62375c9e263a1cc29b4c284de2396acc7e98481894d2cc3df338957190bbb445f34d818ca0a300c29ae3d3fad3d46fb20002959a04c +SHA512 (swift-driver.tar.gz) = 48a98f2d272814baac6d65f2e72e13bb3c33d7588cb9fc1076eea62c161b1191f16b2220f56590b650fdf1f1bf82495996c905a79fa1ea07ed84b2403f9097a6 +SHA512 (swift-experimental-string-processing.tar.gz) = 2cbc0964556952f05a15c9043880b3f578e6013382bc6a90fd264fdd3cf42bfad510c9c9f3b21898fcf2fc25e00afeca21726a75b7463e47453fdbcec44e8bd1 +SHA512 (swift-format.tar.gz) = 7b1ff69c22aa76d9a807ad0e204207661ddf57660e52fc2314e90d62f032573ea49d9c643d59f1c0215a1989d8b4c98f136d5a9a9fbcfa160b98cce4b85ec75a +SHA512 (swift-integration-tests.tar.gz) = 9c117b346be895a6edc5648406a2aa0c59eafe3be40db1d4ce7979dd237960191ff07743cd2b98c14abbb73beb02ce01a77813713367f45e26203d2576dacb5c +SHA512 (swift-lmdb.tar.gz) = 66c78106169c2722f5abb0bae7b69bc61a7713360ea8b6680c7fb4b41b594276f11b6454e5bc140238d2540535435dcaed5fd30fd1f896e138805634f96d0c00 +SHA512 (swift-markdown.tar.gz) = e96001f39e15a1e61a365090b04e522422516d16d270eb686d08c3e275c17a000f72c34ceccafe10a0d0d26dfcbde85370295f0568274385cce1530965c24374 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e -SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 +SHA512 (swift-stress-tester.tar.gz) = 3faff28a3739622c7b19a0a0145cd4b21e109b96fc1715222a62ea7cb91a0d12be8b975b9a4ca4118ac5ec8b4c7329b2520410f986a360312f008fb3cf55b716 +SHA512 (swift-syntax.tar.gz) = d6cd899515d112175ce6226eb9503e241ebdbd67497c7055bee88ca903e09eb8354e2ae1df0369b8d835f60d93191c55fd58a77280951d4df67891f8cbc0cd32 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 -SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc -SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d +SHA512 (swift-tools-support-core.tar.gz) = b0a3d00ff16a3ff3dc99c58965acebdf0bb77eb69d0dd69d7ffa4ce50a638c02446f15a598ce62ff7a9b724439b46fb7b110086bc7f738e71e9d9b5eabd9b521 +SHA512 (swift-xcode-playground-support.tar.gz) = 9131baf7f9dbd388b566c7bea7d9a2c8d89d8c1e60a56f07c71c8756861aafb53de58e6412c996580a9b32150fa97d22bc04c5f8c94ca39f64b922f4b6c1f335 +SHA512 (swift.tar.gz) = 4c4fd2b08417f66bde5c8b5e54c41716071f7a5b3e8d772e9c8f7ea79d569a2c2a6920108d6c51dfe7e6c4b2727e5a762059997e3a7edd75b93651b262ab6d5f SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch new file mode 100644 index 0000000..ece318b --- /dev/null +++ b/strlcpy_issues.patch @@ -0,0 +1,11 @@ +--- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 ++++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 +@@ -189,7 +189,7 @@ + #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) + #endif + +-#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 ++#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 + CF_INLINE size_t + strlcpy(char * dst, const char * src, size_t maxlen) { + const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index bb99d66..50ba8ab 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,16 +6,16 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.8.1-RELEASE -%global fedora_release 2 -%global package_version 5.8.1 +%global swift_version 5.9-RELEASE +%global fedora_release 1 +%global package_version 5.9 # Set to the right version per the json file %global swift_source_location swift-source %global icu_version 65-1 %global yams_version 5.0.1 -%global swift_argument_parser_version 1.0.3 -%global swift_crypto_version 2.2.3 +%global swift_argument_parser_version 1.2.2 +%global swift_crypto_version 2.5.0 %global ninja_version 1.11.1 %global cmake_version 3.19.6 %global swift_atomics_version 1.0.2 @@ -24,10 +24,12 @@ %global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 +%global swift_certificates_version 0.4.1 +%global swift_asn1_version 0.7.0 # Temporary I presume as the json file suggests there should # be eventually a release version of swift-format -%global swift_format_version 0.50700.1 +%global swift_format_version 508.0.0 Name: swift-lang @@ -52,37 +54,40 @@ Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz -Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz -Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz -Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz -Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz -Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz -Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz -Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz -Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz -Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source15: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source16: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz +Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source20: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source21: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz +Source22: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source25: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz %dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz -Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz -Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz -Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +Source30: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz +Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz +Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz +Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz + Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch Patch5: no-test.patch -Patch7: fclose_issues.patch -Patch8: new_glibc.patch - +Patch6: strlcpy_issues.patch +Patch7: fclose_issues.patch +Patch8: new_glibc.patch BuildRequires: clang BuildRequires: swig @@ -134,7 +139,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -171,6 +176,8 @@ mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing +mv swift-certificates-%{swift_certificates_version} swift-certificates +mv swift-asn1-%{swift_asn1_version} swift-asn1 # ICU mv icu-release-%{icu_version} icu @@ -185,9 +192,6 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Fix for uinit_ptr not being declared implicitly -%patch -P1 -p0 - # Enable LZMA %patch -P2 -p0 @@ -206,6 +210,7 @@ mv ninja-%{ninja_version} ninja # seperately. %patch -P8 -p0 + %build export VERBOSE=1 # EPEL8 may not have /usr/bin/python, so we @@ -251,22 +256,12 @@ export QA_SKIP_RPATHS=1 %changelog -* Tue Aug 22 2023 Ron Olson 5.8.1-2 -- Added patch to work with glibc 2.38 - Resolves: rhbz#2226476 - -* Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 5.8.1-1.1 -- Rebuilt for Python 3.12 - -* Fri Jun 02 2023 Ron Olson - 5.8.1-1 -- Updated to Swift 5.8.1-RELEASE - Resolves: rhbz#2211845 -* Fri Mar 31 2023 Ron Olson - 5.8-1 -- Updated to Swift 5.8-RELEASE - Resolves: rhbz#2183429 +* Mon Sep 18 2023 Ron Olson - 5.9-1 +- Updated to Swift 5.9-RELEASE + Resolves: rhbz#2239543 +* Wed Mar 29 2023 Ron Olson - 5.9-1 +- Cleanup and first attempt at getting 5.9 going though + 5.8 hasn't been released yet * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson - 5.8-1 From 7b6d93116f8b4689d3487ab1f49d2476a1650947 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:57:55 +0000 Subject: [PATCH 116/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 50ba8ab..d3bca20 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -34,7 +34,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -256,6 +256,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.9-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Sep 18 2023 Ron Olson - 5.9-1 - Updated to Swift 5.9-RELEASE Resolves: rhbz#2239543 From 11b897461e5d589db7a3091299df0cc965e7ca1e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 11:12:29 +0200 Subject: [PATCH 117/152] Rebuilt for Python 3.13 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index d3bca20..79c5cb2 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -34,7 +34,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist}.2 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -256,6 +256,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Jun 07 2024 Python Maint - 5.9-1.2 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 5.9-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 075ff7c9792df1eff0ba2d33e7a4ad16f0b301e4 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 8 Jun 2024 15:52:54 -0500 Subject: [PATCH 118/152] Rebuild to work with aarch64 and later versions of Swift --- enablelzma.patch | 10 ++-- fclose_issues.patch | 28 ++++++++-- sources | 52 +++++++++---------- strlcpy_issues.patch | 11 ---- swift-lang.spec | 121 +++++++++++++++++++++++-------------------- 5 files changed, 119 insertions(+), 103 deletions(-) delete mode 100644 strlcpy_issues.patch diff --git a/enablelzma.patch b/enablelzma.patch index 7d6f831..5371a21 100644 --- a/enablelzma.patch +++ b/enablelzma.patch @@ -1,11 +1,11 @@ ---- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 -+++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 -@@ -2209,7 +2209,7 @@ +--- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 ++++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 +@@ -2272,7 +2272,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON - -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LZMA=ON -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" - -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" + -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) + -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" diff --git a/fclose_issues.patch b/fclose_issues.patch index b2b0f8d..4625dd8 100644 --- a/fclose_issues.patch +++ b/fclose_issues.patch @@ -1,6 +1,6 @@ ---- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-08-15 14:01:48.975819260 -0500 -+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-08-15 14:02:09.449066299 -0500 -@@ -473,7 +473,7 @@ +--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2024-06-07 15:57:58.282574272 -0500 ++++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2024-06-07 16:00:41.442339293 -0500 +@@ -425,19 +425,19 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -9,7 +9,21 @@ // Read the data one block at a time. let data = BufferedOutputByteStream() -@@ -503,7 +503,7 @@ + var tmpBuffer = [UInt8](repeating: 0, count: 1 << 12) + while true { +- let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp) ++ let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp!) + if n < 0 { + if errno == EINTR { continue } + throw FileSystemError(.ioError(code: errno), path) + } + if n == 0 { +- let errno = ferror(fp) ++ let errno = ferror(fp!) + if errno != 0 { + throw FileSystemError(.ioError(code: errno), path) + } +@@ -455,12 +455,12 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -18,3 +32,9 @@ // Write the data in one chunk. var contents = bytes.contents + while true { +- let n = fwrite(&contents, 1, contents.count, fp) ++ let n = fwrite(&contents, 1, contents.count, fp!) + if n < 0 { + if errno == EINTR { continue } + throw FileSystemError(.ioError(code: errno), path) diff --git a/sources b/sources index 735cdd9..a45c2ce 100644 --- a/sources +++ b/sources @@ -1,37 +1,35 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 8588d884a587342599320f9326a819eda453042721bfa531ecb49ce371aa17a57d691124267e1918d09e77f3789cd97dd46ff1c74db95ffeb6eb383643d7a813 -SHA512 (corelibs-foundation.tar.gz) = 69eedc4fd77fe1177744e9ad2869f5d20c9f94f700db1d175fee4cb6aea91f1f37e933a9c4ab50decc7431d6acb52b811d003fa3278db73e6263dafb63dbfc15 -SHA512 (corelibs-libdispatch.tar.gz) = f7a6e8e5f450d63c8b6c9ed70f2099b669105f5f6d7ec1f6139fc3b4b5d30cc584b52d7d3c1e89a43252ab1dd56044417d57c6b9dcbf41edcabca0160c349165 -SHA512 (corelibs-xctest.tar.gz) = 894e9e795ed55fc49e12a1f588615375f5f692601ceb6be8cf5b1d505c1b9de251db981580be8d7e3e7ea693ebecf83c82f4941b347a296317f2233e3af6ec4e +SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d +SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 +SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 +SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = a3f48cc3d7f41232646ca753be0ba8ad17a5a6ce4f95b1e9e2c9587f31a15ba4395cc3a18bf20c2ccb2ded48fa725ecebee1e275eb51b48a4974dc68a21e99c4 -SHA512 (llbuild.tar.gz) = 41e1e434c8ccb30ff6c84d1a440e1a4d935f77db53489611f62ac9b3d717c6fe207c33b274df8be547eb20c85ff288416d7fcda67ae257ed55e5aa60df22306d -SHA512 (llvm-project.tar.gz) = 2ed9d1a2a38c9792c3a31cdf75a3d09a414a8f13a81cf93b0b4da39d59202ffa9f7c03502769c50a78d0c60ccfbebfce4a4cfd8f8c283bb29eb67a19ebc49294 +SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 +SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 +SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 2143e7b7e947dc70333a84efc5bf00bb4e905e0894cdb9309e4c349ffe601a00e778a403654600523ab8716716b147c6de7b80609eea4c34eb164873115427a3 -SHA512 (sourcekit-lsp.tar.gz) = cee8bec5c82a332d34502659fb39e7287edd8349bc3427263ee0e87a6e3514f95b089457ce3fd9918260903f0ac0bcaded6adce8a0cbaaf6a500392e6eb311fa -SHA512 (swift-argument-parser.tar.gz) = 626837261015505348a9ca8e75439566fc9263c5451093af17fabcdbd94067c9eb171ce0ccf1c77df3b245927bc4e860b95b6a0932434d6ddda6beb6aff59877 -SHA512 (swift-asn1.tar.gz) = 53012967696474cbf425a683e850fe45782f85d6023fbc40e6f3d36fea1cd560cc2dd564afce6561012d7ddbc8c4e89bbf9db678ad8d782a3103fef8fda21544 +SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 +SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 +SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-certificates.tar.gz) = e75a7aac0e89a7a26926d1095f81db53b9b5e3117fa0402958e97710ca2c72ed42f07191d7bd6dbecf46c692f1e5247ddf23da8e5b653ff3892626e5139b7b75 SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = 4a259a1d5827467afbf0d8ba36b680748065f58bcaba8a03fe33fa729de58d36280aaf99d5c198207a310a7ad4edd836061f8a9ebdab0622ba3a128076b90576 -SHA512 (swift-docc-render-artifact.tar.gz) = 555df7a6ef22450ee498c3e92145e875548f198fbba3f3c4bc28be3830af4b6f6598442083bf44d3652121e4fce8b961c95c2ff2e02f4edabaaadc5ff67763b0 -SHA512 (swift-docc-symbolkit.tar.gz) = 703ce3cb1a823ebdb104f88cb1ef506bafd74b03c0441cf1663156e474eb4710b4eb2cdd5722fb8cca9fb9fdcbb89adcc654519b72fa2de75f310362fad11018 -SHA512 (swift-docc.tar.gz) = ff1ffb4c6e3b2b443378f62375c9e263a1cc29b4c284de2396acc7e98481894d2cc3df338957190bbb445f34d818ca0a300c29ae3d3fad3d46fb20002959a04c -SHA512 (swift-driver.tar.gz) = 48a98f2d272814baac6d65f2e72e13bb3c33d7588cb9fc1076eea62c161b1191f16b2220f56590b650fdf1f1bf82495996c905a79fa1ea07ed84b2403f9097a6 -SHA512 (swift-experimental-string-processing.tar.gz) = 2cbc0964556952f05a15c9043880b3f578e6013382bc6a90fd264fdd3cf42bfad510c9c9f3b21898fcf2fc25e00afeca21726a75b7463e47453fdbcec44e8bd1 -SHA512 (swift-format.tar.gz) = 7b1ff69c22aa76d9a807ad0e204207661ddf57660e52fc2314e90d62f032573ea49d9c643d59f1c0215a1989d8b4c98f136d5a9a9fbcfa160b98cce4b85ec75a -SHA512 (swift-integration-tests.tar.gz) = 9c117b346be895a6edc5648406a2aa0c59eafe3be40db1d4ce7979dd237960191ff07743cd2b98c14abbb73beb02ce01a77813713367f45e26203d2576dacb5c -SHA512 (swift-lmdb.tar.gz) = 66c78106169c2722f5abb0bae7b69bc61a7713360ea8b6680c7fb4b41b594276f11b6454e5bc140238d2540535435dcaed5fd30fd1f896e138805634f96d0c00 -SHA512 (swift-markdown.tar.gz) = e96001f39e15a1e61a365090b04e522422516d16d270eb686d08c3e275c17a000f72c34ceccafe10a0d0d26dfcbde85370295f0568274385cce1530965c24374 +SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 +SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 +SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 +SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa +SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 +SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 +SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 +SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 +SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 +SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-stress-tester.tar.gz) = 3faff28a3739622c7b19a0a0145cd4b21e109b96fc1715222a62ea7cb91a0d12be8b975b9a4ca4118ac5ec8b4c7329b2520410f986a360312f008fb3cf55b716 -SHA512 (swift-syntax.tar.gz) = d6cd899515d112175ce6226eb9503e241ebdbd67497c7055bee88ca903e09eb8354e2ae1df0369b8d835f60d93191c55fd58a77280951d4df67891f8cbc0cd32 +SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e +SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = b0a3d00ff16a3ff3dc99c58965acebdf0bb77eb69d0dd69d7ffa4ce50a638c02446f15a598ce62ff7a9b724439b46fb7b110086bc7f738e71e9d9b5eabd9b521 -SHA512 (swift-xcode-playground-support.tar.gz) = 9131baf7f9dbd388b566c7bea7d9a2c8d89d8c1e60a56f07c71c8756861aafb53de58e6412c996580a9b32150fa97d22bc04c5f8c94ca39f64b922f4b6c1f335 -SHA512 (swift.tar.gz) = 4c4fd2b08417f66bde5c8b5e54c41716071f7a5b3e8d772e9c8f7ea79d569a2c2a6920108d6c51dfe7e6c4b2727e5a762059997e3a7edd75b93651b262ab6d5f +SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 +SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc +SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch deleted file mode 100644 index ece318b..0000000 --- a/strlcpy_issues.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 -+++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 -@@ -189,7 +189,7 @@ - #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) - #endif - --#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 -+#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 - CF_INLINE size_t - strlcpy(char * dst, const char * src, size_t maxlen) { - const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index 79c5cb2..5e0d0ee 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,16 +6,16 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.9-RELEASE -%global fedora_release 1 -%global package_version 5.9 +%global swift_version 5.8.1-RELEASE +%global fedora_release 3 +%global package_version 5.8.1 # Set to the right version per the json file %global swift_source_location swift-source %global icu_version 65-1 %global yams_version 5.0.1 -%global swift_argument_parser_version 1.2.2 -%global swift_crypto_version 2.5.0 +%global swift_argument_parser_version 1.0.3 +%global swift_crypto_version 2.2.3 %global ninja_version 1.11.1 %global cmake_version 3.19.6 %global swift_atomics_version 1.0.2 @@ -24,17 +24,15 @@ %global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 -%global swift_certificates_version 0.4.1 -%global swift_asn1_version 0.7.0 # Temporary I presume as the json file suggests there should # be eventually a release version of swift-format -%global swift_format_version 508.0.0 +%global swift_format_version 0.50700.1 Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.2 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -54,42 +52,43 @@ Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source16: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz -Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz -Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz -Source20: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source21: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz -Source22: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz -Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz -Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz -Source25: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz -Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz -Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz -Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz +Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz %dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz -Source30: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz -Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz -Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz -Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz -Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz -Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz - Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch Patch5: no-test.patch -Patch6: strlcpy_issues.patch -Patch7: fclose_issues.patch -Patch8: new_glibc.patch +Patch7: fclose_issues.patch +Patch8: new_glibc.patch + +%ifarch aarch64 +BuildRequires: clang15 +%else BuildRequires: clang +%endif BuildRequires: swig BuildRequires: rsync BuildRequires: python3 @@ -139,7 +138,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -176,8 +175,6 @@ mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing -mv swift-certificates-%{swift_certificates_version} swift-certificates -mv swift-asn1-%{swift_asn1_version} swift-asn1 # ICU mv icu-release-%{icu_version} icu @@ -192,6 +189,9 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize +# Fix for uinit_ptr not being declared implicitly +%patch -P1 -p0 + # Enable LZMA %patch -P2 -p0 @@ -210,17 +210,17 @@ mv ninja-%{ninja_version} ninja # seperately. %patch -P8 -p0 - %build export VERBOSE=1 -# EPEL8 may not have /usr/bin/python, so we -# roll our own because the build script expects there to be one. -%if 0%{?el8} -if [ ! -d $PWD/binforpython ] ; then - mkdir -p $PWD/binforpython - ln -s /usr/bin/python3 $PWD/binforpython/python + +# Specific for aarch64 architecture +%ifarch aarch64 +if [ ! -d $PWD/oldclang ] ; then + mkdir -p $PWD/oldclang + ln -s /usr/bin/clang-15 $PWD/oldclang/clang + ln -s /usr/bin/clang++-15 $PWD/oldclang/clang++ fi -export PATH=$PWD/binforpython:$PATH +export PATH=$PWD/oldclang:$PATH %endif # Here we go! @@ -236,6 +236,8 @@ ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir} ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 +mkdir -p %{buildroot}/usr/lib +ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift # This is to fix an issue with check-rpaths complaining about # how the Swift binaries use RPATH @@ -249,6 +251,7 @@ export QA_SKIP_RPATHS=1 %{_bindir}/sourcekit-lsp %{_mandir}/man1/swift.1.gz %{_libexecdir}/swift/ +%{_usr}/lib/swift %post -p /sbin/ldconfig @@ -256,18 +259,24 @@ export QA_SKIP_RPATHS=1 %changelog -* Fri Jun 07 2024 Python Maint - 5.9-1.2 -- Rebuilt for Python 3.13 +* Fri Feb 16 2024 Ron Olson 5.8.1-3 +- Added symlink for future versions of Swift +* Tue Aug 22 2023 Ron Olson 5.8.1-2 +- Added patch to work with glibc 2.38 + Resolves: rhbz#2226476 -* Sat Jan 27 2024 Fedora Release Engineering - 5.9-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Mon Sep 18 2023 Ron Olson - 5.9-1 -- Updated to Swift 5.9-RELEASE - Resolves: rhbz#2239543 -* Wed Mar 29 2023 Ron Olson - 5.9-1 -- Cleanup and first attempt at getting 5.9 going though - 5.8 hasn't been released yet +* Tue Jun 13 2023 Python Maint - 5.8.1-1.1 +- Rebuilt for Python 3.12 + +* Fri Jun 02 2023 Ron Olson - 5.8.1-1 +- Updated to Swift 5.8.1-RELEASE + Resolves: rhbz#2211845 +* Fri Mar 31 2023 Ron Olson - 5.8-1 +- Updated to Swift 5.8-RELEASE + Resolves: rhbz#2183429 * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson - 5.8-1 From 2628b8e9cc77d381510e7d2b9226879f207dcbda Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 01:40:47 +0200 Subject: [PATCH 119/152] Rebuilt for Python 3.13 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 5e0d0ee..401dda3 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -32,7 +32,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -259,6 +259,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sat Jun 08 2024 Python Maint - 5.8.1-3.1 +- Rebuilt for Python 3.13 + * Fri Feb 16 2024 Ron Olson 5.8.1-3 - Added symlink for future versions of Swift * Tue Aug 22 2023 Ron Olson 5.8.1-2 From fb2ad0d64bbf94fdc798695b49a7da5cc17b734b Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 20 Jun 2024 10:41:12 -0500 Subject: [PATCH 120/152] Updated to Swift 5.10.1-RELEASE --- .gitignore | 2 + enablelzma.patch | 10 +-- fclose_issues.patch | 8 +- sdk_path.patch | 19 +++++ sources | 64 ++++++++-------- strlcpy_issues.patch | 11 +++ swift-lang.spec | 172 ++++++++++++++++++++++++------------------- swiftrto.patch | 12 +++ 8 files changed, 182 insertions(+), 116 deletions(-) create mode 100644 sdk_path.patch create mode 100644 strlcpy_issues.patch create mode 100644 swiftrto.patch diff --git a/.gitignore b/.gitignore index 3ec086d..561cf88 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ /swift-experimental-string-processing.tar.gz /swift-asn1.tar.gz /swift-certificates.tar.gz +/wasi-sdk.tar.gz +/wasm.tar.gz diff --git a/enablelzma.patch b/enablelzma.patch index 5371a21..7d6f831 100644 --- a/enablelzma.patch +++ b/enablelzma.patch @@ -1,11 +1,11 @@ ---- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 -+++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 -@@ -2272,7 +2272,7 @@ +--- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 ++++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 +@@ -2209,7 +2209,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON - -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LZMA=ON -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) - -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" + -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" + -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" diff --git a/fclose_issues.patch b/fclose_issues.patch index 4625dd8..8582684 100644 --- a/fclose_issues.patch +++ b/fclose_issues.patch @@ -1,6 +1,6 @@ ---- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2024-06-07 15:57:58.282574272 -0500 -+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2024-06-07 16:00:41.442339293 -0500 -@@ -425,19 +425,19 @@ +--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-12-12 21:00:36.129189000 +0000 ++++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-12-12 21:04:32.274597013 +0000 +@@ -495,19 +495,19 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -23,7 +23,7 @@ if errno != 0 { throw FileSystemError(.ioError(code: errno), path) } -@@ -455,12 +455,12 @@ +@@ -525,12 +525,12 @@ if fp == nil { throw FileSystemError(errno: errno, path) } diff --git a/sdk_path.patch b/sdk_path.patch new file mode 100644 index 0000000..c2a930e --- /dev/null +++ b/sdk_path.patch @@ -0,0 +1,19 @@ +--- swift/cmake/modules/AddSwift.cmake.orig 2024-02-15 13:47:44.300541015 -0600 ++++ swift/cmake/modules/AddSwift.cmake 2024-02-15 13:53:44.593670558 -0600 +@@ -543,11 +543,15 @@ + # At build time and run time, link against the swift libraries in the + # installed host toolchain. + if(SWIFT_PATH_TO_SWIFT_SDK) +- set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr") ++ # XYZZY ++ set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr/libexec/swift/5.8.1") + else() + get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY) + get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY) + endif() ++ # XYZZY ++ set(swift_dir "/usr/libexec/swift/5.8.1") ++ # xyzzy - back to original + set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}") + set(host_lib_arch_dir "${host_lib_dir}/${SWIFT_HOST_VARIANT_ARCH}") + diff --git a/sources b/sources index a45c2ce..7319eec 100644 --- a/sources +++ b/sources @@ -1,35 +1,39 @@ -SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d -SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 -SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 -SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 +SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 +SHA512 (cmark.tar.gz) = cb7ffad3ec3fbc74de28df56f4ec5850047abf38ae4a2fdfa37aeacd122c52e3164ef965b582a184911612608df0e450481f9f8c25d11c565518ab39a0d24199 +SHA512 (corelibs-foundation.tar.gz) = e4ff04e1eb742455f52b43f0a3a1725d0c1c132d2192e4779073c7690ff12991c62c20ca0a42b81d2af12b394e4720309a07cd303ba12f22c2f917570ed0ff5d +SHA512 (corelibs-libdispatch.tar.gz) = fa8278adbdfd5b041c89a7b14a17aaa805a6f4db12221ff469288bb8d945fd28f16a8d66f56148aeba2e6be30bd6655fbe375d7843d1cb54407527d998e6d6fa +SHA512 (corelibs-xctest.tar.gz) = 6dad6f84ef5a47a74d25211efc25cc2baa13bf0019145cc96ad4d5ac7ddcf79b60dd775f610d099848e3a7b4856f8bb9c06558f6f971324474ae2e6fa8a7cd4f SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 -SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 -SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 +SHA512 (indexstore-db.tar.gz) = 1fc62360a5cd4701da314774b4c5c6a6a9cc2a8d46881962fc80331006c255d173f8ace8d743a09b3fcdbf1e92570248666396a0b78ce8be19eeff65ab6c3235 +SHA512 (llbuild.tar.gz) = 010ac22ff4c6e803a537e6e84b3f6047d74fc35f773fcf51f52f9d1546196ed73ab42ab90d1346a0a74239c4f1d11cd183018f42726df42dc921bf0d2235d850 +SHA512 (llvm-project.tar.gz) = c659041234da1fed29a7186f0e436b0867576096483333d71f11e72828b45e2c7bd9b15db7d3da348a114af48a649f8a484ba3bd4de84d2f5cdb8a7035c5ad30 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 -SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 -SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f -SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 -SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 -SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 -SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa -SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 -SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 -SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 -SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 -SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 -SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 +SHA512 (package-manager.tar.gz) = 303e2b02bdc16cfe3a8812e4d5a79de09ef7367a2f0bbca28c55e2f037b0a8dab684bcaa7189dbcc6c6876d21a4e4da2b0956743b99a0b2c7d4a1be415e0df92 +SHA512 (sourcekit-lsp.tar.gz) = 4a2f7c2129a69c05c8d158877efb1538f092f8eb2d1b1194661cb7c6f201330ecf7fd33bb0d06dd595bc6966e19b739d103478db6c9b2a4c2d7ae351bfb398a8 +SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 +SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 +SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 +SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 +SHA512 (swift-collections.tar.gz) = 87309c52e5d2115ce8aedda05f35f40e919b367663d9032a159a31163fda7d0aa78df9049e424bda65fe58c4f2a1c74a784c4c6b485581eef450a022a5a7d700 +SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f +SHA512 (swift-docc-render-artifact.tar.gz) = d646a4263cade323c2a19f06f1c909e02606b92953b72aa37dc1e49e99199085484d68f90259a821b4e81f2b18de624648db50bde0d8cfd852c291cad39ff282 +SHA512 (swift-docc-symbolkit.tar.gz) = cf7a058aeded8455656fa70443b9e280488391957e9003c85c4166925ec6de74675fe9a61571da5897853626e91e4353d72abc76d71a79f4f32e2e4d5b7f4ed9 +SHA512 (swift-docc.tar.gz) = d72849e583211ff5fef449de2257629b67511476f06724ed798428bd4f5e29224860854bbd262c3d4ae786397704d9589eb2d84a9d4d95f385fba9bc491e208b +SHA512 (swift-driver.tar.gz) = 77ce7412cf2a5077331250b1fa70e56b6300340aef7224089840018519cab46bcc011074478045e4bf30502912a0619a842bc082509145871a3c0f1da14ccde5 +SHA512 (swift-experimental-string-processing.tar.gz) = 89650c6b68ee6a256fadda84e68d7ea4faf3c09859e80bcc270ca36433ed3e652c7139ed868f6f515e3193928a100c99500574eb614dbf97c345cbfefdb245c2 +SHA512 (swift-format.tar.gz) = 2feba9df7b78010ff5c9b6ccf2dfc44a37425410d0733c1ddb4a804310ee75e95c8bf464c9fc2ff1285b20089b0a19a2192e2cf4fa3087028d28e0f83a70d94c +SHA512 (swift-integration-tests.tar.gz) = 52dbcd7a9b509253b6f2df4467ebcf0ade8d941581883fa9edf6461ab308f2e07b80e95aa673155066324802e57397887d01249bf055178e08ca7483c11b2250 +SHA512 (swift-lmdb.tar.gz) = ffbdb5f0efd84b9826c23919a7d4941f6b71ad78a389814e56c2862f441a37484c020aa54e5984076634d5f15c088eeaa84b658f357d4585109c4ca8535ef6cc +SHA512 (swift-markdown.tar.gz) = df4d1f240c0d92b2df9bd48b5cd750402a2f855d2a989d7c3722f3eeeaec067d7562caa38b8ea664114359b9c6bf4f2d5502acd62225e3a5e278bf9525f7d24c SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e -SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e -SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 -SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 -SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc -SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d +SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a +SHA512 (swift-stress-tester.tar.gz) = a0f63b902e7243b455a0e7f60b11e8c0e6448c56a8db39c96fc40bd99a79f2a23147f631b04d79713832bca44403c5cba5b2a8d96eb5bbd4515295a00126290e +SHA512 (swift-syntax.tar.gz) = bbe672aed621915f387fd8c308805208a29d0b830d7a2f84543ea6b8036554205e0db46414a3ea3e2e8e733e49d8b23971acc385fc4c0fac8204e8cdbdc34cd7 +SHA512 (swift-system.tar.gz) = 9cfd32ab5fce445b764ba5fb9f1739776167a3159057338923dab6e74b15e72e3dbaee2d48386113597a36f356e5961b173937f58fd0b95a0ced910bc1672450 +SHA512 (swift-tools-support-core.tar.gz) = d69d2e4e9b1e6c44b97c88b73101f7b66a8adb59275e77ca0e3ededd7bf444285a649855f94e7f8aee7b965b734e9b657eef65671f3ce0c4b0c6971380672e6a +SHA512 (swift-xcode-playground-support.tar.gz) = d1f9a178891c64c3e40cd2ae56a48b8afedeb1981330776a04bddff9b94dcaf09542291bf234e6ed1515e046fa8fced506e7b3c3461bc690ca01a58640222c24 +SHA512 (swift.tar.gz) = 212ede9ba6a874666ceeb30073dd2a9c8b6b08715f375c98b86bee4a78f4a235ad0f1e35ec3d7f9f97c79f963a9d8bd0a6c9737a8c32b073dca828c564145396 +SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 +SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch new file mode 100644 index 0000000..ece318b --- /dev/null +++ b/strlcpy_issues.patch @@ -0,0 +1,11 @@ +--- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 ++++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 +@@ -189,7 +189,7 @@ + #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) + #endif + +-#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 ++#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 + CF_INLINE size_t + strlcpy(char * dst, const char * src, size_t maxlen) { + const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index 401dda3..483a606 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,33 +6,37 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.8.1-RELEASE -%global fedora_release 3 -%global package_version 5.8.1 +%global swift_version 5.10.1-RELEASE +%global fedora_release 1 +%global package_version 5.10.1 # Set to the right version per the json file %global swift_source_location swift-source %global icu_version 65-1 %global yams_version 5.0.1 -%global swift_argument_parser_version 1.0.3 -%global swift_crypto_version 2.2.3 +%global swift_argument_parser_version 1.2.3 +%global swift_crypto_version 3.0.0 %global ninja_version 1.11.1 -%global cmake_version 3.19.6 -%global swift_atomics_version 1.0.2 -%global swift_collections_version 1.0.1 -%global swift_numerics_version 1.0.1 -%global swift_system_version 1.1.1 +%global cmake_version 3.24.2 +%global swift_atomics_version 1.2.0 +%global swift_collections_version 1.0.5 +%global swift_numerics_version 1.0.2 +%global swift_system_version 1.2.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 +%global swift_certificates_version 1.0.1 +%global swift_asn1_version 1.0.0 +%global wasmkit_version 0.0.3 +%global wasi_version 20 # Temporary I presume as the json file suggests there should # be eventually a release version of swift-format -%global swift_format_version 0.50700.1 +%global swift_format_version 510.1.0 Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -52,43 +56,46 @@ Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz -Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz -Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz -Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz -Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz -Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz -Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz -Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz -Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz -Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -%dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz -Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz -Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz -Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +Source15: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source16: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz +Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source20: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source21: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz +Source22: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source25: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +%dnl Source30: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source30: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz +Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz +Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz +Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz +Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz + Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch Patch5: no-test.patch -Patch7: fclose_issues.patch -Patch8: new_glibc.patch +Patch6: strlcpy_issues.patch +Patch7: fclose_issues.patch +Patch8: new_glibc.patch +Patch9: swiftrto.patch +Patch10: sdk_path.patch - -%ifarch aarch64 -BuildRequires: clang15 -%else BuildRequires: clang -%endif BuildRequires: swig BuildRequires: rsync BuildRequires: python3 @@ -106,9 +113,12 @@ BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six BuildRequires: binutils-devel +BuildRequires: zlib-devel %if ! 0%{?el8} BuildRequires: python-unversioned-command %endif +# Apparently we need Swift to build Swift (shrug) +BuildRequires: swiftlang Requires: glibc-devel %if 0%{?rhel} && 0%{?rhel} == 8 @@ -138,7 +148,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -175,6 +185,8 @@ mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing +mv swift-certificates-%{swift_certificates_version} swift-certificates +mv swift-asn1-%{swift_asn1_version} swift-asn1 # ICU mv icu-release-%{icu_version} icu @@ -185,44 +197,58 @@ mv Yams-%{yams_version} yams # Ninja mv ninja-%{ninja_version} ninja +# WasmKit +mv WasmKit-%{wasmkit_version} wasmkit + + # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Fix for uinit_ptr not being declared implicitly -%patch -P1 -p0 - # Enable LZMA -%patch -P2 -p0 +%dnl %patch -P2 -p0 # Tests fail for some reason preventing the package from being built -%patch -P5 -p0 +%dnl %patch -P5 -p0 # Issue with >= F39 not liking not having the file object # explicitly forced in an fclose() %if 0%{?fedora} >= 39 -%patch -P7 -p0 +%dnl %patch -P7 -p0 %endif # 39 and later, so this patch modifies the CMakeLists.txt file # to add a check for them, along with a patch to the header # file that if they are present, don't define the functions # seperately. -%patch -P8 -p0 +%dnl %patch -P8 -p0 + +# For finding swiftrt.o in the right place +%dnl %patch -P9 -p0 +%dnl %patch -P10 -p0 + %build export VERBOSE=1 - -# Specific for aarch64 architecture -%ifarch aarch64 -if [ ! -d $PWD/oldclang ] ; then - mkdir -p $PWD/oldclang - ln -s /usr/bin/clang-15 $PWD/oldclang/clang - ln -s /usr/bin/clang++-15 $PWD/oldclang/clang++ +# EPEL8 may not have /usr/bin/python, so we +# roll our own because the build script expects there to be one. +%if 0%{?el8} +if [ ! -d $PWD/binforpython ] ; then + mkdir -p $PWD/binforpython + ln -s /usr/bin/python3 $PWD/binforpython/python fi -export PATH=$PWD/oldclang:$PATH +export PATH=$PWD/binforpython:$PATH %endif +# Temp until we figure out a better way to do this - note this +# only works in a container. Also note this is hard-coded to +# 5.8.1 (this is as of 12/8/23) and will eventually be more +# generic (if this continues to be a thing at all) +# +if [ "$(cat /proc/1/sched | head -n 1 | awk '{print $1}')" == "bash" ]; then + ln -s /usr/libexec/swift/5.8.1/lib/swift /usr/lib/swift +fi + # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz @@ -259,27 +285,19 @@ export QA_SKIP_RPATHS=1 %changelog -* Sat Jun 08 2024 Python Maint - 5.8.1-3.1 -- Rebuilt for Python 3.13 - -* Fri Feb 16 2024 Ron Olson 5.8.1-3 -- Added symlink for future versions of Swift -* Tue Aug 22 2023 Ron Olson 5.8.1-2 -- Added patch to work with glibc 2.38 - Resolves: rhbz#2226476 - -* Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 5.8.1-1.1 -- Rebuilt for Python 3.12 - -* Fri Jun 02 2023 Ron Olson - 5.8.1-1 -- Updated to Swift 5.8.1-RELEASE - Resolves: rhbz#2211845 -* Fri Mar 31 2023 Ron Olson - 5.8-1 -- Updated to Swift 5.8-RELEASE - Resolves: rhbz#2183429 +* Thu Jun 06 2024 Ron Olson - 5.10.1-1 +- Updated to Swift 5.10.1-RELEASE + Resolves: rhbz#2239543 +* Tue Apr 23 2024 Ron Olson - 6.0-1 +- First attempt at getting 6.0 working +* Mon Sep 18 2023 Ron Olson - 5.9-1 +- Updated to Swift 5.9-RELEASE + Resolves: rhbz#2239543 +* Fri Sep 15 2023 Ron Olson - 5.10-1 +- First working version of Swift 5.10 +* Wed Mar 29 2023 Ron Olson - 5.9-1 +- Cleanup and first attempt at getting 5.9 going though + 5.8 hasn't been released yet * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson - 5.8-1 diff --git a/swiftrto.patch b/swiftrto.patch new file mode 100644 index 0000000..3dcfd78 --- /dev/null +++ b/swiftrto.patch @@ -0,0 +1,12 @@ +--- swift/lib/Driver/UnixToolChains.cpp.orig 2023-12-21 20:05:01.595459343 -0600 ++++ swift/lib/Driver/UnixToolChains.cpp 2023-12-21 20:06:27.482394420 -0600 +@@ -281,6 +281,9 @@ + llvm::sys::path::append(swiftrtPath, + swift::getMajorArchitectureName(getTriple())); + llvm::sys::path::append(swiftrtPath, "swiftrt.o"); ++ //Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); ++ // XYZZY ++ swiftrtPath = "/usr/libexec/swift/5.8.1/lib/swift/linux/x86_64/swiftrt.o"; + Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); + + addPrimaryInputsOfType(Arguments, context.Inputs, context.Args, From 14e5d690d4d42b56378e0130496d0c9fb320cf08 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 20 Jun 2024 14:13:18 -0500 Subject: [PATCH 121/152] Updated Swift 5.8 to build on Rawhide (no pipes support in python) --- enablelzma.patch | 10 +- fclose_issues.patch | 8 +- no_pipes_58.patch | 270 +++++++++++++++++++++++++++++++++++++++++++ sdk_path.patch | 19 --- sources | 64 +++++----- strlcpy_issues.patch | 11 -- swift-lang.spec | 179 +++++++++++++--------------- swiftrto.patch | 12 -- 8 files changed, 390 insertions(+), 183 deletions(-) create mode 100644 no_pipes_58.patch delete mode 100644 sdk_path.patch delete mode 100644 strlcpy_issues.patch delete mode 100644 swiftrto.patch diff --git a/enablelzma.patch b/enablelzma.patch index 7d6f831..5371a21 100644 --- a/enablelzma.patch +++ b/enablelzma.patch @@ -1,11 +1,11 @@ ---- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 -+++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 -@@ -2209,7 +2209,7 @@ +--- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 ++++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 +@@ -2272,7 +2272,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON - -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LZMA=ON -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" - -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" + -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) + -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" diff --git a/fclose_issues.patch b/fclose_issues.patch index 8582684..4625dd8 100644 --- a/fclose_issues.patch +++ b/fclose_issues.patch @@ -1,6 +1,6 @@ ---- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-12-12 21:00:36.129189000 +0000 -+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-12-12 21:04:32.274597013 +0000 -@@ -495,19 +495,19 @@ +--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2024-06-07 15:57:58.282574272 -0500 ++++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2024-06-07 16:00:41.442339293 -0500 +@@ -425,19 +425,19 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -23,7 +23,7 @@ if errno != 0 { throw FileSystemError(.ioError(code: errno), path) } -@@ -525,12 +525,12 @@ +@@ -455,12 +455,12 @@ if fp == nil { throw FileSystemError(errno: errno, path) } diff --git a/no_pipes_58.patch b/no_pipes_58.patch new file mode 100644 index 0000000..49f2754 --- /dev/null +++ b/no_pipes_58.patch @@ -0,0 +1,270 @@ +diff --color -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py +--- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-20 13:38:53.943180833 -0500 ++++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-20 13:42:30.244711005 -0500 +@@ -14,7 +14,6 @@ + import stat + import sys + import subprocess +-import pipes + import shlex + import tempfile + import shutil +@@ -57,7 +56,7 @@ + sys.exit("ERROR: `%s` not found in %s" % (cmd_name, cmd_dir)) + + def quote_cmd(cmd): +- return ' '.join(pipes.quote(arg) for arg in cmd) ++ return ' '.join(shlex.quote(arg) for arg in cmd) + + def write_to_script(text, filename): + with open(filename, 'w') as f: +@@ -199,7 +198,7 @@ + """ % (disable_symbolization, quote_cmd(self.get_crash_cmd())) + + for msg in self.expected_output: +- output += 'grep -F %s t.log || exit 1\n' % pipes.quote(msg) ++ output += 'grep -F %s t.log || exit 1\n' % shlex.quote(msg) + + write_to_script(output, self.testfile) + self.check_interestingness() +diff --color -Naur llvm-project/compiler-rt/test/asan/lit.cfg.py llvm-project/compiler-rt/test/asan/lit.cfg.py +--- llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-20 13:38:17.808753484 -0500 ++++ llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-20 13:43:18.446949016 -0500 +@@ -6,14 +6,8 @@ + + import lit.formats + +-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if +-# it's not available. +-try: +- import shlex +- sh_quote = shlex.quote +-except: +- import pipes +- sh_quote = pipes.quote ++import shlex ++sh_quote = shlex.quote + + def get_required_attr(config, attr_name): + attr_value = getattr(config, attr_name, None) +diff --color -Naur llvm-project/compiler-rt/test/lit.common.cfg.py llvm-project/compiler-rt/test/lit.common.cfg.py +--- llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-20 13:38:17.788752141 -0500 ++++ llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-20 13:43:44.961730162 -0500 +@@ -12,14 +12,8 @@ + import lit.formats + import lit.util + +-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if +-# it's not available. +-try: +- import shlex +- sh_quote = shlex.quote +-except: +- import pipes +- sh_quote = pipes.quote ++import shlex ++sh_quote = shlex.quote + + def find_compiler_libdir(): + """ +diff --color -Naur llvm-project/compiler-rt/test/memprof/lit.cfg.py llvm-project/compiler-rt/test/memprof/lit.cfg.py +--- llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-20 13:38:17.852756440 -0500 ++++ llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-20 13:44:09.179356996 -0500 +@@ -6,14 +6,8 @@ + + import lit.formats + +-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if +-# it's not available. +-try: +- import shlex +- sh_quote = shlex.quote +-except: +- import pipes +- sh_quote = pipes.quote ++import shlex ++sh_quote = shlex.quote + + def get_required_attr(config, attr_name): + attr_value = getattr(config, attr_name, None) +diff --color -Naur llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py +--- llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py 2024-06-20 13:38:17.946762755 -0500 ++++ llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py 2024-06-20 13:48:37.348371396 -0500 +@@ -1,6 +1,6 @@ + #!/usr/bin/env python3 + +-import glob, os, pipes, sys, subprocess ++import glob, os, shlex, sys, subprocess + + + device_id = os.environ.get('SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER') +@@ -39,7 +39,7 @@ + rm_args.append(arg) + else: + # FIXME(dliew): pipes.quote() is deprecated +- rm_args.append(pipes.quote(arg)) ++ rm_args.append(shlex.quote(arg)) + rm_cmd_line = ["/bin/rm"] + rm_args + rm_cmd_line_str = ' '.join(rm_cmd_line) + # We use `shell=True` so that any wildcard globs get expanded by the shell. +diff --color -Naur llvm-project/libcxx/utils/libcxx/test/config.py llvm-project/libcxx/utils/libcxx/test/config.py +--- llvm-project/libcxx/utils/libcxx/test/config.py 2024-06-20 13:38:59.394547032 -0500 ++++ llvm-project/libcxx/utils/libcxx/test/config.py 2024-06-20 13:45:49.931125052 -0500 +@@ -9,7 +9,6 @@ + import copy + import os + import pkgutil +-import pipes + import platform + import re + import shlex +@@ -434,7 +433,7 @@ + def quote(self, s): + if platform.system() == 'Windows': + return lit.TestRunner.quote_windows_command([s]) +- return pipes.quote(s) ++ return shlex.quote(s) + + def configure_substitutions(self): + sub = self.config.substitutions +diff --color -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py +--- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-20 13:38:59.394547032 -0500 ++++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-20 13:45:11.318531231 -0500 +@@ -8,7 +8,7 @@ + + import os + import pickle +-import pipes ++import shlex + import platform + import re + import shutil +@@ -261,7 +261,7 @@ + } + #endif + """ +- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales]) ++ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales]) + + @_memoizeExpensiveOperation(lambda c, flags='': (c.substitutions, c.environment, flags)) + def compilerMacros(config, flags=''): +diff --color -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py +--- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-20 13:38:59.394547032 -0500 ++++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-20 13:45:31.689899688 -0500 +@@ -9,7 +9,7 @@ + import lit + import lit.formats + import os +-import pipes ++import shlex + import re + import shutil + +diff --color -Naur ninja/configure.py ninja/configure.py +--- ninja/configure.py 2024-06-20 13:38:14.957561954 -0500 ++++ ninja/configure.py 2024-06-20 13:46:12.859665292 -0500 +@@ -23,7 +23,7 @@ + + from optparse import OptionParser + import os +-import pipes ++import shlex + import string + import subprocess + import sys +@@ -264,7 +264,7 @@ + env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) + configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) + if configure_env: +- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) ++ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) + for k in configure_env]) + n.variable('configure_env', config_str + '$ ') + n.newline() +diff --color -Naur swift/utils/build_swift/build_swift/shell.py swift/utils/build_swift/build_swift/shell.py +--- swift/utils/build_swift/build_swift/shell.py 2024-06-20 13:39:16.267680494 -0500 ++++ swift/utils/build_swift/build_swift/shell.py 2024-06-20 13:47:56.850650939 -0500 +@@ -23,7 +23,7 @@ + import sys + from copy import copy as _copy + from pathlib import Path +-from pipes import quote as _quote ++from shlex import quote as _quote + from shlex import split + from subprocess import CalledProcessError + +diff --color -Naur swift/utils/sil-opt-verify-all-modules.py swift/utils/sil-opt-verify-all-modules.py +--- swift/utils/sil-opt-verify-all-modules.py 2024-06-20 13:39:17.951793627 -0500 ++++ swift/utils/sil-opt-verify-all-modules.py 2024-06-20 13:40:50.278995757 -0500 +@@ -13,7 +13,7 @@ + import glob + import multiprocessing + import os +-import pipes ++import shlex + import subprocess + import sys + import tempfile +@@ -91,7 +91,7 @@ + + + def quote_shell_command(args): +- return " ".join([pipes.quote(a) for a in args]) ++ return " ".join([shlex.quote(a) for a in args]) + + + def run_commands_in_parallel(commands): +diff --color -Naur swift/utils/swift_build_support/swift_build_support/build_script_invocation.py swift/utils/swift_build_support/swift_build_support/build_script_invocation.py +--- swift/utils/swift_build_support/swift_build_support/build_script_invocation.py 2024-06-20 13:39:16.270680695 -0500 ++++ swift/utils/swift_build_support/swift_build_support/build_script_invocation.py 2024-06-20 13:41:40.348359192 -0500 +@@ -11,7 +11,7 @@ + # ===---------------------------------------------------------------------===# + + import os +-import pipes ++import shlex + import platform + + from build_swift.build_swift import argparse +@@ -128,9 +128,9 @@ + "--build-jobs", str(args.build_jobs), + "--lit-jobs", str(args.lit_jobs), + "--common-cmake-options=%s" % ' '.join( +- pipes.quote(opt) for opt in cmake.common_options()), ++ shlex.quote(opt) for opt in cmake.common_options()), + "--build-args=%s" % ' '.join( +- pipes.quote(arg) for arg in cmake.build_args()), ++ shlex.quote(arg) for arg in cmake.build_args()), + "--dsymutil-jobs", str(args.dsymutil_jobs), + ] + +@@ -388,7 +388,7 @@ + if args.extra_cmake_options: + impl_args += [ + "--extra-cmake-options=%s" % ' '.join( +- pipes.quote(opt) for opt in args.extra_cmake_options) ++ shlex.quote(opt) for opt in args.extra_cmake_options) + ] + + if args.lto_type is not None: +diff --color -Naur swift/utils/swift_build_support/swift_build_support/shell.py swift/utils/swift_build_support/swift_build_support/shell.py +--- swift/utils/swift_build_support/swift_build_support/shell.py 2024-06-20 13:39:16.271680762 -0500 ++++ swift/utils/swift_build_support/swift_build_support/shell.py 2024-06-20 13:42:02.214828084 -0500 +@@ -14,7 +14,7 @@ + # ---------------------------------------------------------------------------- + + import os +-import pipes ++import shlex + import platform + import shutil + import subprocess +@@ -35,7 +35,7 @@ + + + def _quote(arg): +- return pipes.quote(str(arg)) ++ return shlex.quote(str(arg)) + + + def quote_command(args): diff --git a/sdk_path.patch b/sdk_path.patch deleted file mode 100644 index c2a930e..0000000 --- a/sdk_path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- swift/cmake/modules/AddSwift.cmake.orig 2024-02-15 13:47:44.300541015 -0600 -+++ swift/cmake/modules/AddSwift.cmake 2024-02-15 13:53:44.593670558 -0600 -@@ -543,11 +543,15 @@ - # At build time and run time, link against the swift libraries in the - # installed host toolchain. - if(SWIFT_PATH_TO_SWIFT_SDK) -- set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr") -+ # XYZZY -+ set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr/libexec/swift/5.8.1") - else() - get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY) - get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY) - endif() -+ # XYZZY -+ set(swift_dir "/usr/libexec/swift/5.8.1") -+ # xyzzy - back to original - set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}") - set(host_lib_arch_dir "${host_lib_dir}/${SWIFT_HOST_VARIANT_ARCH}") - diff --git a/sources b/sources index 7319eec..a45c2ce 100644 --- a/sources +++ b/sources @@ -1,39 +1,35 @@ -SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 -SHA512 (cmark.tar.gz) = cb7ffad3ec3fbc74de28df56f4ec5850047abf38ae4a2fdfa37aeacd122c52e3164ef965b582a184911612608df0e450481f9f8c25d11c565518ab39a0d24199 -SHA512 (corelibs-foundation.tar.gz) = e4ff04e1eb742455f52b43f0a3a1725d0c1c132d2192e4779073c7690ff12991c62c20ca0a42b81d2af12b394e4720309a07cd303ba12f22c2f917570ed0ff5d -SHA512 (corelibs-libdispatch.tar.gz) = fa8278adbdfd5b041c89a7b14a17aaa805a6f4db12221ff469288bb8d945fd28f16a8d66f56148aeba2e6be30bd6655fbe375d7843d1cb54407527d998e6d6fa -SHA512 (corelibs-xctest.tar.gz) = 6dad6f84ef5a47a74d25211efc25cc2baa13bf0019145cc96ad4d5ac7ddcf79b60dd775f610d099848e3a7b4856f8bb9c06558f6f971324474ae2e6fa8a7cd4f +SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 +SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d +SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 +SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 +SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 1fc62360a5cd4701da314774b4c5c6a6a9cc2a8d46881962fc80331006c255d173f8ace8d743a09b3fcdbf1e92570248666396a0b78ce8be19eeff65ab6c3235 -SHA512 (llbuild.tar.gz) = 010ac22ff4c6e803a537e6e84b3f6047d74fc35f773fcf51f52f9d1546196ed73ab42ab90d1346a0a74239c4f1d11cd183018f42726df42dc921bf0d2235d850 -SHA512 (llvm-project.tar.gz) = c659041234da1fed29a7186f0e436b0867576096483333d71f11e72828b45e2c7bd9b15db7d3da348a114af48a649f8a484ba3bd4de84d2f5cdb8a7035c5ad30 +SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 +SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 +SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 303e2b02bdc16cfe3a8812e4d5a79de09ef7367a2f0bbca28c55e2f037b0a8dab684bcaa7189dbcc6c6876d21a4e4da2b0956743b99a0b2c7d4a1be415e0df92 -SHA512 (sourcekit-lsp.tar.gz) = 4a2f7c2129a69c05c8d158877efb1538f092f8eb2d1b1194661cb7c6f201330ecf7fd33bb0d06dd595bc6966e19b739d103478db6c9b2a4c2d7ae351bfb398a8 -SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 -SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 -SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 -SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 -SHA512 (swift-collections.tar.gz) = 87309c52e5d2115ce8aedda05f35f40e919b367663d9032a159a31163fda7d0aa78df9049e424bda65fe58c4f2a1c74a784c4c6b485581eef450a022a5a7d700 -SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = d646a4263cade323c2a19f06f1c909e02606b92953b72aa37dc1e49e99199085484d68f90259a821b4e81f2b18de624648db50bde0d8cfd852c291cad39ff282 -SHA512 (swift-docc-symbolkit.tar.gz) = cf7a058aeded8455656fa70443b9e280488391957e9003c85c4166925ec6de74675fe9a61571da5897853626e91e4353d72abc76d71a79f4f32e2e4d5b7f4ed9 -SHA512 (swift-docc.tar.gz) = d72849e583211ff5fef449de2257629b67511476f06724ed798428bd4f5e29224860854bbd262c3d4ae786397704d9589eb2d84a9d4d95f385fba9bc491e208b -SHA512 (swift-driver.tar.gz) = 77ce7412cf2a5077331250b1fa70e56b6300340aef7224089840018519cab46bcc011074478045e4bf30502912a0619a842bc082509145871a3c0f1da14ccde5 -SHA512 (swift-experimental-string-processing.tar.gz) = 89650c6b68ee6a256fadda84e68d7ea4faf3c09859e80bcc270ca36433ed3e652c7139ed868f6f515e3193928a100c99500574eb614dbf97c345cbfefdb245c2 -SHA512 (swift-format.tar.gz) = 2feba9df7b78010ff5c9b6ccf2dfc44a37425410d0733c1ddb4a804310ee75e95c8bf464c9fc2ff1285b20089b0a19a2192e2cf4fa3087028d28e0f83a70d94c -SHA512 (swift-integration-tests.tar.gz) = 52dbcd7a9b509253b6f2df4467ebcf0ade8d941581883fa9edf6461ab308f2e07b80e95aa673155066324802e57397887d01249bf055178e08ca7483c11b2250 -SHA512 (swift-lmdb.tar.gz) = ffbdb5f0efd84b9826c23919a7d4941f6b71ad78a389814e56c2862f441a37484c020aa54e5984076634d5f15c088eeaa84b658f357d4585109c4ca8535ef6cc -SHA512 (swift-markdown.tar.gz) = df4d1f240c0d92b2df9bd48b5cd750402a2f855d2a989d7c3722f3eeeaec067d7562caa38b8ea664114359b9c6bf4f2d5502acd62225e3a5e278bf9525f7d24c +SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 +SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 +SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f +SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f +SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca +SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 +SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 +SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 +SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa +SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 +SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 +SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 +SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 +SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 +SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e -SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-stress-tester.tar.gz) = a0f63b902e7243b455a0e7f60b11e8c0e6448c56a8db39c96fc40bd99a79f2a23147f631b04d79713832bca44403c5cba5b2a8d96eb5bbd4515295a00126290e -SHA512 (swift-syntax.tar.gz) = bbe672aed621915f387fd8c308805208a29d0b830d7a2f84543ea6b8036554205e0db46414a3ea3e2e8e733e49d8b23971acc385fc4c0fac8204e8cdbdc34cd7 -SHA512 (swift-system.tar.gz) = 9cfd32ab5fce445b764ba5fb9f1739776167a3159057338923dab6e74b15e72e3dbaee2d48386113597a36f356e5961b173937f58fd0b95a0ced910bc1672450 -SHA512 (swift-tools-support-core.tar.gz) = d69d2e4e9b1e6c44b97c88b73101f7b66a8adb59275e77ca0e3ededd7bf444285a649855f94e7f8aee7b965b734e9b657eef65671f3ce0c4b0c6971380672e6a -SHA512 (swift-xcode-playground-support.tar.gz) = d1f9a178891c64c3e40cd2ae56a48b8afedeb1981330776a04bddff9b94dcaf09542291bf234e6ed1515e046fa8fced506e7b3c3461bc690ca01a58640222c24 -SHA512 (swift.tar.gz) = 212ede9ba6a874666ceeb30073dd2a9c8b6b08715f375c98b86bee4a78f4a235ad0f1e35ec3d7f9f97c79f963a9d8bd0a6c9737a8c32b073dca828c564145396 -SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 -SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff +SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba +SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e +SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 +SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c +SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 +SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc +SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch deleted file mode 100644 index ece318b..0000000 --- a/strlcpy_issues.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 -+++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 -@@ -189,7 +189,7 @@ - #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) - #endif - --#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 -+#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 - CF_INLINE size_t - strlcpy(char * dst, const char * src, size_t maxlen) { - const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index 483a606..305495f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,32 +6,28 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.10.1-RELEASE -%global fedora_release 1 -%global package_version 5.10.1 +%global swift_version 5.8.1-RELEASE +%global fedora_release 3 +%global package_version 5.8.1 # Set to the right version per the json file %global swift_source_location swift-source %global icu_version 65-1 %global yams_version 5.0.1 -%global swift_argument_parser_version 1.2.3 -%global swift_crypto_version 3.0.0 +%global swift_argument_parser_version 1.0.3 +%global swift_crypto_version 2.2.3 %global ninja_version 1.11.1 -%global cmake_version 3.24.2 -%global swift_atomics_version 1.2.0 -%global swift_collections_version 1.0.5 -%global swift_numerics_version 1.0.2 -%global swift_system_version 1.2.1 +%global cmake_version 3.19.6 +%global swift_atomics_version 1.0.2 +%global swift_collections_version 1.0.1 +%global swift_numerics_version 1.0.1 +%global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 -%global swift_certificates_version 1.0.1 -%global swift_asn1_version 1.0.0 -%global wasmkit_version 0.0.3 -%global wasi_version 20 # Temporary I presume as the json file suggests there should # be eventually a release version of swift-format -%global swift_format_version 510.1.0 +%global swift_format_version 0.50700.1 Name: swift-lang @@ -56,46 +52,44 @@ Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source16: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz -Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz -Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz -Source20: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source21: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz -Source22: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz -Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz -Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz -Source25: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz -Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz -Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz -Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -%dnl Source30: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz -Source30: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz -Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz -Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz +Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz +Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +%dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz -Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz -Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz -Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz -Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz -Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz + +Patch1: uintptr.patch +Patch2: enablelzma.patch +Patch3: fs.patch +Patch4: unusedvars.patch +Patch5: no-test.patch +Patch7: fclose_issues.patch +Patch8: new_glibc.patch +Patch9: no_pipes_58.patch -Patch1: uintptr.patch -Patch2: enablelzma.patch -Patch3: fs.patch -Patch4: unusedvars.patch -Patch5: no-test.patch -Patch6: strlcpy_issues.patch -Patch7: fclose_issues.patch -Patch8: new_glibc.patch -Patch9: swiftrto.patch -Patch10: sdk_path.patch - +%ifarch aarch64 +BuildRequires: clang15 +%else BuildRequires: clang +%endif BuildRequires: swig BuildRequires: rsync BuildRequires: python3 @@ -113,12 +107,9 @@ BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six BuildRequires: binutils-devel -BuildRequires: zlib-devel %if ! 0%{?el8} BuildRequires: python-unversioned-command %endif -# Apparently we need Swift to build Swift (shrug) -BuildRequires: swiftlang Requires: glibc-devel %if 0%{?rhel} && 0%{?rhel} == 8 @@ -148,7 +139,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -185,8 +176,6 @@ mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing -mv swift-certificates-%{swift_certificates_version} swift-certificates -mv swift-asn1-%{swift_asn1_version} swift-asn1 # ICU mv icu-release-%{icu_version} icu @@ -197,57 +186,46 @@ mv Yams-%{yams_version} yams # Ninja mv ninja-%{ninja_version} ninja -# WasmKit -mv WasmKit-%{wasmkit_version} wasmkit - - # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize +# Fix for uinit_ptr not being declared implicitly +%patch -P1 -p0 + # Enable LZMA -%dnl %patch -P2 -p0 +%patch -P2 -p0 # Tests fail for some reason preventing the package from being built -%dnl %patch -P5 -p0 +%patch -P5 -p0 # Issue with >= F39 not liking not having the file object # explicitly forced in an fclose() %if 0%{?fedora} >= 39 -%dnl %patch -P7 -p0 +%patch -P7 -p0 %endif # 39 and later, so this patch modifies the CMakeLists.txt file # to add a check for them, along with a patch to the header # file that if they are present, don't define the functions # seperately. -%dnl %patch -P8 -p0 - -# For finding swiftrt.o in the right place -%dnl %patch -P9 -p0 -%dnl %patch -P10 -p0 +%patch -P8 -p0 +# For 41 and later, python pipes are no longer a thing +%patch -P9 -p0 %build export VERBOSE=1 -# EPEL8 may not have /usr/bin/python, so we -# roll our own because the build script expects there to be one. -%if 0%{?el8} -if [ ! -d $PWD/binforpython ] ; then - mkdir -p $PWD/binforpython - ln -s /usr/bin/python3 $PWD/binforpython/python -fi -export PATH=$PWD/binforpython:$PATH -%endif -# Temp until we figure out a better way to do this - note this -# only works in a container. Also note this is hard-coded to -# 5.8.1 (this is as of 12/8/23) and will eventually be more -# generic (if this continues to be a thing at all) -# -if [ "$(cat /proc/1/sched | head -n 1 | awk '{print $1}')" == "bash" ]; then - ln -s /usr/libexec/swift/5.8.1/lib/swift /usr/lib/swift +# Specific for aarch64 architecture +%ifarch aarch64 +if [ ! -d $PWD/oldclang ] ; then + mkdir -p $PWD/oldclang + ln -s /usr/bin/clang-15 $PWD/oldclang/clang + ln -s /usr/bin/clang++-15 $PWD/oldclang/clang++ fi +export PATH=$PWD/oldclang:$PATH +%endif # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz @@ -285,19 +263,24 @@ export QA_SKIP_RPATHS=1 %changelog -* Thu Jun 06 2024 Ron Olson - 5.10.1-1 -- Updated to Swift 5.10.1-RELEASE - Resolves: rhbz#2239543 -* Tue Apr 23 2024 Ron Olson - 6.0-1 -- First attempt at getting 6.0 working -* Mon Sep 18 2023 Ron Olson - 5.9-1 -- Updated to Swift 5.9-RELEASE - Resolves: rhbz#2239543 -* Fri Sep 15 2023 Ron Olson - 5.10-1 -- First working version of Swift 5.10 -* Wed Mar 29 2023 Ron Olson - 5.9-1 -- Cleanup and first attempt at getting 5.9 going though - 5.8 hasn't been released yet +* Fri Feb 16 2024 Ron Olson 5.8.1-3 +- Added symlink for future versions of Swift +* Tue Aug 22 2023 Ron Olson 5.8.1-2 +- Added patch to work with glibc 2.38 + Resolves: rhbz#2226476 + +* Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 5.8.1-1.1 +- Rebuilt for Python 3.12 + +* Fri Jun 02 2023 Ron Olson - 5.8.1-1 +- Updated to Swift 5.8.1-RELEASE + Resolves: rhbz#2211845 +* Fri Mar 31 2023 Ron Olson - 5.8-1 +- Updated to Swift 5.8-RELEASE + Resolves: rhbz#2183429 * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson - 5.8-1 diff --git a/swiftrto.patch b/swiftrto.patch deleted file mode 100644 index 3dcfd78..0000000 --- a/swiftrto.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- swift/lib/Driver/UnixToolChains.cpp.orig 2023-12-21 20:05:01.595459343 -0600 -+++ swift/lib/Driver/UnixToolChains.cpp 2023-12-21 20:06:27.482394420 -0600 -@@ -281,6 +281,9 @@ - llvm::sys::path::append(swiftrtPath, - swift::getMajorArchitectureName(getTriple())); - llvm::sys::path::append(swiftrtPath, "swiftrt.o"); -+ //Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); -+ // XYZZY -+ swiftrtPath = "/usr/libexec/swift/5.8.1/lib/swift/linux/x86_64/swiftrt.o"; - Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); - - addPrimaryInputsOfType(Arguments, context.Inputs, context.Args, From f5f35a0448111b2765b32c5d88c2ebcd4c2621de Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 20 Jun 2024 14:28:49 -0500 Subject: [PATCH 122/152] Updated build version --- swift-lang.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 305495f..b6f9215 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.8.1-RELEASE -%global fedora_release 3 +%global fedora_release 4 %global package_version 5.8.1 # Set to the right version per the json file @@ -263,6 +263,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Jun 20 2024 Ron Olson 5.8.1-4 +- Added patch to build without pipes on Rawhide and Fedora 41 * Fri Feb 16 2024 Ron Olson 5.8.1-3 - Added symlink for future versions of Swift * Tue Aug 22 2023 Ron Olson 5.8.1-2 From 0bcf790b6933cc60a4a623d47f609d982129397d Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 21 Jun 2024 21:18:39 -0500 Subject: [PATCH 123/152] Additional fix for Python 3.13 --- cython_updates.patch | 32 ++++++++++++++++++++++++++++++++ swift-lang.spec | 20 +++++++++++--------- 2 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 cython_updates.patch diff --git a/cython_updates.patch b/cython_updates.patch new file mode 100644 index 0000000..e3dc9c4 --- /dev/null +++ b/cython_updates.patch @@ -0,0 +1,32 @@ +diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +--- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-06-21 17:13:30.216450095 -0500 ++++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-06-21 17:17:12.418191122 -0500 +@@ -76,7 +76,7 @@ + #elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7 + return _Py_Finalizing != nullptr; + #else +- return _Py_IsFinalizing(); ++ return Py_IsFinalizing(); + #endif + } + +diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +--- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-06-21 17:13:30.217450161 -0500 ++++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-06-21 17:18:29.299291469 -0500 +@@ -201,16 +201,6 @@ + return; + #endif + +- if (PyEval_ThreadsInitialized()) { +- Log *log = GetLog(LLDBLog::Script); +- +- m_was_already_initialized = true; +- m_gil_state = PyGILState_Ensure(); +- LLDB_LOGV(log, "Ensured PyGILState. Previous state = {0}locked\n", +- m_gil_state == PyGILState_UNLOCKED ? "un" : ""); +- return; +- } +- + // InitThreads acquires the GIL if it hasn't been called before. + PyEval_InitThreads(); + } diff --git a/swift-lang.spec b/swift-lang.spec index b6f9215..e5699e4 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.8.1-RELEASE -%global fedora_release 4 +%global fedora_release 5 %global package_version 5.8.1 # Set to the right version per the json file @@ -83,6 +83,7 @@ Patch5: no-test.patch Patch7: fclose_issues.patch Patch8: new_glibc.patch Patch9: no_pipes_58.patch +Patch10: cython_updates.patch %ifarch aarch64 @@ -106,20 +107,17 @@ BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six -BuildRequires: binutils-devel +BuildRequires: binutils-devel %if ! 0%{?el8} -BuildRequires: python-unversioned-command +BuildRequires: python-unversioned-command %endif +BuildRequires: binutils-gold Requires: glibc-devel -%if 0%{?rhel} && 0%{?rhel} == 8 -Requires: binutils -%else -Requires: binutils-gold -%endif +Requires: binutils-gold Requires: gcc Requires: ncurses-devel -Requires: lldb +Requires: lldb ExclusiveArch: x86_64 aarch64 @@ -213,6 +211,8 @@ mv ninja-%{ninja_version} ninja # For 41 and later, python pipes are no longer a thing %patch -P9 -p0 +# For 41 and later, some additional old parts removed +%patch -P10 -p0 %build export VERBOSE=1 @@ -263,6 +263,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Jun 21 2024 Ron Olson 5.8.1-5 +- Added another patch * Thu Jun 20 2024 Ron Olson 5.8.1-4 - Added patch to build without pipes on Rawhide and Fedora 41 * Fri Feb 16 2024 Ron Olson 5.8.1-3 From 5e271f76c9e53c9934f9daea548808ce547a241f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 24 Jun 2024 07:21:05 -0500 Subject: [PATCH 124/152] Added patches to allow Swift to build with >= 41 and Python 3.13 --- cython_updates.patch | 32 ----- enablelzma.patch | 10 +- fclose_issues.patch | 8 +- no_pipes_510.patch | 143 +++++++++++++++++++++++ no_pipes_58.patch | 270 ------------------------------------------- sdk_path.patch | 19 +++ sources | 64 +++++----- strlcpy_issues.patch | 11 ++ swift-lang.spec | 174 ++++++++++++++-------------- swiftrto.patch | 12 ++ 10 files changed, 317 insertions(+), 426 deletions(-) delete mode 100644 cython_updates.patch create mode 100644 no_pipes_510.patch delete mode 100644 no_pipes_58.patch create mode 100644 sdk_path.patch create mode 100644 strlcpy_issues.patch create mode 100644 swiftrto.patch diff --git a/cython_updates.patch b/cython_updates.patch deleted file mode 100644 index e3dc9c4..0000000 --- a/cython_updates.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp ---- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-06-21 17:13:30.216450095 -0500 -+++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-06-21 17:17:12.418191122 -0500 -@@ -76,7 +76,7 @@ - #elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7 - return _Py_Finalizing != nullptr; - #else -- return _Py_IsFinalizing(); -+ return Py_IsFinalizing(); - #endif - } - -diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ---- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-06-21 17:13:30.217450161 -0500 -+++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-06-21 17:18:29.299291469 -0500 -@@ -201,16 +201,6 @@ - return; - #endif - -- if (PyEval_ThreadsInitialized()) { -- Log *log = GetLog(LLDBLog::Script); -- -- m_was_already_initialized = true; -- m_gil_state = PyGILState_Ensure(); -- LLDB_LOGV(log, "Ensured PyGILState. Previous state = {0}locked\n", -- m_gil_state == PyGILState_UNLOCKED ? "un" : ""); -- return; -- } -- - // InitThreads acquires the GIL if it hasn't been called before. - PyEval_InitThreads(); - } diff --git a/enablelzma.patch b/enablelzma.patch index 5371a21..7d6f831 100644 --- a/enablelzma.patch +++ b/enablelzma.patch @@ -1,11 +1,11 @@ ---- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 -+++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 -@@ -2272,7 +2272,7 @@ +--- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 ++++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 +@@ -2209,7 +2209,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON - -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LZMA=ON -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) - -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" + -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" + -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" diff --git a/fclose_issues.patch b/fclose_issues.patch index 4625dd8..8582684 100644 --- a/fclose_issues.patch +++ b/fclose_issues.patch @@ -1,6 +1,6 @@ ---- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2024-06-07 15:57:58.282574272 -0500 -+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2024-06-07 16:00:41.442339293 -0500 -@@ -425,19 +425,19 @@ +--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-12-12 21:00:36.129189000 +0000 ++++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-12-12 21:04:32.274597013 +0000 +@@ -495,19 +495,19 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -23,7 +23,7 @@ if errno != 0 { throw FileSystemError(.ioError(code: errno), path) } -@@ -455,12 +455,12 @@ +@@ -525,12 +525,12 @@ if fp == nil { throw FileSystemError(errno: errno, path) } diff --git a/no_pipes_510.patch b/no_pipes_510.patch new file mode 100644 index 0000000..9ee3b69 --- /dev/null +++ b/no_pipes_510.patch @@ -0,0 +1,143 @@ +diff -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py +--- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-22 14:58:04.110536250 +0000 ++++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-22 15:00:07.092158770 +0000 +@@ -14,7 +14,6 @@ + import stat + import sys + import subprocess +-import pipes + import shlex + import tempfile + import shutil +@@ -57,7 +56,7 @@ + sys.exit("ERROR: `%s` not found in %s" % (cmd_name, cmd_dir)) + + def quote_cmd(cmd): +- return ' '.join(pipes.quote(arg) for arg in cmd) ++ return ' '.join(shlex.quote(arg) for arg in cmd) + + def write_to_script(text, filename): + with open(filename, 'w') as f: +@@ -199,7 +198,7 @@ + """ % (disable_symbolization, quote_cmd(self.get_crash_cmd())) + + for msg in self.expected_output: +- output += 'grep -F %s t.log || exit 1\n' % pipes.quote(msg) ++ output += 'grep -F %s t.log || exit 1\n' % shlex.quote(msg) + + write_to_script(output, self.testfile) + self.check_interestingness() +diff -Naur llvm-project/compiler-rt/test/asan/lit.cfg.py llvm-project/compiler-rt/test/asan/lit.cfg.py +--- llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-22 14:57:36.667612165 +0000 ++++ llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-22 15:00:52.711357235 +0000 +@@ -6,14 +6,8 @@ + + import lit.formats + +-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if +-# it's not available. +-try: +- import shlex +- sh_quote = shlex.quote +-except: +- import pipes +- sh_quote = pipes.quote ++import shlex ++sh_quote = shlex.quote + + def get_required_attr(config, attr_name): + attr_value = getattr(config, attr_name, None) +diff -Naur llvm-project/compiler-rt/test/lit.common.cfg.py llvm-project/compiler-rt/test/lit.common.cfg.py +--- llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-22 14:57:34.532462464 +0000 ++++ llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-22 15:01:12.357734687 +0000 +@@ -12,14 +12,8 @@ + import lit.formats + import lit.util + +-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if +-# it's not available. +-try: +- import shlex +- sh_quote = shlex.quote +-except: +- import pipes +- sh_quote = pipes.quote ++import shlex ++sh_quote = shlex.quote + + def find_compiler_libdir(): + """ +diff -Naur llvm-project/compiler-rt/test/memprof/lit.cfg.py llvm-project/compiler-rt/test/memprof/lit.cfg.py +--- llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-22 14:57:36.734616862 +0000 ++++ llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-22 15:01:32.172123921 +0000 +@@ -6,14 +6,8 @@ + + import lit.formats + +-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if +-# it's not available. +-try: +- import shlex +- sh_quote = shlex.quote +-except: +- import pipes +- sh_quote = pipes.quote ++import shlex ++sh_quote = shlex.quote + + def get_required_attr(config, attr_name): + attr_value = getattr(config, attr_name, None) +diff -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py +--- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-22 14:57:57.291058121 +0000 ++++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-22 15:01:55.698773427 +0000 +@@ -8,7 +8,7 @@ + + import os + import pickle +-import pipes ++import shlex + import platform + import re + import shutil +@@ -261,7 +261,7 @@ + } + #endif + """ +- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales]) ++ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales]) + + @_memoizeExpensiveOperation(lambda c, flags='': (c.substitutions, c.environment, flags)) + def compilerMacros(config, flags=''): +diff -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py +--- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-22 14:57:57.292058191 +0000 ++++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-22 15:02:11.564885834 +0000 +@@ -9,7 +9,7 @@ + import lit + import lit.formats + import os +-import pipes ++import shlex + import re + import shutil + +diff -Naur ninja/configure.py ninja/configure.py +--- ninja/configure.py 2024-06-22 14:57:34.179437713 +0000 ++++ ninja/configure.py 2024-06-22 14:59:43.507505194 +0000 +@@ -23,7 +23,7 @@ + + from optparse import OptionParser + import os +-import pipes ++import shlex + import string + import subprocess + import sys +@@ -264,7 +264,7 @@ + env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) + configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) + if configure_env: +- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) ++ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) + for k in configure_env]) + n.variable('configure_env', config_str + '$ ') + n.newline() diff --git a/no_pipes_58.patch b/no_pipes_58.patch deleted file mode 100644 index 49f2754..0000000 --- a/no_pipes_58.patch +++ /dev/null @@ -1,270 +0,0 @@ -diff --color -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py ---- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-20 13:38:53.943180833 -0500 -+++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-20 13:42:30.244711005 -0500 -@@ -14,7 +14,6 @@ - import stat - import sys - import subprocess --import pipes - import shlex - import tempfile - import shutil -@@ -57,7 +56,7 @@ - sys.exit("ERROR: `%s` not found in %s" % (cmd_name, cmd_dir)) - - def quote_cmd(cmd): -- return ' '.join(pipes.quote(arg) for arg in cmd) -+ return ' '.join(shlex.quote(arg) for arg in cmd) - - def write_to_script(text, filename): - with open(filename, 'w') as f: -@@ -199,7 +198,7 @@ - """ % (disable_symbolization, quote_cmd(self.get_crash_cmd())) - - for msg in self.expected_output: -- output += 'grep -F %s t.log || exit 1\n' % pipes.quote(msg) -+ output += 'grep -F %s t.log || exit 1\n' % shlex.quote(msg) - - write_to_script(output, self.testfile) - self.check_interestingness() -diff --color -Naur llvm-project/compiler-rt/test/asan/lit.cfg.py llvm-project/compiler-rt/test/asan/lit.cfg.py ---- llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-20 13:38:17.808753484 -0500 -+++ llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-20 13:43:18.446949016 -0500 -@@ -6,14 +6,8 @@ - - import lit.formats - --# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if --# it's not available. --try: -- import shlex -- sh_quote = shlex.quote --except: -- import pipes -- sh_quote = pipes.quote -+import shlex -+sh_quote = shlex.quote - - def get_required_attr(config, attr_name): - attr_value = getattr(config, attr_name, None) -diff --color -Naur llvm-project/compiler-rt/test/lit.common.cfg.py llvm-project/compiler-rt/test/lit.common.cfg.py ---- llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-20 13:38:17.788752141 -0500 -+++ llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-20 13:43:44.961730162 -0500 -@@ -12,14 +12,8 @@ - import lit.formats - import lit.util - --# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if --# it's not available. --try: -- import shlex -- sh_quote = shlex.quote --except: -- import pipes -- sh_quote = pipes.quote -+import shlex -+sh_quote = shlex.quote - - def find_compiler_libdir(): - """ -diff --color -Naur llvm-project/compiler-rt/test/memprof/lit.cfg.py llvm-project/compiler-rt/test/memprof/lit.cfg.py ---- llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-20 13:38:17.852756440 -0500 -+++ llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-20 13:44:09.179356996 -0500 -@@ -6,14 +6,8 @@ - - import lit.formats - --# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if --# it's not available. --try: -- import shlex -- sh_quote = shlex.quote --except: -- import pipes -- sh_quote = pipes.quote -+import shlex -+sh_quote = shlex.quote - - def get_required_attr(config, attr_name): - attr_value = getattr(config, attr_name, None) -diff --color -Naur llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py ---- llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py 2024-06-20 13:38:17.946762755 -0500 -+++ llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py 2024-06-20 13:48:37.348371396 -0500 -@@ -1,6 +1,6 @@ - #!/usr/bin/env python3 - --import glob, os, pipes, sys, subprocess -+import glob, os, shlex, sys, subprocess - - - device_id = os.environ.get('SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER') -@@ -39,7 +39,7 @@ - rm_args.append(arg) - else: - # FIXME(dliew): pipes.quote() is deprecated -- rm_args.append(pipes.quote(arg)) -+ rm_args.append(shlex.quote(arg)) - rm_cmd_line = ["/bin/rm"] + rm_args - rm_cmd_line_str = ' '.join(rm_cmd_line) - # We use `shell=True` so that any wildcard globs get expanded by the shell. -diff --color -Naur llvm-project/libcxx/utils/libcxx/test/config.py llvm-project/libcxx/utils/libcxx/test/config.py ---- llvm-project/libcxx/utils/libcxx/test/config.py 2024-06-20 13:38:59.394547032 -0500 -+++ llvm-project/libcxx/utils/libcxx/test/config.py 2024-06-20 13:45:49.931125052 -0500 -@@ -9,7 +9,6 @@ - import copy - import os - import pkgutil --import pipes - import platform - import re - import shlex -@@ -434,7 +433,7 @@ - def quote(self, s): - if platform.system() == 'Windows': - return lit.TestRunner.quote_windows_command([s]) -- return pipes.quote(s) -+ return shlex.quote(s) - - def configure_substitutions(self): - sub = self.config.substitutions -diff --color -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py ---- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-20 13:38:59.394547032 -0500 -+++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-20 13:45:11.318531231 -0500 -@@ -8,7 +8,7 @@ - - import os - import pickle --import pipes -+import shlex - import platform - import re - import shutil -@@ -261,7 +261,7 @@ - } - #endif - """ -- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales]) -+ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales]) - - @_memoizeExpensiveOperation(lambda c, flags='': (c.substitutions, c.environment, flags)) - def compilerMacros(config, flags=''): -diff --color -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py ---- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-20 13:38:59.394547032 -0500 -+++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-20 13:45:31.689899688 -0500 -@@ -9,7 +9,7 @@ - import lit - import lit.formats - import os --import pipes -+import shlex - import re - import shutil - -diff --color -Naur ninja/configure.py ninja/configure.py ---- ninja/configure.py 2024-06-20 13:38:14.957561954 -0500 -+++ ninja/configure.py 2024-06-20 13:46:12.859665292 -0500 -@@ -23,7 +23,7 @@ - - from optparse import OptionParser - import os --import pipes -+import shlex - import string - import subprocess - import sys -@@ -264,7 +264,7 @@ - env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) - configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) - if configure_env: -- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) -+ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) - for k in configure_env]) - n.variable('configure_env', config_str + '$ ') - n.newline() -diff --color -Naur swift/utils/build_swift/build_swift/shell.py swift/utils/build_swift/build_swift/shell.py ---- swift/utils/build_swift/build_swift/shell.py 2024-06-20 13:39:16.267680494 -0500 -+++ swift/utils/build_swift/build_swift/shell.py 2024-06-20 13:47:56.850650939 -0500 -@@ -23,7 +23,7 @@ - import sys - from copy import copy as _copy - from pathlib import Path --from pipes import quote as _quote -+from shlex import quote as _quote - from shlex import split - from subprocess import CalledProcessError - -diff --color -Naur swift/utils/sil-opt-verify-all-modules.py swift/utils/sil-opt-verify-all-modules.py ---- swift/utils/sil-opt-verify-all-modules.py 2024-06-20 13:39:17.951793627 -0500 -+++ swift/utils/sil-opt-verify-all-modules.py 2024-06-20 13:40:50.278995757 -0500 -@@ -13,7 +13,7 @@ - import glob - import multiprocessing - import os --import pipes -+import shlex - import subprocess - import sys - import tempfile -@@ -91,7 +91,7 @@ - - - def quote_shell_command(args): -- return " ".join([pipes.quote(a) for a in args]) -+ return " ".join([shlex.quote(a) for a in args]) - - - def run_commands_in_parallel(commands): -diff --color -Naur swift/utils/swift_build_support/swift_build_support/build_script_invocation.py swift/utils/swift_build_support/swift_build_support/build_script_invocation.py ---- swift/utils/swift_build_support/swift_build_support/build_script_invocation.py 2024-06-20 13:39:16.270680695 -0500 -+++ swift/utils/swift_build_support/swift_build_support/build_script_invocation.py 2024-06-20 13:41:40.348359192 -0500 -@@ -11,7 +11,7 @@ - # ===---------------------------------------------------------------------===# - - import os --import pipes -+import shlex - import platform - - from build_swift.build_swift import argparse -@@ -128,9 +128,9 @@ - "--build-jobs", str(args.build_jobs), - "--lit-jobs", str(args.lit_jobs), - "--common-cmake-options=%s" % ' '.join( -- pipes.quote(opt) for opt in cmake.common_options()), -+ shlex.quote(opt) for opt in cmake.common_options()), - "--build-args=%s" % ' '.join( -- pipes.quote(arg) for arg in cmake.build_args()), -+ shlex.quote(arg) for arg in cmake.build_args()), - "--dsymutil-jobs", str(args.dsymutil_jobs), - ] - -@@ -388,7 +388,7 @@ - if args.extra_cmake_options: - impl_args += [ - "--extra-cmake-options=%s" % ' '.join( -- pipes.quote(opt) for opt in args.extra_cmake_options) -+ shlex.quote(opt) for opt in args.extra_cmake_options) - ] - - if args.lto_type is not None: -diff --color -Naur swift/utils/swift_build_support/swift_build_support/shell.py swift/utils/swift_build_support/swift_build_support/shell.py ---- swift/utils/swift_build_support/swift_build_support/shell.py 2024-06-20 13:39:16.271680762 -0500 -+++ swift/utils/swift_build_support/swift_build_support/shell.py 2024-06-20 13:42:02.214828084 -0500 -@@ -14,7 +14,7 @@ - # ---------------------------------------------------------------------------- - - import os --import pipes -+import shlex - import platform - import shutil - import subprocess -@@ -35,7 +35,7 @@ - - - def _quote(arg): -- return pipes.quote(str(arg)) -+ return shlex.quote(str(arg)) - - - def quote_command(args): diff --git a/sdk_path.patch b/sdk_path.patch new file mode 100644 index 0000000..c2a930e --- /dev/null +++ b/sdk_path.patch @@ -0,0 +1,19 @@ +--- swift/cmake/modules/AddSwift.cmake.orig 2024-02-15 13:47:44.300541015 -0600 ++++ swift/cmake/modules/AddSwift.cmake 2024-02-15 13:53:44.593670558 -0600 +@@ -543,11 +543,15 @@ + # At build time and run time, link against the swift libraries in the + # installed host toolchain. + if(SWIFT_PATH_TO_SWIFT_SDK) +- set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr") ++ # XYZZY ++ set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr/libexec/swift/5.8.1") + else() + get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY) + get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY) + endif() ++ # XYZZY ++ set(swift_dir "/usr/libexec/swift/5.8.1") ++ # xyzzy - back to original + set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}") + set(host_lib_arch_dir "${host_lib_dir}/${SWIFT_HOST_VARIANT_ARCH}") + diff --git a/sources b/sources index a45c2ce..7319eec 100644 --- a/sources +++ b/sources @@ -1,35 +1,39 @@ -SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d -SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 -SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 -SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 +SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 +SHA512 (cmark.tar.gz) = cb7ffad3ec3fbc74de28df56f4ec5850047abf38ae4a2fdfa37aeacd122c52e3164ef965b582a184911612608df0e450481f9f8c25d11c565518ab39a0d24199 +SHA512 (corelibs-foundation.tar.gz) = e4ff04e1eb742455f52b43f0a3a1725d0c1c132d2192e4779073c7690ff12991c62c20ca0a42b81d2af12b394e4720309a07cd303ba12f22c2f917570ed0ff5d +SHA512 (corelibs-libdispatch.tar.gz) = fa8278adbdfd5b041c89a7b14a17aaa805a6f4db12221ff469288bb8d945fd28f16a8d66f56148aeba2e6be30bd6655fbe375d7843d1cb54407527d998e6d6fa +SHA512 (corelibs-xctest.tar.gz) = 6dad6f84ef5a47a74d25211efc25cc2baa13bf0019145cc96ad4d5ac7ddcf79b60dd775f610d099848e3a7b4856f8bb9c06558f6f971324474ae2e6fa8a7cd4f SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 -SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 -SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 +SHA512 (indexstore-db.tar.gz) = 1fc62360a5cd4701da314774b4c5c6a6a9cc2a8d46881962fc80331006c255d173f8ace8d743a09b3fcdbf1e92570248666396a0b78ce8be19eeff65ab6c3235 +SHA512 (llbuild.tar.gz) = 010ac22ff4c6e803a537e6e84b3f6047d74fc35f773fcf51f52f9d1546196ed73ab42ab90d1346a0a74239c4f1d11cd183018f42726df42dc921bf0d2235d850 +SHA512 (llvm-project.tar.gz) = c659041234da1fed29a7186f0e436b0867576096483333d71f11e72828b45e2c7bd9b15db7d3da348a114af48a649f8a484ba3bd4de84d2f5cdb8a7035c5ad30 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 -SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 -SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f -SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 -SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 -SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 -SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa -SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 -SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 -SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 -SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 -SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 -SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 +SHA512 (package-manager.tar.gz) = 303e2b02bdc16cfe3a8812e4d5a79de09ef7367a2f0bbca28c55e2f037b0a8dab684bcaa7189dbcc6c6876d21a4e4da2b0956743b99a0b2c7d4a1be415e0df92 +SHA512 (sourcekit-lsp.tar.gz) = 4a2f7c2129a69c05c8d158877efb1538f092f8eb2d1b1194661cb7c6f201330ecf7fd33bb0d06dd595bc6966e19b739d103478db6c9b2a4c2d7ae351bfb398a8 +SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 +SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 +SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 +SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 +SHA512 (swift-collections.tar.gz) = 87309c52e5d2115ce8aedda05f35f40e919b367663d9032a159a31163fda7d0aa78df9049e424bda65fe58c4f2a1c74a784c4c6b485581eef450a022a5a7d700 +SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f +SHA512 (swift-docc-render-artifact.tar.gz) = d646a4263cade323c2a19f06f1c909e02606b92953b72aa37dc1e49e99199085484d68f90259a821b4e81f2b18de624648db50bde0d8cfd852c291cad39ff282 +SHA512 (swift-docc-symbolkit.tar.gz) = cf7a058aeded8455656fa70443b9e280488391957e9003c85c4166925ec6de74675fe9a61571da5897853626e91e4353d72abc76d71a79f4f32e2e4d5b7f4ed9 +SHA512 (swift-docc.tar.gz) = d72849e583211ff5fef449de2257629b67511476f06724ed798428bd4f5e29224860854bbd262c3d4ae786397704d9589eb2d84a9d4d95f385fba9bc491e208b +SHA512 (swift-driver.tar.gz) = 77ce7412cf2a5077331250b1fa70e56b6300340aef7224089840018519cab46bcc011074478045e4bf30502912a0619a842bc082509145871a3c0f1da14ccde5 +SHA512 (swift-experimental-string-processing.tar.gz) = 89650c6b68ee6a256fadda84e68d7ea4faf3c09859e80bcc270ca36433ed3e652c7139ed868f6f515e3193928a100c99500574eb614dbf97c345cbfefdb245c2 +SHA512 (swift-format.tar.gz) = 2feba9df7b78010ff5c9b6ccf2dfc44a37425410d0733c1ddb4a804310ee75e95c8bf464c9fc2ff1285b20089b0a19a2192e2cf4fa3087028d28e0f83a70d94c +SHA512 (swift-integration-tests.tar.gz) = 52dbcd7a9b509253b6f2df4467ebcf0ade8d941581883fa9edf6461ab308f2e07b80e95aa673155066324802e57397887d01249bf055178e08ca7483c11b2250 +SHA512 (swift-lmdb.tar.gz) = ffbdb5f0efd84b9826c23919a7d4941f6b71ad78a389814e56c2862f441a37484c020aa54e5984076634d5f15c088eeaa84b658f357d4585109c4ca8535ef6cc +SHA512 (swift-markdown.tar.gz) = df4d1f240c0d92b2df9bd48b5cd750402a2f855d2a989d7c3722f3eeeaec067d7562caa38b8ea664114359b9c6bf4f2d5502acd62225e3a5e278bf9525f7d24c SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e -SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e -SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 -SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 -SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc -SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d +SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a +SHA512 (swift-stress-tester.tar.gz) = a0f63b902e7243b455a0e7f60b11e8c0e6448c56a8db39c96fc40bd99a79f2a23147f631b04d79713832bca44403c5cba5b2a8d96eb5bbd4515295a00126290e +SHA512 (swift-syntax.tar.gz) = bbe672aed621915f387fd8c308805208a29d0b830d7a2f84543ea6b8036554205e0db46414a3ea3e2e8e733e49d8b23971acc385fc4c0fac8204e8cdbdc34cd7 +SHA512 (swift-system.tar.gz) = 9cfd32ab5fce445b764ba5fb9f1739776167a3159057338923dab6e74b15e72e3dbaee2d48386113597a36f356e5961b173937f58fd0b95a0ced910bc1672450 +SHA512 (swift-tools-support-core.tar.gz) = d69d2e4e9b1e6c44b97c88b73101f7b66a8adb59275e77ca0e3ededd7bf444285a649855f94e7f8aee7b965b734e9b657eef65671f3ce0c4b0c6971380672e6a +SHA512 (swift-xcode-playground-support.tar.gz) = d1f9a178891c64c3e40cd2ae56a48b8afedeb1981330776a04bddff9b94dcaf09542291bf234e6ed1515e046fa8fced506e7b3c3461bc690ca01a58640222c24 +SHA512 (swift.tar.gz) = 212ede9ba6a874666ceeb30073dd2a9c8b6b08715f375c98b86bee4a78f4a235ad0f1e35ec3d7f9f97c79f963a9d8bd0a6c9737a8c32b073dca828c564145396 +SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 +SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch new file mode 100644 index 0000000..ece318b --- /dev/null +++ b/strlcpy_issues.patch @@ -0,0 +1,11 @@ +--- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 ++++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 +@@ -189,7 +189,7 @@ + #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) + #endif + +-#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 ++#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 + CF_INLINE size_t + strlcpy(char * dst, const char * src, size_t maxlen) { + const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index e5699e4..fc35b6d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,28 +6,32 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.8.1-RELEASE -%global fedora_release 5 -%global package_version 5.8.1 +%global swift_version 5.10.1-RELEASE +%global fedora_release 2 +%global package_version 5.10.1 # Set to the right version per the json file %global swift_source_location swift-source %global icu_version 65-1 %global yams_version 5.0.1 -%global swift_argument_parser_version 1.0.3 -%global swift_crypto_version 2.2.3 +%global swift_argument_parser_version 1.2.3 +%global swift_crypto_version 3.0.0 %global ninja_version 1.11.1 -%global cmake_version 3.19.6 -%global swift_atomics_version 1.0.2 -%global swift_collections_version 1.0.1 -%global swift_numerics_version 1.0.1 -%global swift_system_version 1.1.1 +%global cmake_version 3.24.2 +%global swift_atomics_version 1.2.0 +%global swift_collections_version 1.0.5 +%global swift_numerics_version 1.0.2 +%global swift_system_version 1.2.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 +%global swift_certificates_version 1.0.1 +%global swift_asn1_version 1.0.0 +%global wasmkit_version 0.0.3 +%global wasi_version 20 # Temporary I presume as the json file suggests there should # be eventually a release version of swift-format -%global swift_format_version 0.50700.1 +%global swift_format_version 510.1.0 Name: swift-lang @@ -52,45 +56,51 @@ Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz -Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz -Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz -Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz -Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz -Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz -Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz -Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz -Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz -Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz -Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -%dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz -Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz -Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz -Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +Source15: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz +Source16: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz +Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz +Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz +Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz +Source20: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz +Source21: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz +Source22: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz +Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz +Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz +Source25: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz +Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz +Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz +Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz +Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +%dnl Source30: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source30: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz +Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz +Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz +Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz +Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz +Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz + Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch Patch5: no-test.patch +Patch6: strlcpy_issues.patch Patch7: fclose_issues.patch Patch8: new_glibc.patch -Patch9: no_pipes_58.patch -Patch10: cython_updates.patch +Patch9: swiftrto.patch +Patch10: sdk_path.patch +Patch11: no_pipes_510.patch - -%ifarch aarch64 -BuildRequires: clang15 -%else -BuildRequires: clang +%if 0%{?fedora} >= 41 +BuildRequires: python3.11 +BuildRequires: python3.11-devel %endif +BuildRequires: clang BuildRequires: swig BuildRequires: rsync BuildRequires: python3 @@ -107,10 +117,13 @@ BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: perl-podlators BuildRequires: python3-six -BuildRequires: binutils-devel +BuildRequires: binutils-devel +BuildRequires: zlib-devel %if ! 0%{?el8} -BuildRequires: python-unversioned-command +BuildRequires: python-unversioned-command %endif +# After 5.8, Swift is needed to build Swift +BuildRequires: swiftlang BuildRequires: binutils-gold Requires: glibc-devel @@ -137,7 +150,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -174,6 +187,8 @@ mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing +mv swift-certificates-%{swift_certificates_version} swift-certificates +mv swift-asn1-%{swift_asn1_version} swift-asn1 # ICU mv icu-release-%{icu_version} icu @@ -184,49 +199,45 @@ mv Yams-%{yams_version} yams # Ninja mv ninja-%{ninja_version} ninja +# WasmKit +mv WasmKit-%{wasmkit_version} wasmkit + + # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Fix for uinit_ptr not being declared implicitly -%patch -P1 -p0 - # Enable LZMA -%patch -P2 -p0 +%dnl %patch -P2 -p0 # Tests fail for some reason preventing the package from being built -%patch -P5 -p0 +%dnl %patch -P5 -p0 # Issue with >= F39 not liking not having the file object # explicitly forced in an fclose() %if 0%{?fedora} >= 39 -%patch -P7 -p0 +%dnl %patch -P7 -p0 %endif # 39 and later, so this patch modifies the CMakeLists.txt file # to add a check for them, along with a patch to the header # file that if they are present, don't define the functions # seperately. -%patch -P8 -p0 +%dnl %patch -P8 -p0 + +# For finding swiftrt.o in the right place +%dnl %patch -P9 -p0 +%dnl %patch -P10 -p0 + +# Python got a big update in F41 and we need to adjust for it +%if 0%{?fedora} >= 41 +%patch -P11 -p0 +%endif -# For 41 and later, python pipes are no longer a thing -%patch -P9 -p0 -# For 41 and later, some additional old parts removed -%patch -P10 -p0 %build export VERBOSE=1 -# Specific for aarch64 architecture -%ifarch aarch64 -if [ ! -d $PWD/oldclang ] ; then - mkdir -p $PWD/oldclang - ln -s /usr/bin/clang-15 $PWD/oldclang/clang - ln -s /usr/bin/clang++-15 $PWD/oldclang/clang++ -fi -export PATH=$PWD/oldclang:$PATH -%endif - # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz @@ -263,28 +274,21 @@ export QA_SKIP_RPATHS=1 %changelog -* Fri Jun 21 2024 Ron Olson 5.8.1-5 -- Added another patch -* Thu Jun 20 2024 Ron Olson 5.8.1-4 -- Added patch to build without pipes on Rawhide and Fedora 41 -* Fri Feb 16 2024 Ron Olson 5.8.1-3 -- Added symlink for future versions of Swift -* Tue Aug 22 2023 Ron Olson 5.8.1-2 -- Added patch to work with glibc 2.38 - Resolves: rhbz#2226476 - -* Sat Jul 22 2023 Fedora Release Engineering - 5.8.1-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 5.8.1-1.1 -- Rebuilt for Python 3.12 - -* Fri Jun 02 2023 Ron Olson - 5.8.1-1 -- Updated to Swift 5.8.1-RELEASE - Resolves: rhbz#2211845 -* Fri Mar 31 2023 Ron Olson - 5.8-1 -- Updated to Swift 5.8-RELEASE - Resolves: rhbz#2183429 +* Sat Jun 22 2024 Ron Olson - 5.10.1-2 +- Changes for Fedora >= 41 and Python 3.13 +* Thu Jun 06 2024 Ron Olson - 5.10.1-1 +- Updated to Swift 5.10.1-RELEASE + Resolves: rhbz#2239543 +* Tue Apr 23 2024 Ron Olson - 6.0-1 +- First attempt at getting 6.0 working +* Mon Sep 18 2023 Ron Olson - 5.9-1 +- Updated to Swift 5.9-RELEASE + Resolves: rhbz#2239543 +* Fri Sep 15 2023 Ron Olson - 5.10-1 +- First working version of Swift 5.10 +* Wed Mar 29 2023 Ron Olson - 5.9-1 +- Cleanup and first attempt at getting 5.9 going though + 5.8 hasn't been released yet * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson - 5.8-1 diff --git a/swiftrto.patch b/swiftrto.patch new file mode 100644 index 0000000..3dcfd78 --- /dev/null +++ b/swiftrto.patch @@ -0,0 +1,12 @@ +--- swift/lib/Driver/UnixToolChains.cpp.orig 2023-12-21 20:05:01.595459343 -0600 ++++ swift/lib/Driver/UnixToolChains.cpp 2023-12-21 20:06:27.482394420 -0600 +@@ -281,6 +281,9 @@ + llvm::sys::path::append(swiftrtPath, + swift::getMajorArchitectureName(getTriple())); + llvm::sys::path::append(swiftrtPath, "swiftrt.o"); ++ //Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); ++ // XYZZY ++ swiftrtPath = "/usr/libexec/swift/5.8.1/lib/swift/linux/x86_64/swiftrt.o"; + Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); + + addPrimaryInputsOfType(Arguments, context.Inputs, context.Args, From ea5d20dd8e00ea0ecb889b50278491dcb38f0aae Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 24 Jun 2024 17:31:59 +0200 Subject: [PATCH 125/152] Rebuilt for Python 3.13 --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index fc35b6d..077e0e5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -36,7 +36,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -274,6 +274,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Jun 24 2024 Python Maint - 5.10.1-2.1 +- Rebuilt for Python 3.13 + * Sat Jun 22 2024 Ron Olson - 5.10.1-2 - Changes for Fedora >= 41 and Python 3.13 * Thu Jun 06 2024 Ron Olson - 5.10.1-1 From 2810d0238fbb2736f6c067014fac76eacd1a866f Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 29 Jun 2024 08:18:10 -0500 Subject: [PATCH 126/152] Added LZMA --- swift-lang.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 077e0e5..4d0f4cb 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.10.1-RELEASE -%global fedora_release 2 +%global fedora_release 3 %global package_version 5.10.1 # Set to the right version per the json file @@ -36,7 +36,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -208,7 +208,7 @@ mv WasmKit-%{wasmkit_version} wasmkit %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize # Enable LZMA -%dnl %patch -P2 -p0 +%patch -P2 -p0 # Tests fail for some reason preventing the package from being built %dnl %patch -P5 -p0 @@ -274,9 +274,10 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Jun 25 2024 Ron Olson - 5.10.1-3 +- Enable LZMA * Mon Jun 24 2024 Python Maint - 5.10.1-2.1 - Rebuilt for Python 3.13 - * Sat Jun 22 2024 Ron Olson - 5.10.1-2 - Changes for Fedora >= 41 and Python 3.13 * Thu Jun 06 2024 Ron Olson - 5.10.1-1 From ae99554b5c14941cd5658c0ddcd3e73bd7cbfc2f Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Thu, 4 Jul 2024 02:57:28 +0900 Subject: [PATCH 127/152] Use default Python for Fedora 41+ --- swift-lang.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 4d0f4cb..0446fb6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.10.1-RELEASE -%global fedora_release 3 +%global fedora_release 4 %global package_version 5.10.1 # Set to the right version per the json file @@ -96,10 +96,6 @@ Patch9: swiftrto.patch Patch10: sdk_path.patch Patch11: no_pipes_510.patch -%if 0%{?fedora} >= 41 -BuildRequires: python3.11 -BuildRequires: python3.11-devel -%endif BuildRequires: clang BuildRequires: swig BuildRequires: rsync @@ -229,10 +225,7 @@ mv WasmKit-%{wasmkit_version} wasmkit %dnl %patch -P9 -p0 %dnl %patch -P10 -p0 -# Python got a big update in F41 and we need to adjust for it -%if 0%{?fedora} >= 41 %patch -P11 -p0 -%endif %build @@ -274,6 +267,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Jul 04 2024 Byoungchan Lee - 5.10.1-4 +- Use default Python for Fedora 41+ * Tue Jun 25 2024 Ron Olson - 5.10.1-3 - Enable LZMA * Mon Jun 24 2024 Python Maint - 5.10.1-2.1 From ba7fdd6815e779164abf0e25924c5f89baaca4ff Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 19 Jul 2024 07:54:31 -0500 Subject: [PATCH 128/152] Added swift libraries to ldconfig cache --- swift-lang.spec | 9 +++++++-- swiftlang.conf | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 swiftlang.conf diff --git a/swift-lang.spec b/swift-lang.spec index 0446fb6..d3555e9 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.10.1-RELEASE -%global fedora_release 4 +%global fedora_release 5 %global package_version 5.10.1 # Set to the right version per the json file @@ -82,7 +82,7 @@ Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz - +Source39: swiftlang.conf Patch1: uintptr.patch Patch2: enablelzma.patch @@ -246,6 +246,8 @@ mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 mkdir -p %{buildroot}/usr/lib ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift +mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ +install -m 0644 %{SOURCE39} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf # This is to fix an issue with check-rpaths complaining about # how the Swift binaries use RPATH @@ -260,6 +262,7 @@ export QA_SKIP_RPATHS=1 %{_mandir}/man1/swift.1.gz %{_libexecdir}/swift/ %{_usr}/lib/swift +%{_sysconfdir}/ld.so.conf.d/swiftlang.conf %post -p /sbin/ldconfig @@ -267,6 +270,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Jul 19 2024 Ron Olson - 5.10.1-5 +- Added libraries to cache * Thu Jul 04 2024 Byoungchan Lee - 5.10.1-4 - Use default Python for Fedora 41+ * Tue Jun 25 2024 Ron Olson - 5.10.1-3 diff --git a/swiftlang.conf b/swiftlang.conf new file mode 100644 index 0000000..d19930a --- /dev/null +++ b/swiftlang.conf @@ -0,0 +1 @@ +/usr/lib/swift/linux From 4f6074a0c15ffff8c7a23994a99f4241e0a7cec5 Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Mon, 22 Jul 2024 12:57:19 +0900 Subject: [PATCH 129/152] Minimize runtime/compile time dependencies --- swift-lang.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index d3555e9..8d099fd 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.10.1-RELEASE -%global fedora_release 5 +%global fedora_release 6 %global package_version 5.10.1 # Set to the right version per the json file @@ -102,19 +102,13 @@ BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-distro -BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel BuildRequires: libdispatch-devel BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel -BuildRequires: libicu-devel BuildRequires: perl-podlators -BuildRequires: python3-six -BuildRequires: binutils-devel -BuildRequires: zlib-devel %if ! 0%{?el8} BuildRequires: python-unversioned-command %endif @@ -125,8 +119,6 @@ BuildRequires: binutils-gold Requires: glibc-devel Requires: binutils-gold Requires: gcc -Requires: ncurses-devel -Requires: lldb ExclusiveArch: x86_64 aarch64 @@ -270,6 +262,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Jul 22 2024 Byoungchan Lee - 5.10.1-6 +- Minimize runtime/compile time dependencies * Fri Jul 19 2024 Ron Olson - 5.10.1-5 - Added libraries to cache * Thu Jul 04 2024 Byoungchan Lee - 5.10.1-4 From dc57945df0778d12437c93103036297e350c6349 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Mon, 26 Aug 2024 23:23:52 +0800 Subject: [PATCH 130/152] Export Swift development tool libraries to libdir --- swift-lang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 8d099fd..b2793ec 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@ # Make sure these are changed for every release! ################################################# %global swift_version 5.10.1-RELEASE -%global fedora_release 6 +%global fedora_release 7 %global package_version 5.10.1 # Set to the right version per the json file @@ -238,6 +238,8 @@ mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 mkdir -p %{buildroot}/usr/lib ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift +mkdir -p %{buildroot}%{_libdir} +ln -fs %{_libexecdir}/swift/%{package_version}/lib/lib{IndexStore,sourcekitdInProc,swiftDemangle}.so* %{buildroot}%{_libdir}/ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ install -m 0644 %{SOURCE39} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf @@ -254,6 +256,9 @@ export QA_SKIP_RPATHS=1 %{_mandir}/man1/swift.1.gz %{_libexecdir}/swift/ %{_usr}/lib/swift +%{_libdir}/libIndexStore.so* +%{_libdir}/libsourcekitdInProc.so +%{_libdir}/libswiftDemangle.so %{_sysconfdir}/ld.so.conf.d/swiftlang.conf @@ -262,6 +267,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Aug 26 2024 Zephyr Lykos - 5.10.1-7 +- Export Swift development tool libraries to libdir * Mon Jul 22 2024 Byoungchan Lee - 5.10.1-6 - Minimize runtime/compile time dependencies * Fri Jul 19 2024 Ron Olson - 5.10.1-5 From ea96108046f8a1021f3bbd46d95c8cef7799626e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 17 Sep 2024 09:41:05 -0500 Subject: [PATCH 131/152] Updated to Swift 6.0-RELEASE --- .gitignore | 7 ++ enablelzma.patch => enable_lzma.patch | 6 +- fclose_issues.patch | 40 ------- fs.patch | 15 --- have_strcat.patch | 18 +++ latest_python.patch | 34 ++++++ need_pic.patch | 11 ++ new_glibc.patch | 27 ----- no-test.patch | 11 -- no_pipes.patch | 83 ++++++++++++++ no_pipes_510.patch | 143 ----------------------- resource_dir.patch | 46 ++++++++ sdk_path.patch | 19 ---- sources | 59 +++++----- strlcpy_issues.patch | 11 -- swift-lang.spec | 158 +++++++++++++------------- swiftrto.patch | 12 -- uintptr.patch | 10 -- unusedvars.patch | 14 --- 19 files changed, 316 insertions(+), 408 deletions(-) rename enablelzma.patch => enable_lzma.patch (72%) delete mode 100644 fclose_issues.patch delete mode 100644 fs.patch create mode 100644 have_strcat.patch create mode 100644 latest_python.patch create mode 100644 need_pic.patch delete mode 100644 new_glibc.patch delete mode 100644 no-test.patch create mode 100644 no_pipes.patch delete mode 100644 no_pipes_510.patch create mode 100644 resource_dir.patch delete mode 100644 sdk_path.patch delete mode 100644 strlcpy_issues.patch delete mode 100644 swiftrto.patch delete mode 100644 uintptr.patch delete mode 100644 unusedvars.patch diff --git a/.gitignore b/.gitignore index 561cf88..dd0d0c6 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,10 @@ /swift-certificates.tar.gz /wasi-sdk.tar.gz /wasm.tar.gz +/icu.zip +/swift-format.zip +/swift-foundation-icu.zip +/swift-foundation.zip +/swift-llvm-bindings.zip +/swift-testing.tar.gz +/zlib13.zip diff --git a/enablelzma.patch b/enable_lzma.patch similarity index 72% rename from enablelzma.patch rename to enable_lzma.patch index 7d6f831..286ca55 100644 --- a/enablelzma.patch +++ b/enable_lzma.patch @@ -1,6 +1,6 @@ ---- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 -+++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 -@@ -2209,7 +2209,7 @@ +--- swift/utils/build-script-impl.orig 2024-06-25 09:36:26.767949217 -0500 ++++ swift/utils/build-script-impl 2024-06-25 09:36:46.207322186 -0500 +@@ -2243,7 +2243,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON diff --git a/fclose_issues.patch b/fclose_issues.patch deleted file mode 100644 index 8582684..0000000 --- a/fclose_issues.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-12-12 21:00:36.129189000 +0000 -+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-12-12 21:04:32.274597013 +0000 -@@ -495,19 +495,19 @@ - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() - var tmpBuffer = [UInt8](repeating: 0, count: 1 << 12) - while true { -- let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp) -+ let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp!) - if n < 0 { - if errno == EINTR { continue } - throw FileSystemError(.ioError(code: errno), path) - } - if n == 0 { -- let errno = ferror(fp) -+ let errno = ferror(fp!) - if errno != 0 { - throw FileSystemError(.ioError(code: errno), path) - } -@@ -525,12 +525,12 @@ - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents - while true { -- let n = fwrite(&contents, 1, contents.count, fp) -+ let n = fwrite(&contents, 1, contents.count, fp!) - if n < 0 { - if errno == EINTR { continue } - throw FileSystemError(.ioError(code: errno), path) diff --git a/fs.patch b/fs.patch deleted file mode 100644 index fa12d1d..0000000 --- a/fs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp.orig 2022-08-03 19:13:51.591055629 -0500 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2022-08-03 19:13:56.112348435 -0500 -@@ -73,7 +73,11 @@ - #include - #include - #include --#include -+//#include -+#define FS_IOC_GETFLAGS _IOR('f', 1, long) -+#define FS_IOC_SETFLAGS _IOW('f', 2, long) -+#define FS_IOC_GETVERSION _IOR('v', 1, long) -+#define FS_IOC_SETVERSION _IOW('v', 2, long) - #include - #include - #include diff --git a/have_strcat.patch b/have_strcat.patch new file mode 100644 index 0000000..28a687c --- /dev/null +++ b/have_strcat.patch @@ -0,0 +1,18 @@ +--- swift-corelibs-foundation/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h.orig 2024-07-31 10:29:42.005997906 -0500 ++++ swift-corelibs-foundation/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h 2024-07-31 10:31:06.147568761 -0500 +@@ -200,6 +200,7 @@ + #endif + + #if !TARGET_OS_MAC ++#if 0 + #if !HAVE_STRLCPY + CF_INLINE size_t + strlcpy(char * dst, const char * src, size_t maxlen) { +@@ -229,6 +230,7 @@ + return dstlen + srclen; + } + #endif ++#endif // XYZZY - We do have them in Fedora + #endif // !TARGET_OS_MAC + + #if TARGET_OS_WIN32 diff --git a/latest_python.patch b/latest_python.patch new file mode 100644 index 0000000..0b33562 --- /dev/null +++ b/latest_python.patch @@ -0,0 +1,34 @@ +diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +--- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-08-03 13:04:05.441817601 -0500 ++++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-08-03 13:14:00.001254584 -0500 +@@ -74,7 +74,7 @@ + #if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7 + return _Py_Finalizing != nullptr; + #else +- return _Py_IsFinalizing(); ++ return Py_IsFinalizing(); + #endif + } + +diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +--- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-08-03 13:04:05.442817667 -0500 ++++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-08-03 13:12:15.688335534 -0500 +@@ -182,7 +182,7 @@ + return; + #endif + +- if (PyEval_ThreadsInitialized()) { ++ if (Py_IsInitialized()) { + Log *log = GetLog(LLDBLog::Script); + + m_was_already_initialized = true; +@@ -191,9 +191,6 @@ + m_gil_state == PyGILState_UNLOCKED ? "un" : ""); + return; + } +- +- // InitThreads acquires the GIL if it hasn't been called before. +- PyEval_InitThreads(); + } + + PyGILState_STATE m_gil_state = PyGILState_UNLOCKED; diff --git a/need_pic.patch b/need_pic.patch new file mode 100644 index 0000000..e78f4f4 --- /dev/null +++ b/need_pic.patch @@ -0,0 +1,11 @@ +--- cmark/CMakeLists.txt.orig 2024-06-11 14:38:17.531997089 -0500 ++++ cmark/CMakeLists.txt 2024-06-11 14:38:24.161433974 -0500 +@@ -22,6 +22,8 @@ + + set(CMAKE_INCLUDE_CURRENT_DIR YES) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + option(CMARK_FUZZ_QUADRATIC "Build quadratic fuzzing harness" OFF) + option(CMARK_LIB_FUZZER "Build libFuzzer fuzzing harness" OFF) + option(CMARK_THREADING "Add locks around static accesses" OFF) diff --git a/new_glibc.patch b/new_glibc.patch deleted file mode 100644 index 6a84f8c..0000000 --- a/new_glibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --color -Naur swift-corelibs-foundation-orig/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h ---- swift-corelibs-foundation-orig/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-06 10:02:48.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-08-16 12:53:42.332226574 -0500 -@@ -189,7 +189,7 @@ - #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) - #endif - --#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 -+#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN && !ALREADY_HAVE_STRL_FUNCS) || TARGET_OS_WIN32 - CF_INLINE size_t - strlcpy(char * dst, const char * src, size_t maxlen) { - const size_t srclen = strlen(src); -diff --color -Naur swift-corelibs-foundation-orig/CoreFoundation/CMakeLists.txt swift-corelibs-foundation/CoreFoundation/CMakeLists.txt ---- swift-corelibs-foundation-orig/CoreFoundation/CMakeLists.txt 2023-07-06 10:02:48.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/CMakeLists.txt 2023-08-16 12:53:44.851386844 -0500 -@@ -80,6 +80,11 @@ - add_compile_definitions($<$:HAVE_SCHED_GETAFFINITY>) - endif() - endif() -+ # XYZZY -+ check_symbol_exists(strlcpy "string.h" HAVE_NEW_GLIBC) -+ if(HAVE_NEW_GLIBC) -+ add_compile_definitions($<$:ALREADY_HAVE_STRL_FUNCS>) -+ endif() - endif() - elseif(CMAKE_SYSTEM_NAME STREQUAL Windows) - # NOTE(compnerd) we only support building with the dynamic CRT as using the diff --git a/no-test.patch b/no-test.patch deleted file mode 100644 index 3df50ca..0000000 --- a/no-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2023-02-06 19:59:52.297617075 -0600 -+++ swift/utils/build-presets.ini 2023-02-06 20:00:17.131186971 -0600 -@@ -834,7 +834,7 @@ - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out - --test-installable-package -+#test-installable-package - - # Build the benchmarks against the toolchain. - toolchain-benchmarks diff --git a/no_pipes.patch b/no_pipes.patch new file mode 100644 index 0000000..96f1191 --- /dev/null +++ b/no_pipes.patch @@ -0,0 +1,83 @@ +diff --color -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py +--- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-13 19:54:42.303016942 -0500 ++++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-13 19:57:15.922473813 -0500 +@@ -15,7 +15,6 @@ + import stat + import sys + import subprocess +-import pipes + import shlex + import tempfile + import shutil +@@ -61,7 +60,7 @@ + + + def quote_cmd(cmd): +- return " ".join(pipes.quote(arg) for arg in cmd) ++ return " ".join(shlex.quote(arg) for arg in cmd) + + + def write_to_script(text, filename): +@@ -220,7 +219,7 @@ + ) + + for msg in self.expected_output: +- output += "grep -F %s t.log || exit 1\n" % pipes.quote(msg) ++ output += "grep -F %s t.log || exit 1\n" % shlex.quote(msg) + + write_to_script(output, self.testfile) + self.check_interestingness() +diff --color -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py +--- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-13 19:55:23.627829920 -0500 ++++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-13 19:57:42.124257373 -0500 +@@ -8,7 +8,7 @@ + + import os + import pickle +-import pipes ++import shlex + import platform + import re + import shutil +@@ -281,7 +281,7 @@ + } + #endif + """ +- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales]) ++ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales]) + + + @_memoizeExpensiveOperation(lambda c, flags="": (c.substitutions, c.environment, flags)) +diff --color -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py +--- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-13 19:55:23.627829920 -0500 ++++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-13 19:58:01.911604299 -0500 +@@ -11,7 +11,7 @@ + import lit + import lit.formats + import os +-import pipes ++import shlex + import re + import shutil + +diff --color -Naur ninja/configure.py ninja/configure.py +--- ninja/configure.py 2024-06-13 19:54:39.050795565 -0500 ++++ ninja/configure.py 2024-06-13 19:56:39.970026531 -0500 +@@ -23,7 +23,7 @@ + + from optparse import OptionParser + import os +-import pipes ++import shlex + import string + import subprocess + import sys +@@ -264,7 +264,7 @@ + env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) + configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) + if configure_env: +- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) ++ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) + for k in configure_env]) + n.variable('configure_env', config_str + '$ ') + n.newline() diff --git a/no_pipes_510.patch b/no_pipes_510.patch deleted file mode 100644 index 9ee3b69..0000000 --- a/no_pipes_510.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py ---- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-22 14:58:04.110536250 +0000 -+++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-22 15:00:07.092158770 +0000 -@@ -14,7 +14,6 @@ - import stat - import sys - import subprocess --import pipes - import shlex - import tempfile - import shutil -@@ -57,7 +56,7 @@ - sys.exit("ERROR: `%s` not found in %s" % (cmd_name, cmd_dir)) - - def quote_cmd(cmd): -- return ' '.join(pipes.quote(arg) for arg in cmd) -+ return ' '.join(shlex.quote(arg) for arg in cmd) - - def write_to_script(text, filename): - with open(filename, 'w') as f: -@@ -199,7 +198,7 @@ - """ % (disable_symbolization, quote_cmd(self.get_crash_cmd())) - - for msg in self.expected_output: -- output += 'grep -F %s t.log || exit 1\n' % pipes.quote(msg) -+ output += 'grep -F %s t.log || exit 1\n' % shlex.quote(msg) - - write_to_script(output, self.testfile) - self.check_interestingness() -diff -Naur llvm-project/compiler-rt/test/asan/lit.cfg.py llvm-project/compiler-rt/test/asan/lit.cfg.py ---- llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-22 14:57:36.667612165 +0000 -+++ llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-22 15:00:52.711357235 +0000 -@@ -6,14 +6,8 @@ - - import lit.formats - --# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if --# it's not available. --try: -- import shlex -- sh_quote = shlex.quote --except: -- import pipes -- sh_quote = pipes.quote -+import shlex -+sh_quote = shlex.quote - - def get_required_attr(config, attr_name): - attr_value = getattr(config, attr_name, None) -diff -Naur llvm-project/compiler-rt/test/lit.common.cfg.py llvm-project/compiler-rt/test/lit.common.cfg.py ---- llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-22 14:57:34.532462464 +0000 -+++ llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-22 15:01:12.357734687 +0000 -@@ -12,14 +12,8 @@ - import lit.formats - import lit.util - --# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if --# it's not available. --try: -- import shlex -- sh_quote = shlex.quote --except: -- import pipes -- sh_quote = pipes.quote -+import shlex -+sh_quote = shlex.quote - - def find_compiler_libdir(): - """ -diff -Naur llvm-project/compiler-rt/test/memprof/lit.cfg.py llvm-project/compiler-rt/test/memprof/lit.cfg.py ---- llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-22 14:57:36.734616862 +0000 -+++ llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-22 15:01:32.172123921 +0000 -@@ -6,14 +6,8 @@ - - import lit.formats - --# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if --# it's not available. --try: -- import shlex -- sh_quote = shlex.quote --except: -- import pipes -- sh_quote = pipes.quote -+import shlex -+sh_quote = shlex.quote - - def get_required_attr(config, attr_name): - attr_value = getattr(config, attr_name, None) -diff -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py ---- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-22 14:57:57.291058121 +0000 -+++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-22 15:01:55.698773427 +0000 -@@ -8,7 +8,7 @@ - - import os - import pickle --import pipes -+import shlex - import platform - import re - import shutil -@@ -261,7 +261,7 @@ - } - #endif - """ -- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales]) -+ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales]) - - @_memoizeExpensiveOperation(lambda c, flags='': (c.substitutions, c.environment, flags)) - def compilerMacros(config, flags=''): -diff -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py ---- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-22 14:57:57.292058191 +0000 -+++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-22 15:02:11.564885834 +0000 -@@ -9,7 +9,7 @@ - import lit - import lit.formats - import os --import pipes -+import shlex - import re - import shutil - -diff -Naur ninja/configure.py ninja/configure.py ---- ninja/configure.py 2024-06-22 14:57:34.179437713 +0000 -+++ ninja/configure.py 2024-06-22 14:59:43.507505194 +0000 -@@ -23,7 +23,7 @@ - - from optparse import OptionParser - import os --import pipes -+import shlex - import string - import subprocess - import sys -@@ -264,7 +264,7 @@ - env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) - configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) - if configure_env: -- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) -+ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) - for k in configure_env]) - n.variable('configure_env', config_str + '$ ') - n.newline() diff --git a/resource_dir.patch b/resource_dir.patch new file mode 100644 index 0000000..c2000b9 --- /dev/null +++ b/resource_dir.patch @@ -0,0 +1,46 @@ +From f189a95d6371cdb44f773029f7a19b94f0d9a839 Mon Sep 17 00:00:00 2001 +From: Finagolfin +Date: Fri, 28 Jun 2024 20:06:06 +0530 +Subject: [PATCH] [ClangImporter] Make sure the `-resource-dir` is checked + before the `-sdk`, as done everywhere else in the compiler + +Otherwise, these module maps can be pulled from a system SDK instead when +building a fresh Swift stdlib, fixes #74696. +--- + lib/ClangImporter/ClangIncludePaths.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/lib/ClangImporter/ClangIncludePaths.cpp b/lib/ClangImporter/ClangIncludePaths.cpp +index 23431af724459..7e6ca8c2a9cb6 100644 +--- a/lib/ClangImporter/ClangIncludePaths.cpp ++++ b/lib/ClangImporter/ClangIncludePaths.cpp +@@ -35,10 +35,10 @@ static std::optional getActualModuleMapPath( + + Path result; + +- StringRef SDKPath = Opts.getSDKPath(); +- if (!SDKPath.empty()) { +- result.append(SDKPath.begin(), SDKPath.end()); +- llvm::sys::path::append(result, "usr", "lib", "swift"); ++ if (!Opts.RuntimeResourcePath.empty()) { ++ result.clear(); ++ result.append(Opts.RuntimeResourcePath.begin(), ++ Opts.RuntimeResourcePath.end()); + llvm::sys::path::append(result, platform); + if (isArchSpecific) { + llvm::sys::path::append(result, arch); +@@ -52,10 +52,10 @@ static std::optional getActualModuleMapPath( + return result; + } + +- if (!Opts.RuntimeResourcePath.empty()) { +- result.clear(); +- result.append(Opts.RuntimeResourcePath.begin(), +- Opts.RuntimeResourcePath.end()); ++ StringRef SDKPath = Opts.getSDKPath(); ++ if (!SDKPath.empty()) { ++ result.append(SDKPath.begin(), SDKPath.end()); ++ llvm::sys::path::append(result, "usr", "lib", "swift"); + llvm::sys::path::append(result, platform); + if (isArchSpecific) { + llvm::sys::path::append(result, arch); diff --git a/sdk_path.patch b/sdk_path.patch deleted file mode 100644 index c2a930e..0000000 --- a/sdk_path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- swift/cmake/modules/AddSwift.cmake.orig 2024-02-15 13:47:44.300541015 -0600 -+++ swift/cmake/modules/AddSwift.cmake 2024-02-15 13:53:44.593670558 -0600 -@@ -543,11 +543,15 @@ - # At build time and run time, link against the swift libraries in the - # installed host toolchain. - if(SWIFT_PATH_TO_SWIFT_SDK) -- set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr") -+ # XYZZY -+ set(swift_dir "${SWIFT_PATH_TO_SWIFT_SDK}/usr/libexec/swift/5.8.1") - else() - get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY) - get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY) - endif() -+ # XYZZY -+ set(swift_dir "/usr/libexec/swift/5.8.1") -+ # xyzzy - back to original - set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}") - set(host_lib_arch_dir "${host_lib_dir}/${SWIFT_HOST_VARIANT_ARCH}") - diff --git a/sources b/sources index 7319eec..0cee4ad 100644 --- a/sources +++ b/sources @@ -1,39 +1,44 @@ SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 -SHA512 (cmark.tar.gz) = cb7ffad3ec3fbc74de28df56f4ec5850047abf38ae4a2fdfa37aeacd122c52e3164ef965b582a184911612608df0e450481f9f8c25d11c565518ab39a0d24199 -SHA512 (corelibs-foundation.tar.gz) = e4ff04e1eb742455f52b43f0a3a1725d0c1c132d2192e4779073c7690ff12991c62c20ca0a42b81d2af12b394e4720309a07cd303ba12f22c2f917570ed0ff5d -SHA512 (corelibs-libdispatch.tar.gz) = fa8278adbdfd5b041c89a7b14a17aaa805a6f4db12221ff469288bb8d945fd28f16a8d66f56148aeba2e6be30bd6655fbe375d7843d1cb54407527d998e6d6fa -SHA512 (corelibs-xctest.tar.gz) = 6dad6f84ef5a47a74d25211efc25cc2baa13bf0019145cc96ad4d5ac7ddcf79b60dd775f610d099848e3a7b4856f8bb9c06558f6f971324474ae2e6fa8a7cd4f -SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = 1fc62360a5cd4701da314774b4c5c6a6a9cc2a8d46881962fc80331006c255d173f8ace8d743a09b3fcdbf1e92570248666396a0b78ce8be19eeff65ab6c3235 -SHA512 (llbuild.tar.gz) = 010ac22ff4c6e803a537e6e84b3f6047d74fc35f773fcf51f52f9d1546196ed73ab42ab90d1346a0a74239c4f1d11cd183018f42726df42dc921bf0d2235d850 -SHA512 (llvm-project.tar.gz) = c659041234da1fed29a7186f0e436b0867576096483333d71f11e72828b45e2c7bd9b15db7d3da348a114af48a649f8a484ba3bd4de84d2f5cdb8a7035c5ad30 +SHA512 (cmark.tar.gz) = 78c0cc3ba99dd2b81ad209a600deee6ca09a4b4d91df47a4e5eabbaf4f41254caa04b16c24f8cef157c60cc1e7c98b356e568d941a3426a09cfaf7d57f30d220 +SHA512 (corelibs-foundation.tar.gz) = 0e0b11e00d8563352f4a8197cd21fe3846b911e5c92dd0c397fc018f34b1d7f385f9376787aba5f9ecae59abfd34a9aad73db8a5613149242fe357eef444caca +SHA512 (corelibs-libdispatch.tar.gz) = 20435db6fac9fa5c50eb3f0ea5f5f6f60320a6167b3498fae9acc95bea6c257844a80b4451d0a5e3d78ec063773126c93309f59147dae8e9ada0a33dc7973e5e +SHA512 (corelibs-xctest.tar.gz) = fa9fd6ed04db179e262869be2fa495bfccdb1f4d6b80b5cf5c0ca3736f580dc7a4ca7e201c98a947d080f2a1c76622ce1c5a800e7f8e32317df90d776de5488f +SHA512 (icu.zip) = 3deb56e8109783049c9dac04073aa084bcd92a0370b820ba4dbdad641a5a3f753f6ef8fd575ac82385fc1f2f224118313a6987d513991826ed7355307f6d9696 +SHA512 (indexstore-db.tar.gz) = 60c0778cf268a98235ad1e84a6bc08de97164268c57e281af9f0f24a8a3f8b5dbc9b2e6fd7913c95d780ad3af567f0551076746a31552f35c317a814dc443ea3 +SHA512 (llbuild.tar.gz) = 18c08144c3e03f2cc82e96d2d611729873c25e1647e6bfacd91f30480cbb23aa6a31312e63c6252e94dd098110304ec6858fb9dd00a1f0af0b355f4d467c99db +SHA512 (llvm-project.tar.gz) = ba8edfdd23a7a14deada2e3fdd16b56969e29275145f06602f83aa518d43c8520a883404a8f93e5f97405695036225e2f498e313c489d49f1a59701733b78a6c SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 303e2b02bdc16cfe3a8812e4d5a79de09ef7367a2f0bbca28c55e2f037b0a8dab684bcaa7189dbcc6c6876d21a4e4da2b0956743b99a0b2c7d4a1be415e0df92 -SHA512 (sourcekit-lsp.tar.gz) = 4a2f7c2129a69c05c8d158877efb1538f092f8eb2d1b1194661cb7c6f201330ecf7fd33bb0d06dd595bc6966e19b739d103478db6c9b2a4c2d7ae351bfb398a8 +SHA512 (package-manager.tar.gz) = a7e321ee75a2ca3a32e553c18a4288fa9c9c8d3f76f0997bc27fbccb3de9c3f81c6f2fbaf04fe97d7d011535ef766bd7bbe31933c62ab44e5c0d5a94c7b27bef +SHA512 (sourcekit-lsp.tar.gz) = c0d0393f135a8acf7af90783dd330bb0b8561e00878114f70eb721215cd0e6bffabba181b42ba1c19407fd165801698ac4e2d841b83ee26b2250d66d68853d9d SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 -SHA512 (swift-collections.tar.gz) = 87309c52e5d2115ce8aedda05f35f40e919b367663d9032a159a31163fda7d0aa78df9049e424bda65fe58c4f2a1c74a784c4c6b485581eef450a022a5a7d700 +SHA512 (swift-collections.tar.gz) = 830a3a8923e498a58e5638bda5157c0a8ca20032daa73e752bb445314e3c8050cda85dfba78105f3e76d66832e804b8efc6c05aec117b687a83fc34e9c724639 SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = d646a4263cade323c2a19f06f1c909e02606b92953b72aa37dc1e49e99199085484d68f90259a821b4e81f2b18de624648db50bde0d8cfd852c291cad39ff282 -SHA512 (swift-docc-symbolkit.tar.gz) = cf7a058aeded8455656fa70443b9e280488391957e9003c85c4166925ec6de74675fe9a61571da5897853626e91e4353d72abc76d71a79f4f32e2e4d5b7f4ed9 -SHA512 (swift-docc.tar.gz) = d72849e583211ff5fef449de2257629b67511476f06724ed798428bd4f5e29224860854bbd262c3d4ae786397704d9589eb2d84a9d4d95f385fba9bc491e208b -SHA512 (swift-driver.tar.gz) = 77ce7412cf2a5077331250b1fa70e56b6300340aef7224089840018519cab46bcc011074478045e4bf30502912a0619a842bc082509145871a3c0f1da14ccde5 -SHA512 (swift-experimental-string-processing.tar.gz) = 89650c6b68ee6a256fadda84e68d7ea4faf3c09859e80bcc270ca36433ed3e652c7139ed868f6f515e3193928a100c99500574eb614dbf97c345cbfefdb245c2 -SHA512 (swift-format.tar.gz) = 2feba9df7b78010ff5c9b6ccf2dfc44a37425410d0733c1ddb4a804310ee75e95c8bf464c9fc2ff1285b20089b0a19a2192e2cf4fa3087028d28e0f83a70d94c -SHA512 (swift-integration-tests.tar.gz) = 52dbcd7a9b509253b6f2df4467ebcf0ade8d941581883fa9edf6461ab308f2e07b80e95aa673155066324802e57397887d01249bf055178e08ca7483c11b2250 -SHA512 (swift-lmdb.tar.gz) = ffbdb5f0efd84b9826c23919a7d4941f6b71ad78a389814e56c2862f441a37484c020aa54e5984076634d5f15c088eeaa84b658f357d4585109c4ca8535ef6cc -SHA512 (swift-markdown.tar.gz) = df4d1f240c0d92b2df9bd48b5cd750402a2f855d2a989d7c3722f3eeeaec067d7562caa38b8ea664114359b9c6bf4f2d5502acd62225e3a5e278bf9525f7d24c +SHA512 (swift-docc-render-artifact.tar.gz) = 804566cbbb2fb4ea78186e9fd8ebfc341a077e007e6f3712f56823b8a09d51e5653846b5783cb0ad7e394285ed8046713b3fa864bd73bb7ce6de247ff4f8921b +SHA512 (swift-docc-symbolkit.tar.gz) = 5aaac5e7acd3f12c085ca97b65c9ec1b28569b9a9063ac4cf2aa54015b9766872896f50483de02c9d06d2c178b6c5f77d08eced93a7ffec0dd0280d6f262325d +SHA512 (swift-docc.tar.gz) = 0c4942b2057c3c07f1eda73b28d5483a57668880cf33eeee0abea727490aacbf962091f845250d2b54349f9152935379b892f93b807572e4a7f5718b22f472fc +SHA512 (swift-driver.tar.gz) = 76dc13a8b4a364cae5d90320119a1bc631852ead0fff05e5935daf32b2baa1e9cc597038d8f199ffd306034cf6c2f53030db26b28a6d9605cd12d9fae917a7ba +SHA512 (swift-experimental-string-processing.tar.gz) = f14f186e731da37162d25d85805b44aaf9d88500ebbdfa99b49f78002ef7cc97c4051bc6b940fa2177a8efaf6397333e2cdd408f2bba5200c94b87f94acbff39 +SHA512 (swift-format.zip) = 1de7cbd484020e354347c19dc3f2da8ab169f938df00382e126a07b8312f515d52eefebf20d3da3b8700b9d4c2a7fee73edd0793b6dd0120f93e550f1f19a09a +SHA512 (swift-foundation-icu.zip) = f2e70bffcd6b998a6de6849e71f4cdc97bd28d8d5294823ef2857ee0a9aaabd98d76a4672858ec2c702a4775290d215b5ba81611dc17ec2da34a3dac46a26219 +SHA512 (swift-foundation.zip) = 387549e00393d48db218cc95f5c0f66ea63f17cc3fc68ee3184fb4020a6ae88353377e771fc4a45b03bd580cb23386da15c00bbf3679dd6e7fc74438f0d099b2 +SHA512 (swift-integration-tests.tar.gz) = 3eac16036966d2f672382d712d4f930289e9e84ad029c5924dc5f93770529aed2fd09109bdd6b9c7d9f45cb58ff1e2889ec5264e028f623d2d4721a4da5ee3f3 +SHA512 (swift-llvm-bindings.zip) = ef5f5daa8b4cbdd90411a85ebb95bd6279cb4ad30d7a7ea52c8e3d613daa12b8639f7fd5073a6ff759846e3f292773ef446ed3af6f20fa61c9b9a91d61817e4a +SHA512 (swift-lmdb.tar.gz) = 7fc503c249c4c4a40c3fc9139a2e3b74ffca6cec8c7def4aa0681705765ac9130fd172183022df9f8bd06ee50dc82835d0d5fa362a3928b9f4985c635ee2f000 +SHA512 (swift-markdown.tar.gz) = 512ea06dde0896774c332ba09a7f00fc6b7fc4c0c7edcc550e32ed907824327a31ab7036040123910bbaaf905cb1338957285f592a59e8bb0501630a0656c8b7 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-stress-tester.tar.gz) = a0f63b902e7243b455a0e7f60b11e8c0e6448c56a8db39c96fc40bd99a79f2a23147f631b04d79713832bca44403c5cba5b2a8d96eb5bbd4515295a00126290e -SHA512 (swift-syntax.tar.gz) = bbe672aed621915f387fd8c308805208a29d0b830d7a2f84543ea6b8036554205e0db46414a3ea3e2e8e733e49d8b23971acc385fc4c0fac8204e8cdbdc34cd7 -SHA512 (swift-system.tar.gz) = 9cfd32ab5fce445b764ba5fb9f1739776167a3159057338923dab6e74b15e72e3dbaee2d48386113597a36f356e5961b173937f58fd0b95a0ced910bc1672450 -SHA512 (swift-tools-support-core.tar.gz) = d69d2e4e9b1e6c44b97c88b73101f7b66a8adb59275e77ca0e3ededd7bf444285a649855f94e7f8aee7b965b734e9b657eef65671f3ce0c4b0c6971380672e6a -SHA512 (swift-xcode-playground-support.tar.gz) = d1f9a178891c64c3e40cd2ae56a48b8afedeb1981330776a04bddff9b94dcaf09542291bf234e6ed1515e046fa8fced506e7b3c3461bc690ca01a58640222c24 -SHA512 (swift.tar.gz) = 212ede9ba6a874666ceeb30073dd2a9c8b6b08715f375c98b86bee4a78f4a235ad0f1e35ec3d7f9f97c79f963a9d8bd0a6c9737a8c32b073dca828c564145396 +SHA512 (swift-stress-tester.tar.gz) = e5d1d5192891241134b202a78754c6b52633d9ad5418bb984e63a0e7b801cc9274d42bf4140b2cc4ee5706e17107b8b42eb29765a85e06c949e3774574079d6f +SHA512 (swift-syntax.tar.gz) = bde0a19a1d55c601d6af288c5c41097afeba96bd93c9ac085fb0967f7da9d3e266bf3f7fcf47098681007d336177cfde5d1f512ebf2293ed177c52a3e92b1a21 +SHA512 (swift-system.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 +SHA512 (swift-testing.tar.gz) = f5b0b4786b36159def1fe499867d2eebf961be5bc81d10294f8627aadb90b441dad7f7ad5fb5572798b36c54847c42059f95e1e2110b0b7484b67bd7d8de76b2 +SHA512 (swift-tools-support-core.tar.gz) = 11cdb401edb4397955ff7ee2e3eb9f0cae38ac82d02dbc2d29a6b61ef0df0fb718b7de81c7e778de86426702e327bd1e98d7185ee3c525261955ac97f351cd7a +SHA512 (swift-xcode-playground-support.tar.gz) = 7da126ccba4b81b157c7c09e9a20d6a0a6e275536169743c3a50d08d700699fc403e3fb111e2d4b1645a1d4af196cbc443c671a5c7461a6d9acf73a9166ca789 +SHA512 (swift.tar.gz) = 1b1c47bd94c6c9b8902fcc4b0ecab1a743ef71651c18c5a2612117ce60caacd202e23ea84aed862eec70ea175197a4d8037d76cf64a42bfdf2a482a41097876a SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff -SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 +SHA512 (yams.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 +SHA512 (zlib13.zip) = 7309db617cfc389544d84b8d6cd89ac1720bcb66925e6f0e56e9240f12ea17ae14f36fd4016fbd2c77203812e43040cd80c4649a0b099f2884af959812d9a581 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch deleted file mode 100644 index ece318b..0000000 --- a/strlcpy_issues.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 -+++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 -@@ -189,7 +189,7 @@ - #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) - #endif - --#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 -+#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 - CF_INLINE size_t - strlcpy(char * dst, const char * src, size_t maxlen) { - const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index b2793ec..9e8429e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,3 +1,9 @@ +# 6/27/24 - temporary disable __brp_add_determinism +# as it prevents the package from successfully building +%if 0%{?fedora} >= 41 +# on Fedora 41/Rawhide +%undefine __brp_add_determinism +%endif %global debug_package %{nil} %undefine _auto_set_build_flags @@ -6,32 +12,34 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.10.1-RELEASE -%global fedora_release 7 -%global package_version 5.10.1 +%global swift_version 6.0-RELEASE +%global fedora_release 1 +%global package_version 6.0 + +%global swift_source_location swift-source # Set to the right version per the json file -%global swift_source_location swift-source -%global icu_version 65-1 -%global yams_version 5.0.1 +%global icu_version 69 +%global yams_version 5.0.6 %global swift_argument_parser_version 1.2.3 %global swift_crypto_version 3.0.0 %global ninja_version 1.11.1 %global cmake_version 3.24.2 %global swift_atomics_version 1.2.0 -%global swift_collections_version 1.0.5 +%global swift_collections_version 1.1.2 %global swift_numerics_version 1.0.2 -%global swift_system_version 1.2.1 +%global swift_system_version 1.3.0 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 %global swift_certificates_version 1.0.1 %global swift_asn1_version 1.0.0 %global wasmkit_version 0.0.3 %global wasi_version 20 - -# Temporary I presume as the json file suggests there should -# be eventually a release version of swift-format -%global swift_format_version 510.1.0 +%global swift_format_version 6.0 +%global swift_llvm_bindings_version 6.0 +%global swift_foundation_icu_version 6.0 +%global swift_foundation_version 6.0 +%global zlib_version 1.3 Name: swift-lang @@ -71,30 +79,28 @@ Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -%dnl Source30: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz -Source30: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz +Source30: https://github.com/apple/swift-format/archive/refs/heads/release/%{swift_format_version}.zip#/swift-format.zip Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz -%dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz -Source36: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz +Source36: https://github.com/unicode-org/icu/archive/refs/heads/maint/maint-%{icu_version}.zip#/icu.zip Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz -Source39: swiftlang.conf +Source39: https://github.com/apple/swift-llvm-bindings/archive/refs/heads/swift/release/%{swift_llvm_bindings_version}.zip#/swift-llvm-bindings.zip +Source40: https://github.com/apple/swift-foundation-icu/archive/refs/heads/release/%{swift_foundation_icu_version}.zip#/swift-foundation-icu.zip +Source41: https://github.com/apple/swift-foundation/archive/refs/heads/release/%{swift_foundation_version}.zip#/swift-foundation.zip +Source42: https://github.com/apple/swift-testing/archive/refs/tags/swift-%{swift_version}.tar.gz#/swift-testing.tar.gz +Source43: https://github.com/madler/zlib/releases/download/v%{zlib_version}/zlib13.zip +Source44: swiftlang.conf -Patch1: uintptr.patch -Patch2: enablelzma.patch -Patch3: fs.patch -Patch4: unusedvars.patch -Patch5: no-test.patch -Patch6: strlcpy_issues.patch -Patch7: fclose_issues.patch -Patch8: new_glibc.patch -Patch9: swiftrto.patch -Patch10: sdk_path.patch -Patch11: no_pipes_510.patch +Patch1: need_pic.patch +Patch2: no_pipes.patch +Patch3: enable_lzma.patch +Patch4: resource_dir.patch +Patch5: have_strcat.patch +Patch6: latest_python.patch BuildRequires: clang BuildRequires: swig @@ -109,12 +115,9 @@ BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: perl-podlators -%if ! 0%{?el8} -BuildRequires: python-unversioned-command -%endif -# After 5.8, Swift is needed to build Swift -BuildRequires: swiftlang -BuildRequires: binutils-gold +BuildRequires: python-unversioned-command +BuildRequires: swiftlang +BuildRequires: lld Requires: glibc-devel Requires: binutils-gold @@ -122,7 +125,7 @@ Requires: gcc ExclusiveArch: x86_64 aarch64 -Provides: swiftlang = %{version}-%{release} +Provides: swiftlang = %{version}-%{release} %description @@ -138,11 +141,12 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39 -a 40 -a 41 -a 42 -a 43 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary mv swift-cmark-swift-%{swift_version} cmark +mv swift-testing-swift-%{swift_version} swift-testing mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest @@ -169,17 +173,19 @@ mv swift-numerics-%{swift_numerics_version} swift-numerics mv swift-system-%{swift_system_version} swift-system mv swift-nio-%{swift_nio_version} swift-nio mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl -%dnl mv swift-format-swift-%{swift_version} swift-format -mv swift-format-%{swift_format_version} swift-format +mv swift-format-release-%{swift_format_version} swift-format mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing mv swift-certificates-%{swift_certificates_version} swift-certificates mv swift-asn1-%{swift_asn1_version} swift-asn1 +mv swift-llvm-bindings-swift-release-%{swift_llvm_bindings_version} swift-llvm-bindings +mv swift-foundation-icu-release-%{swift_foundation_icu_version} swift-foundation-icu +mv swift-foundation-release-%{swift_foundation_version} swift-foundation # ICU -mv icu-release-%{icu_version} icu +mv icu-maint-maint-%{icu_version} icu # Yams mv Yams-%{yams_version} yams @@ -190,35 +196,40 @@ mv ninja-%{ninja_version} ninja # WasmKit mv WasmKit-%{wasmkit_version} wasmkit +# zlib +mv zlib-%{zlib_version} zlib # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Enable LZMA +# Enable PIC for cmark +%patch -P1 -p0 + +# Pipes has been removed in Python %patch -P2 -p0 -# Tests fail for some reason preventing the package from being built -%dnl %patch -P5 -p0 +# Enable LZMA +%patch -P3 -p0 -# Issue with >= F39 not liking not having the file object -# explicitly forced in an fclose() -%if 0%{?fedora} >= 39 -%dnl %patch -P7 -p0 +# https://github.com/swiftlang/swift/pull/74814 +pushd swift +%patch -P4 -p1 +popd + +# Weird (hopefully temp) situation of strlcpy and strncat +# not being found at the system level +# This does not work for EPEL9, so we need to make sure +# that this patch is _not_ applied when building for EPEL9 +%if ! 0%{?el9} +%patch -P5 -p0 %endif -# 39 and later, so this patch modifies the CMakeLists.txt file -# to add a check for them, along with a patch to the header -# file that if they are present, don't define the functions -# seperately. -%dnl %patch -P8 -p0 - -# For finding swiftrt.o in the right place -%dnl %patch -P9 -p0 -%dnl %patch -P10 -p0 - -%patch -P11 -p0 - +# After Python 3.12 certain functions have been removed, +# which is in Fedora 41 +%if 0%{?fedora} >= 41 +%patch -P6 -p0 +%endif %build export VERBOSE=1 @@ -241,7 +252,8 @@ ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/sw mkdir -p %{buildroot}%{_libdir} ln -fs %{_libexecdir}/swift/%{package_version}/lib/lib{IndexStore,sourcekitdInProc,swiftDemangle}.so* %{buildroot}%{_libdir}/ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ -install -m 0644 %{SOURCE39} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf +install -m 0644 %{SOURCE44} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf + # This is to fix an issue with check-rpaths complaining about # how the Swift binaries use RPATH @@ -257,8 +269,8 @@ export QA_SKIP_RPATHS=1 %{_libexecdir}/swift/ %{_usr}/lib/swift %{_libdir}/libIndexStore.so* -%{_libdir}/libsourcekitdInProc.so -%{_libdir}/libswiftDemangle.so +%{_libdir}/libsourcekitdInProc.so* +%{_libdir}/libswiftDemangle.so* %{_sysconfdir}/ld.so.conf.d/swiftlang.conf @@ -267,23 +279,17 @@ export QA_SKIP_RPATHS=1 %changelog -* Mon Aug 26 2024 Zephyr Lykos - 5.10.1-7 +* Mon Sep 16 2024 Ron Olson - 6.0-1 +- Updated to Swift 6.0-RELEASE +* Mon Aug 26 2024 Zephyr Lykos - 6.0-1 - Export Swift development tool libraries to libdir -* Mon Jul 22 2024 Byoungchan Lee - 5.10.1-6 +* Mon Jul 22 2024 Byoungchan Lee - 6.0-1 - Minimize runtime/compile time dependencies -* Fri Jul 19 2024 Ron Olson - 5.10.1-5 -- Added libraries to cache -* Thu Jul 04 2024 Byoungchan Lee - 5.10.1-4 -- Use default Python for Fedora 41+ -* Tue Jun 25 2024 Ron Olson - 5.10.1-3 -- Enable LZMA -* Mon Jun 24 2024 Python Maint - 5.10.1-2.1 -- Rebuilt for Python 3.13 -* Sat Jun 22 2024 Ron Olson - 5.10.1-2 -- Changes for Fedora >= 41 and Python 3.13 -* Thu Jun 06 2024 Ron Olson - 5.10.1-1 -- Updated to Swift 5.10.1-RELEASE - Resolves: rhbz#2239543 +* Fri Jul 19 2024 Ron Olson - 6.0-1 +- Added file to add the Swift libraries to the ld.so.conf.d directory +* Sun Jun 30 2024 Ron Olson - 6.0-1 +- Patch from finagolfin + https://github.com/swiftlang/swift/pull/74814 * Tue Apr 23 2024 Ron Olson - 6.0-1 - First attempt at getting 6.0 working * Mon Sep 18 2023 Ron Olson - 5.9-1 diff --git a/swiftrto.patch b/swiftrto.patch deleted file mode 100644 index 3dcfd78..0000000 --- a/swiftrto.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- swift/lib/Driver/UnixToolChains.cpp.orig 2023-12-21 20:05:01.595459343 -0600 -+++ swift/lib/Driver/UnixToolChains.cpp 2023-12-21 20:06:27.482394420 -0600 -@@ -281,6 +281,9 @@ - llvm::sys::path::append(swiftrtPath, - swift::getMajorArchitectureName(getTriple())); - llvm::sys::path::append(swiftrtPath, "swiftrt.o"); -+ //Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); -+ // XYZZY -+ swiftrtPath = "/usr/libexec/swift/5.8.1/lib/swift/linux/x86_64/swiftrt.o"; - Arguments.push_back(context.Args.MakeArgString(swiftrtPath)); - - addPrimaryInputsOfType(Arguments, context.Inputs, context.Args, diff --git a/uintptr.patch b/uintptr.patch deleted file mode 100644 index 8bfc97e..0000000 --- a/uintptr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- llvm-project/llvm/include/llvm/Support/Signals.h.orig 2023-01-25 12:42:42.006799309 -0600 -+++ llvm-project/llvm/include/llvm/Support/Signals.h 2023-01-25 12:43:15.856946625 -0600 -@@ -15,6 +15,7 @@ - #define LLVM_SUPPORT_SIGNALS_H - - #include -+#include - - namespace llvm { - class StringRef; diff --git a/unusedvars.patch b/unusedvars.patch deleted file mode 100644 index 46e4bcf..0000000 --- a/unusedvars.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- swift-corelibs-libdispatch/src/shims/yield.c.orig 2022-09-16 12:04:16.691448773 -0500 -+++ swift-corelibs-libdispatch/src/shims/yield.c 2022-09-16 12:05:43.047145102 -0500 -@@ -25,6 +25,11 @@ - __DISPATCH_WAIT_FOR_ENQUEUER__(void **ptr) - { - int spins = 0; -+ int nothing = spins; -+ nothing = 23; -+ spins = nothing; -+ spins = 0; -+ - void *value; - while ((value = os_atomic_load(ptr, relaxed)) == NULL) { - _dispatch_preemption_yield(++spins); From 85f5e0c53066952793acba5a295bb6538e5dbdec Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Thu, 26 Sep 2024 09:36:07 -0500 Subject: [PATCH 132/152] Updated to Swift 6.0.1-RELEASE --- sources | 46 +++++++++++++++++++++++----------------------- swift-lang.spec | 11 ++++++----- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/sources b/sources index 0cee4ad..c1b5346 100644 --- a/sources +++ b/sources @@ -1,43 +1,43 @@ SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 -SHA512 (cmark.tar.gz) = 78c0cc3ba99dd2b81ad209a600deee6ca09a4b4d91df47a4e5eabbaf4f41254caa04b16c24f8cef157c60cc1e7c98b356e568d941a3426a09cfaf7d57f30d220 -SHA512 (corelibs-foundation.tar.gz) = 0e0b11e00d8563352f4a8197cd21fe3846b911e5c92dd0c397fc018f34b1d7f385f9376787aba5f9ecae59abfd34a9aad73db8a5613149242fe357eef444caca -SHA512 (corelibs-libdispatch.tar.gz) = 20435db6fac9fa5c50eb3f0ea5f5f6f60320a6167b3498fae9acc95bea6c257844a80b4451d0a5e3d78ec063773126c93309f59147dae8e9ada0a33dc7973e5e -SHA512 (corelibs-xctest.tar.gz) = fa9fd6ed04db179e262869be2fa495bfccdb1f4d6b80b5cf5c0ca3736f580dc7a4ca7e201c98a947d080f2a1c76622ce1c5a800e7f8e32317df90d776de5488f +SHA512 (cmark.tar.gz) = 5f5dd39e9e686b6872312193eb45d2b219e5d3867b5fb9c2a833adf6dbd93d54c022ce7e2b96c2a9006118c1b2acf676937a127a4a8341f316154c32ba6ba3ca +SHA512 (corelibs-foundation.tar.gz) = 4473cbf1601fcfa6931bb52e961c3fbaa7b649e3f8c53b9d192b1dd842b5b0d0ef97ced7bcd4e56b79beb19b05f7c1303de13a00fe371a039708b73bc78e7160 +SHA512 (corelibs-libdispatch.tar.gz) = b277dcfa15a9c7d0b6a7148b0c0d8cb000df314c9af3fb9461c6128ab64e89909f0ac8e7c68521e019024894e4cff5dac03597abcf91596541dcd7d40da180c4 +SHA512 (corelibs-xctest.tar.gz) = 9bfb582d42cc7a905df25204c6a7645ac3c0d167f9c3f1ea81be3ebe9cb6efabb5e410903c1644d2be06c18468caf3b9656c6a7e0abcc5b9b16cc9f0d2774a86 SHA512 (icu.zip) = 3deb56e8109783049c9dac04073aa084bcd92a0370b820ba4dbdad641a5a3f753f6ef8fd575ac82385fc1f2f224118313a6987d513991826ed7355307f6d9696 -SHA512 (indexstore-db.tar.gz) = 60c0778cf268a98235ad1e84a6bc08de97164268c57e281af9f0f24a8a3f8b5dbc9b2e6fd7913c95d780ad3af567f0551076746a31552f35c317a814dc443ea3 -SHA512 (llbuild.tar.gz) = 18c08144c3e03f2cc82e96d2d611729873c25e1647e6bfacd91f30480cbb23aa6a31312e63c6252e94dd098110304ec6858fb9dd00a1f0af0b355f4d467c99db -SHA512 (llvm-project.tar.gz) = ba8edfdd23a7a14deada2e3fdd16b56969e29275145f06602f83aa518d43c8520a883404a8f93e5f97405695036225e2f498e313c489d49f1a59701733b78a6c +SHA512 (indexstore-db.tar.gz) = e7c6da5fdab81c9f385f456b5a9ef6c0724e353c26d13b6d9ef9deab042a6a512cb2627bcf797c1456f4a2d4e58403db55184ebc0a0dbbe8f63698fc65d1065b +SHA512 (llbuild.tar.gz) = d38e3df709f795c002d5d77ee2faf593179d591a9acb9e5a74c06dca4a52ff2f9533ba43b6b76579980a4f5c5a6058e188cf2c5e5443501b00cf7c0760917ae9 +SHA512 (llvm-project.tar.gz) = c6943efd5407901ad8d5db885f3d03f5f5b7be006c01960c3a60a9a0f4e635e4e963bfa84d85cbdea10326f905524f091523ebdfbcd6b872b9c1a3d1ca94c691 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = a7e321ee75a2ca3a32e553c18a4288fa9c9c8d3f76f0997bc27fbccb3de9c3f81c6f2fbaf04fe97d7d011535ef766bd7bbe31933c62ab44e5c0d5a94c7b27bef -SHA512 (sourcekit-lsp.tar.gz) = c0d0393f135a8acf7af90783dd330bb0b8561e00878114f70eb721215cd0e6bffabba181b42ba1c19407fd165801698ac4e2d841b83ee26b2250d66d68853d9d +SHA512 (package-manager.tar.gz) = 483925892b96ae83aeb9849dd994ae4be2802735aa761b70809f155c3181cfba77cc7cfac72ccb3cad99ef3cdd6e62907915fcdafad05988a85994bb794959fc +SHA512 (sourcekit-lsp.tar.gz) = 9e96a03d47364627bdc5b5d6a028c2f4da99a790892045f2538bcb6b44d533c37b31278db8f3c1041d66e1acae913b618399494ab030664cdfb5f8d61c4a2582 SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 SHA512 (swift-collections.tar.gz) = 830a3a8923e498a58e5638bda5157c0a8ca20032daa73e752bb445314e3c8050cda85dfba78105f3e76d66832e804b8efc6c05aec117b687a83fc34e9c724639 SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = 804566cbbb2fb4ea78186e9fd8ebfc341a077e007e6f3712f56823b8a09d51e5653846b5783cb0ad7e394285ed8046713b3fa864bd73bb7ce6de247ff4f8921b -SHA512 (swift-docc-symbolkit.tar.gz) = 5aaac5e7acd3f12c085ca97b65c9ec1b28569b9a9063ac4cf2aa54015b9766872896f50483de02c9d06d2c178b6c5f77d08eced93a7ffec0dd0280d6f262325d -SHA512 (swift-docc.tar.gz) = 0c4942b2057c3c07f1eda73b28d5483a57668880cf33eeee0abea727490aacbf962091f845250d2b54349f9152935379b892f93b807572e4a7f5718b22f472fc -SHA512 (swift-driver.tar.gz) = 76dc13a8b4a364cae5d90320119a1bc631852ead0fff05e5935daf32b2baa1e9cc597038d8f199ffd306034cf6c2f53030db26b28a6d9605cd12d9fae917a7ba -SHA512 (swift-experimental-string-processing.tar.gz) = f14f186e731da37162d25d85805b44aaf9d88500ebbdfa99b49f78002ef7cc97c4051bc6b940fa2177a8efaf6397333e2cdd408f2bba5200c94b87f94acbff39 +SHA512 (swift-docc-render-artifact.tar.gz) = 07c2512e46ea38109f89fe0d5f09f419ed6be85b9e407613c300be769570c65d5d895ffbd0bc392c57aa1f9d0b65db665b92c3f4e5c0c37b6967471ca7652665 +SHA512 (swift-docc-symbolkit.tar.gz) = 2f7c87c77db7de1c9592b76e9586a148d5c1d63640fdc6bcea2b97fc7df43abf410aa220e3c6a86c98362d5867f2bb146b876f0944b4f2dc1390b8ee1a8a89f6 +SHA512 (swift-docc.tar.gz) = 3e80aab54c509097ad8edb27d605c31d89e2dea7c1939386ac34c2dde41a841f352631012e942a112ad87a8655dcde9e25ba417119ee69626c40addae75ba211 +SHA512 (swift-driver.tar.gz) = 42c9978ec26f9ed81b981f80bf4f12d4abf97a7f852a6d97bd564ca5eca8e26dad9e1acb19ed119b54301a828a6c6f52d6e5ab7f4fb29725fe42ca935978002d +SHA512 (swift-experimental-string-processing.tar.gz) = be5ef92d5ad8cd34fecd31dd427c275fdc537d2795ea5fd76e27484b6c43e1a3187b603c5544a5cde7806763f9fbf33103910a9054a2d27549028f847dac371f SHA512 (swift-format.zip) = 1de7cbd484020e354347c19dc3f2da8ab169f938df00382e126a07b8312f515d52eefebf20d3da3b8700b9d4c2a7fee73edd0793b6dd0120f93e550f1f19a09a SHA512 (swift-foundation-icu.zip) = f2e70bffcd6b998a6de6849e71f4cdc97bd28d8d5294823ef2857ee0a9aaabd98d76a4672858ec2c702a4775290d215b5ba81611dc17ec2da34a3dac46a26219 SHA512 (swift-foundation.zip) = 387549e00393d48db218cc95f5c0f66ea63f17cc3fc68ee3184fb4020a6ae88353377e771fc4a45b03bd580cb23386da15c00bbf3679dd6e7fc74438f0d099b2 -SHA512 (swift-integration-tests.tar.gz) = 3eac16036966d2f672382d712d4f930289e9e84ad029c5924dc5f93770529aed2fd09109bdd6b9c7d9f45cb58ff1e2889ec5264e028f623d2d4721a4da5ee3f3 +SHA512 (swift-integration-tests.tar.gz) = 5a7719455e75a8ae54838ca272764154437c5d9a984c035aa23988585ea2698882f97419780ff84b74ffce5da1cf67d6f4af8eae4dacd9e394f3b3f398d510a3 SHA512 (swift-llvm-bindings.zip) = ef5f5daa8b4cbdd90411a85ebb95bd6279cb4ad30d7a7ea52c8e3d613daa12b8639f7fd5073a6ff759846e3f292773ef446ed3af6f20fa61c9b9a91d61817e4a -SHA512 (swift-lmdb.tar.gz) = 7fc503c249c4c4a40c3fc9139a2e3b74ffca6cec8c7def4aa0681705765ac9130fd172183022df9f8bd06ee50dc82835d0d5fa362a3928b9f4985c635ee2f000 -SHA512 (swift-markdown.tar.gz) = 512ea06dde0896774c332ba09a7f00fc6b7fc4c0c7edcc550e32ed907824327a31ab7036040123910bbaaf905cb1338957285f592a59e8bb0501630a0656c8b7 +SHA512 (swift-lmdb.tar.gz) = d137067c79e802451fc4882908aebc986504f9b2c3cd25bdbfdf6d52aea1ee53c5a0f5ff5df591036814d241f5d1471a7a61bcef1dbafb80304ba807302b7b84 +SHA512 (swift-markdown.tar.gz) = 394a4e4d2b176a19aa0f5c294ce6da30cf3fc1d696c7cb53363ffe0187905c4d43d0475c94a02c5dd98a6cc7f56ba2ac4c5b1ca5f6220e4cbadbfc04d0ea8b37 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-stress-tester.tar.gz) = e5d1d5192891241134b202a78754c6b52633d9ad5418bb984e63a0e7b801cc9274d42bf4140b2cc4ee5706e17107b8b42eb29765a85e06c949e3774574079d6f -SHA512 (swift-syntax.tar.gz) = bde0a19a1d55c601d6af288c5c41097afeba96bd93c9ac085fb0967f7da9d3e266bf3f7fcf47098681007d336177cfde5d1f512ebf2293ed177c52a3e92b1a21 +SHA512 (swift-stress-tester.tar.gz) = 7aecac7ffa302d1812a0d7ef4ab6f21ba867ad90cb76bc547bc4bc3ad46d8a2db009464dc22f008c12ad1b280fe779add77c2cafa3d68a401c018e09d867f7bc +SHA512 (swift-syntax.tar.gz) = 06b9f1cf65d7adb686b587a8c52f95362f1a2543d013aba47e5101a9e3c097584f338465c8a4e1dc08f5d8f24fa0c2533e3e43b199b627002e54ea0e1b413ff9 SHA512 (swift-system.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 -SHA512 (swift-testing.tar.gz) = f5b0b4786b36159def1fe499867d2eebf961be5bc81d10294f8627aadb90b441dad7f7ad5fb5572798b36c54847c42059f95e1e2110b0b7484b67bd7d8de76b2 -SHA512 (swift-tools-support-core.tar.gz) = 11cdb401edb4397955ff7ee2e3eb9f0cae38ac82d02dbc2d29a6b61ef0df0fb718b7de81c7e778de86426702e327bd1e98d7185ee3c525261955ac97f351cd7a -SHA512 (swift-xcode-playground-support.tar.gz) = 7da126ccba4b81b157c7c09e9a20d6a0a6e275536169743c3a50d08d700699fc403e3fb111e2d4b1645a1d4af196cbc443c671a5c7461a6d9acf73a9166ca789 -SHA512 (swift.tar.gz) = 1b1c47bd94c6c9b8902fcc4b0ecab1a743ef71651c18c5a2612117ce60caacd202e23ea84aed862eec70ea175197a4d8037d76cf64a42bfdf2a482a41097876a +SHA512 (swift-testing.tar.gz) = b8ba58ed115dbbd4a0f864048a7a40df899d5639a24584a67bde7283b3e9495c55d133af774d57ad93fc3f697b9b90095e9541367a5cda0ccfca0b2deacd1697 +SHA512 (swift-tools-support-core.tar.gz) = d37f65e7fda89578c2ecfda3a0f3edfbf67b43ce7a5821e86e72cbec8d17f329a9ea518ecf3e8a51aa54e183cf0e982593a9978472fae51440faa14478f0f74a +SHA512 (swift-xcode-playground-support.tar.gz) = 0ce3abcbf04c20f1c06cba3c932e1807eb0d097f11f644f86abeb8f32d9ae981e74edaf627820e32467554aa462635d72add3e5905f2e3b2f29d4104a95af1d6 +SHA512 (swift.tar.gz) = f0cd74beb4312e6211f804f9ef5b3e66cc64e62e9f6c91863e1bb26a647a82e67ca041e5289a2a9922c24a4f24da7a8f44c41d682460084e67642d5df73a6dee SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff SHA512 (yams.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 diff --git a/swift-lang.spec b/swift-lang.spec index 9e8429e..f2e3d44 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -12,9 +12,9 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 6.0-RELEASE +%global swift_version 6.0.1-RELEASE +%global package_version 6.0.1 %global fedora_release 1 -%global package_version 6.0 %global swift_source_location swift-source @@ -109,13 +109,11 @@ BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: libxml2-devel -BuildRequires: libsqlite3x-devel -BuildRequires: libdispatch-devel +BuildRequires: sqlite-devel BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: perl-podlators -BuildRequires: python-unversioned-command BuildRequires: swiftlang BuildRequires: lld @@ -279,6 +277,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Sep 25 2024 Ron Olson - 6.0.1-1 +- Updated to Swift 6.0.1-RELEASE + Resolves: rhbz#2313366 * Mon Sep 16 2024 Ron Olson - 6.0-1 - Updated to Swift 6.0-RELEASE * Mon Aug 26 2024 Zephyr Lykos - 6.0-1 From 5f9d4ba0acaec02b8f9636878f08f7d20005747e Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Sat, 23 Nov 2024 13:57:27 -0600 Subject: [PATCH 133/152] Updated to Swift 6.0.2-RELEASE --- clang_crash_fix.patch | 11 ++++++++ disable_warning.patch | 37 +++++++++++++++++++++++++++ no_testable_package.patch | 11 ++++++++ resource_dir.patch | 20 +++++++-------- sources | 50 ++++++++++++++++++------------------ swift-lang.spec | 54 ++++++++++++++++++++++++++++++++++----- 6 files changed, 141 insertions(+), 42 deletions(-) create mode 100644 clang_crash_fix.patch create mode 100644 disable_warning.patch create mode 100644 no_testable_package.patch diff --git a/clang_crash_fix.patch b/clang_crash_fix.patch new file mode 100644 index 0000000..4b3801b --- /dev/null +++ b/clang_crash_fix.patch @@ -0,0 +1,11 @@ +--- swiftpm/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift.orig 2024-11-23 08:51:29.212470347 -0600 ++++ swiftpm/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift 2024-11-23 08:51:57.609260467 -0600 +@@ -406,7 +406,7 @@ + case .debug: + return ["-O0"] + case .release: +- return ["-O2"] ++ return ["-O1"] + } + } + diff --git a/disable_warning.patch b/disable_warning.patch new file mode 100644 index 0000000..a9d3a50 --- /dev/null +++ b/disable_warning.patch @@ -0,0 +1,37 @@ +diff --color -Naur swift-corelibs-libdispatch-orig/src/apply.c swift-corelibs-libdispatch/src/apply.c +--- swift-corelibs-libdispatch-orig/src/apply.c 2024-11-08 21:55:26.837737053 -0600 ++++ swift-corelibs-libdispatch/src/apply.c 2024-11-08 21:55:45.136893055 -0600 +@@ -20,6 +20,9 @@ + + #include "internal.h" + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wcast-function-type-mismatch" ++ + typedef void (*dispatch_apply_function_t)(void *, size_t); + static char const * const _dispatch_apply_key = "apply"; + +@@ -366,3 +369,5 @@ + (dispatch_apply_function_t)_dispatch_Block_invoke(work)); + } + #endif ++ ++#pragma GCC diagnostic pop +diff --color -Naur swift-corelibs-libdispatch-orig/src/data.c swift-corelibs-libdispatch/src/data.c +--- swift-corelibs-libdispatch-orig/src/data.c 2024-11-08 21:55:26.837737053 -0600 ++++ swift-corelibs-libdispatch/src/data.c 2024-11-08 21:55:53.953450013 -0600 +@@ -20,6 +20,8 @@ + + #include "internal.h" + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wcast-function-type-mismatch" + /* + * Dispatch data objects are dispatch objects with standard retain/release + * memory management. A dispatch data object either points to a number of other +@@ -738,3 +740,5 @@ + return mep; + } + #endif // HAVE_MACH ++ ++#pragma GCC diagnostic pop diff --git a/no_testable_package.patch b/no_testable_package.patch new file mode 100644 index 0000000..dee925c --- /dev/null +++ b/no_testable_package.patch @@ -0,0 +1,11 @@ +--- swift/utils/build-presets.ini.orig 2024-11-11 12:30:06.743565294 -0600 ++++ swift/utils/build-presets.ini 2024-11-11 12:31:15.936936014 -0600 +@@ -870,7 +870,7 @@ + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out + +-test-installable-package ++# test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks diff --git a/resource_dir.patch b/resource_dir.patch index c2000b9..9d924f5 100644 --- a/resource_dir.patch +++ b/resource_dir.patch @@ -1,4 +1,4 @@ -From f189a95d6371cdb44f773029f7a19b94f0d9a839 Mon Sep 17 00:00:00 2001 +From b7ec9c840722d19dfc81411da02916d30da12893 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Fri, 28 Jun 2024 20:06:06 +0530 Subject: [PATCH] [ClangImporter] Make sure the `-resource-dir` is checked @@ -7,14 +7,14 @@ Subject: [PATCH] [ClangImporter] Make sure the `-resource-dir` is checked Otherwise, these module maps can be pulled from a system SDK instead when building a fresh Swift stdlib, fixes #74696. --- - lib/ClangImporter/ClangIncludePaths.cpp | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) + lib/ClangImporter/ClangIncludePaths.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ClangImporter/ClangIncludePaths.cpp b/lib/ClangImporter/ClangIncludePaths.cpp -index 23431af724459..7e6ca8c2a9cb6 100644 +index 77173166ba494..7399a01b57c62 100644 --- a/lib/ClangImporter/ClangIncludePaths.cpp +++ b/lib/ClangImporter/ClangIncludePaths.cpp -@@ -35,10 +35,10 @@ static std::optional getActualModuleMapPath( +@@ -35,10 +35,9 @@ static std::optional getActualModuleMapPath( Path result; @@ -23,24 +23,24 @@ index 23431af724459..7e6ca8c2a9cb6 100644 - result.append(SDKPath.begin(), SDKPath.end()); - llvm::sys::path::append(result, "usr", "lib", "swift"); + if (!Opts.RuntimeResourcePath.empty()) { -+ result.clear(); + result.append(Opts.RuntimeResourcePath.begin(), + Opts.RuntimeResourcePath.end()); llvm::sys::path::append(result, platform); if (isArchSpecific) { llvm::sys::path::append(result, arch); -@@ -52,10 +52,10 @@ static std::optional getActualModuleMapPath( +@@ -52,10 +51,11 @@ static std::optional getActualModuleMapPath( return result; } - if (!Opts.RuntimeResourcePath.empty()) { -- result.clear(); -- result.append(Opts.RuntimeResourcePath.begin(), -- Opts.RuntimeResourcePath.end()); + StringRef SDKPath = Opts.getSDKPath(); + if (!SDKPath.empty()) { + result.clear(); +- result.append(Opts.RuntimeResourcePath.begin(), +- Opts.RuntimeResourcePath.end()); + result.append(SDKPath.begin(), SDKPath.end()); + llvm::sys::path::append(result, "usr", "lib", "swift"); llvm::sys::path::append(result, platform); if (isArchSpecific) { llvm::sys::path::append(result, arch); + diff --git a/sources b/sources index c1b5346..18bf064 100644 --- a/sources +++ b/sources @@ -1,43 +1,43 @@ SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 -SHA512 (cmark.tar.gz) = 5f5dd39e9e686b6872312193eb45d2b219e5d3867b5fb9c2a833adf6dbd93d54c022ce7e2b96c2a9006118c1b2acf676937a127a4a8341f316154c32ba6ba3ca -SHA512 (corelibs-foundation.tar.gz) = 4473cbf1601fcfa6931bb52e961c3fbaa7b649e3f8c53b9d192b1dd842b5b0d0ef97ced7bcd4e56b79beb19b05f7c1303de13a00fe371a039708b73bc78e7160 -SHA512 (corelibs-libdispatch.tar.gz) = b277dcfa15a9c7d0b6a7148b0c0d8cb000df314c9af3fb9461c6128ab64e89909f0ac8e7c68521e019024894e4cff5dac03597abcf91596541dcd7d40da180c4 -SHA512 (corelibs-xctest.tar.gz) = 9bfb582d42cc7a905df25204c6a7645ac3c0d167f9c3f1ea81be3ebe9cb6efabb5e410903c1644d2be06c18468caf3b9656c6a7e0abcc5b9b16cc9f0d2774a86 +SHA512 (cmark.tar.gz) = a7b2a2bb49e2f46da8121f401b23c6d86f082bcd9c22e386e33d7c92af8a9a026291872d71c35d3e7521e504388d7e1943d5107303e49e99de27433f4e26b179 +SHA512 (corelibs-foundation.tar.gz) = aea6cd3a40fda77383c0f34fc301fd55f8309e9501d2917509635663c818ff8897ac8811c91bc13fe29f24bcff39eef0bb0c4f8c169d2b8715655542a4fa1e22 +SHA512 (corelibs-libdispatch.tar.gz) = a2e8439fcd8236068bb9dafbac56991e7a013e848ed07c879d6d02a9ac258010da70538154c35af8341b1987d67b4310ad54a8d1778ed5bfe7a4dba6cfce60a6 +SHA512 (corelibs-xctest.tar.gz) = 67bf72f6dece61ea16627086ee7a8412fc8854571c8a7207cf5ccbe4ba4b2482ead4d3f79fb2a7ca3c3965fc9043df1ea7cccf1257cf43e5e7843ccebce6c5bb SHA512 (icu.zip) = 3deb56e8109783049c9dac04073aa084bcd92a0370b820ba4dbdad641a5a3f753f6ef8fd575ac82385fc1f2f224118313a6987d513991826ed7355307f6d9696 -SHA512 (indexstore-db.tar.gz) = e7c6da5fdab81c9f385f456b5a9ef6c0724e353c26d13b6d9ef9deab042a6a512cb2627bcf797c1456f4a2d4e58403db55184ebc0a0dbbe8f63698fc65d1065b -SHA512 (llbuild.tar.gz) = d38e3df709f795c002d5d77ee2faf593179d591a9acb9e5a74c06dca4a52ff2f9533ba43b6b76579980a4f5c5a6058e188cf2c5e5443501b00cf7c0760917ae9 -SHA512 (llvm-project.tar.gz) = c6943efd5407901ad8d5db885f3d03f5f5b7be006c01960c3a60a9a0f4e635e4e963bfa84d85cbdea10326f905524f091523ebdfbcd6b872b9c1a3d1ca94c691 +SHA512 (indexstore-db.tar.gz) = 9a5fbcc929dfb647ddc3369bd030a2d0892aba613aa52ba84afaac61d2549b2da0975e6fd76b765216c4e30d9c7241e8e9597fea51ae32cfd27df32b108b13bf +SHA512 (llbuild.tar.gz) = 5782aaf63c3b30f54e6c7e85e5c135a15aad786bc9a3d5f8415b894a7f36ad9b13d68c5015682bfac7a93d8276a8f1f8723e111031745de9d613d59710eb3cea +SHA512 (llvm-project.tar.gz) = b410df94c65f4f121bf11ca23cdf6ea5a29c4676904ee03e3685c3d16f984a2164b7b3a7a5dec4d528fba148553b422d326bd7f2f54475b2824381d3a46c1946 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 483925892b96ae83aeb9849dd994ae4be2802735aa761b70809f155c3181cfba77cc7cfac72ccb3cad99ef3cdd6e62907915fcdafad05988a85994bb794959fc -SHA512 (sourcekit-lsp.tar.gz) = 9e96a03d47364627bdc5b5d6a028c2f4da99a790892045f2538bcb6b44d533c37b31278db8f3c1041d66e1acae913b618399494ab030664cdfb5f8d61c4a2582 +SHA512 (package-manager.tar.gz) = 1f4ac6dbf250850e9f219e62955157913f8a80feea4554d59ddf5dbd7489e0b8b20add7e0c03555fda6cf6190322c5440aba8de711a67ce51fc7396a92ac089d +SHA512 (sourcekit-lsp.tar.gz) = 80134c860652df83e0e8fd9f474fd77e493b41a93f77bc7d81f7f9a0eff5aa17d431cbbcdd72e625bad54d1451c81a25c0d33b70ce48544b5d39a7a9870af692 SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 SHA512 (swift-collections.tar.gz) = 830a3a8923e498a58e5638bda5157c0a8ca20032daa73e752bb445314e3c8050cda85dfba78105f3e76d66832e804b8efc6c05aec117b687a83fc34e9c724639 SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = 07c2512e46ea38109f89fe0d5f09f419ed6be85b9e407613c300be769570c65d5d895ffbd0bc392c57aa1f9d0b65db665b92c3f4e5c0c37b6967471ca7652665 -SHA512 (swift-docc-symbolkit.tar.gz) = 2f7c87c77db7de1c9592b76e9586a148d5c1d63640fdc6bcea2b97fc7df43abf410aa220e3c6a86c98362d5867f2bb146b876f0944b4f2dc1390b8ee1a8a89f6 -SHA512 (swift-docc.tar.gz) = 3e80aab54c509097ad8edb27d605c31d89e2dea7c1939386ac34c2dde41a841f352631012e942a112ad87a8655dcde9e25ba417119ee69626c40addae75ba211 -SHA512 (swift-driver.tar.gz) = 42c9978ec26f9ed81b981f80bf4f12d4abf97a7f852a6d97bd564ca5eca8e26dad9e1acb19ed119b54301a828a6c6f52d6e5ab7f4fb29725fe42ca935978002d -SHA512 (swift-experimental-string-processing.tar.gz) = be5ef92d5ad8cd34fecd31dd427c275fdc537d2795ea5fd76e27484b6c43e1a3187b603c5544a5cde7806763f9fbf33103910a9054a2d27549028f847dac371f -SHA512 (swift-format.zip) = 1de7cbd484020e354347c19dc3f2da8ab169f938df00382e126a07b8312f515d52eefebf20d3da3b8700b9d4c2a7fee73edd0793b6dd0120f93e550f1f19a09a +SHA512 (swift-docc-render-artifact.tar.gz) = 4927b61ddb59c8d8d21585460047026c759fa223b8bc3ccd7fcaac6a265805f332b3ee041343c74adc221cac26f4ea5aa4b7c9ebf2d1d1ef73a5aa77344e2706 +SHA512 (swift-docc-symbolkit.tar.gz) = a9b4fec8c2278bb71722891ff236aef4a786c4ae2f159faec831066cba994ad93bc6963d907ed48c8a61dbf2dacdd707871aa6134adb2b59719e1dcf988ef6c2 +SHA512 (swift-docc.tar.gz) = d10457e244c87d7d552dda67a5a1ba7181b80f7abd353fb2a89613741da5cc96f31861abbf7d1799a8a255ba4ef3943ea478795a27dffd45a7128c4ed0601991 +SHA512 (swift-driver.tar.gz) = 0ffb394c759b2f84dba1986925220b194623d326d94c9d5eb663af283ca6e4073810e02c43b6b4ff46516d98e1da60b4a6c14bd022422dac83b3a3283df358db +SHA512 (swift-experimental-string-processing.tar.gz) = 9b8e4b0e1136d399a12b2cf5175688565d52c6e8324f14a0b07d182188d5aa8a2d05e141f98787c2b0e6e985b576406fbf6728a14c2cd01b249a3db5631dd485 +SHA512 (swift-format.zip) = 0e4ecce3f3b26927cf65109f3b551e5d38b5aa35cdd1ded93736385fec88a612130cddf9f0f04db12a4f144c1f5e4f091fc2328b18473306cf2290ea434b86c5 SHA512 (swift-foundation-icu.zip) = f2e70bffcd6b998a6de6849e71f4cdc97bd28d8d5294823ef2857ee0a9aaabd98d76a4672858ec2c702a4775290d215b5ba81611dc17ec2da34a3dac46a26219 -SHA512 (swift-foundation.zip) = 387549e00393d48db218cc95f5c0f66ea63f17cc3fc68ee3184fb4020a6ae88353377e771fc4a45b03bd580cb23386da15c00bbf3679dd6e7fc74438f0d099b2 -SHA512 (swift-integration-tests.tar.gz) = 5a7719455e75a8ae54838ca272764154437c5d9a984c035aa23988585ea2698882f97419780ff84b74ffce5da1cf67d6f4af8eae4dacd9e394f3b3f398d510a3 +SHA512 (swift-foundation.zip) = 202946c5c3b97bf7b09560d3d1bd6af8fcc6f5ee475175c197df6af1cb1f3d695970de8c890e49fe60c86fb67dedf308f1bd9c8fa9e0a58b56ea222590cf88cb +SHA512 (swift-integration-tests.tar.gz) = 79bc5bb6dee4ff9408e0c6ccbe5184e469da52616d4726634ef32d7c1de04b65e67ed87c3b8eec84402ca1e2c0bf27dc22ecacb8f918b4fe4a64f68d93c697e4 SHA512 (swift-llvm-bindings.zip) = ef5f5daa8b4cbdd90411a85ebb95bd6279cb4ad30d7a7ea52c8e3d613daa12b8639f7fd5073a6ff759846e3f292773ef446ed3af6f20fa61c9b9a91d61817e4a -SHA512 (swift-lmdb.tar.gz) = d137067c79e802451fc4882908aebc986504f9b2c3cd25bdbfdf6d52aea1ee53c5a0f5ff5df591036814d241f5d1471a7a61bcef1dbafb80304ba807302b7b84 -SHA512 (swift-markdown.tar.gz) = 394a4e4d2b176a19aa0f5c294ce6da30cf3fc1d696c7cb53363ffe0187905c4d43d0475c94a02c5dd98a6cc7f56ba2ac4c5b1ca5f6220e4cbadbfc04d0ea8b37 +SHA512 (swift-lmdb.tar.gz) = 3936c8c569e68e41bef5167f586c4f61ad0399896b1dc7c60eb5c0c6eb041fa671e632dc2b071d6dbdc1a8fd492a4f02cfd8454e3218bfabdf110330d649bb99 +SHA512 (swift-markdown.tar.gz) = 33f8c39a7a0fc67c4993bc7ff3ce000195c20d9a6334442bed80ec6d1cfc0e344f7a5b746eb2be305a51f55ea6e37624e4d0bdb687f96bf7dcdfbc51608f7ec4 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-stress-tester.tar.gz) = 7aecac7ffa302d1812a0d7ef4ab6f21ba867ad90cb76bc547bc4bc3ad46d8a2db009464dc22f008c12ad1b280fe779add77c2cafa3d68a401c018e09d867f7bc -SHA512 (swift-syntax.tar.gz) = 06b9f1cf65d7adb686b587a8c52f95362f1a2543d013aba47e5101a9e3c097584f338465c8a4e1dc08f5d8f24fa0c2533e3e43b199b627002e54ea0e1b413ff9 +SHA512 (swift-stress-tester.tar.gz) = 01093ace06cb1ee7d2e64fcc5a73a54ad7f4074fcd648e0f7fb2fd7bebeb046d1b4cee6aa2c2e29852d73e2af3f8c05f6ac3c8159e62b1794b9e95137595d415 +SHA512 (swift-syntax.tar.gz) = bf38508befe788ff7084699cf79f6e8229b57975ada0b401cd4321cfdda37d3337ea5498ccf0ecc563b164d10d582b250b99a84ae79d92e60b18d880b6d4a057 SHA512 (swift-system.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 -SHA512 (swift-testing.tar.gz) = b8ba58ed115dbbd4a0f864048a7a40df899d5639a24584a67bde7283b3e9495c55d133af774d57ad93fc3f697b9b90095e9541367a5cda0ccfca0b2deacd1697 -SHA512 (swift-tools-support-core.tar.gz) = d37f65e7fda89578c2ecfda3a0f3edfbf67b43ce7a5821e86e72cbec8d17f329a9ea518ecf3e8a51aa54e183cf0e982593a9978472fae51440faa14478f0f74a -SHA512 (swift-xcode-playground-support.tar.gz) = 0ce3abcbf04c20f1c06cba3c932e1807eb0d097f11f644f86abeb8f32d9ae981e74edaf627820e32467554aa462635d72add3e5905f2e3b2f29d4104a95af1d6 -SHA512 (swift.tar.gz) = f0cd74beb4312e6211f804f9ef5b3e66cc64e62e9f6c91863e1bb26a647a82e67ca041e5289a2a9922c24a4f24da7a8f44c41d682460084e67642d5df73a6dee +SHA512 (swift-testing.tar.gz) = b128189427a1e741fe5352ba6a416c66e0bbff1cc513f59eadcd6204933309a705601863cd587420f58c6914ffc606d12996134411289eca6496e16d4af2ff37 +SHA512 (swift-tools-support-core.tar.gz) = 976b25254b198d806eed7249e033c1589eabb3fab8016e09e106c8f6c57c6a6f90fc72e63620100048b10a14a62f194ca408af31efd618613d9ff922b0c789ba +SHA512 (swift-xcode-playground-support.tar.gz) = 08880201015e09e0c00c69950502f72d848a6c2f1a2cf1756d8e772aff689006b4e020869bc5a38971f235dd612d791477208384691e8bbe3c293143dd480289 +SHA512 (swift.tar.gz) = c27b9e6ab3cfbf2e8543b5dffca23886add9c34e92def572bf9ffda56696ed3bae0f443831e03f8fdb82195fe80fd864f1524e8e1e9441d82adb79c77dcbb44b SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff SHA512 (yams.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 diff --git a/swift-lang.spec b/swift-lang.spec index f2e3d44..d94aaf5 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,6 @@ -# 6/27/24 - temporary disable __brp_add_determinism -# as it prevents the package from successfully building + %if 0%{?fedora} >= 41 -# on Fedora 41/Rawhide +# on Fedora >= 41 %undefine __brp_add_determinism %endif %global debug_package %{nil} @@ -12,8 +11,8 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 6.0.1-RELEASE -%global package_version 6.0.1 +%global swift_version 6.0.2-RELEASE +%global package_version 6.0.2 %global fedora_release 1 %global swift_source_location swift-source @@ -101,6 +100,9 @@ Patch3: enable_lzma.patch Patch4: resource_dir.patch Patch5: have_strcat.patch Patch6: latest_python.patch +Patch7: disable_warning.patch +Patch8: no_testable_package.patch +Patch9: clang_crash_fix.patch BuildRequires: clang BuildRequires: swig @@ -121,10 +123,30 @@ Requires: glibc-devel Requires: binutils-gold Requires: gcc +Recommends: libstdc++-devel +Recommends: gcc-c++ + ExclusiveArch: x86_64 aarch64 Provides: swiftlang = %{version}-%{release} +# https://bugzilla.redhat.com/show_bug.cgi?id=2291122 +# (python3-swiftclient provides a program called "swift" +# that clashes with the binary created by this package) +# This is currently for all versions, so we don't +# specify one +Conflicts: python3-swiftclient + + +# Per https://bugzilla.redhat.com/show_bug.cgi?id=2324076 we +# need to exclude all of the LLVM libraries, basically everything +# we bundle, from being picked up by the RPM dependency +# generator for "provides" (i.e. we don't want to have our +# version of liblldb.so found when someone is searching for +# general version of LLDB). +%global __provides_exclude ^(libLTO[.]so.*|libclang_rt.*.so.*|liblldb[.]so.*)$ +%global __requires_exclude ^(libLTO[.]so.*|libclang_rt.*.so.*|liblldb[.]so.*)$ + %description Swift is a general-purpose programming language built using @@ -229,9 +251,23 @@ popd %patch -P6 -p0 %endif +# disable warning treated as error in libdispatch +%patch -P7 -p0 + +# Disable integration tests as they are causing the packaging +# to fail (after Swift has been successfully built) +%patch -P8 -p0 + +# The clang compiler crashes on Fedora 42 and Rawhide +# on x86_64 on a particular file +%if 0%{?fedora} >= 42 +%ifarch x86_64 +%patch -P9 -p0 +%endif +%endif + %build export VERBOSE=1 - # Here we go! swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz @@ -277,9 +313,13 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Nov 14 2024 Ron Olson - 6.0.2-1 +- Updated to Swift 6.0.2-RELEASE + Resolves: rhbz#2291122 + Resolves: rhbz#2322729 + Resolves: rhbz#2324076 * Wed Sep 25 2024 Ron Olson - 6.0.1-1 - Updated to Swift 6.0.1-RELEASE - Resolves: rhbz#2313366 * Mon Sep 16 2024 Ron Olson - 6.0-1 - Updated to Swift 6.0-RELEASE * Mon Aug 26 2024 Zephyr Lykos - 6.0-1 From 87d1549cc072a8f76c545bc8c1745bfbcea0011b Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Tue, 10 Dec 2024 08:11:47 +0800 Subject: [PATCH 134/152] Fix libdir symlink installation --- swift-lang.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index d94aaf5..6c9cf7b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -13,7 +13,7 @@ ################################################# %global swift_version 6.0.2-RELEASE %global package_version 6.0.2 -%global fedora_release 1 +%global fedora_release 2 %global swift_source_location swift-source @@ -284,7 +284,10 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 mkdir -p %{buildroot}/usr/lib ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift mkdir -p %{buildroot}%{_libdir} -ln -fs %{_libexecdir}/swift/%{package_version}/lib/lib{IndexStore,sourcekitdInProc,swiftDemangle}.so* %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{package_version}/lib/libIndexStore.so %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{package_version}/lib/libIndexStore.so.17 %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{package_version}/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{package_version}/lib/libswiftDemangle.so %{buildroot}%{_libdir}/ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ install -m 0644 %{SOURCE44} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf @@ -303,8 +306,8 @@ export QA_SKIP_RPATHS=1 %{_libexecdir}/swift/ %{_usr}/lib/swift %{_libdir}/libIndexStore.so* -%{_libdir}/libsourcekitdInProc.so* -%{_libdir}/libswiftDemangle.so* +%{_libdir}/libsourcekitdInProc.so +%{_libdir}/libswiftDemangle.so %{_sysconfdir}/ld.so.conf.d/swiftlang.conf @@ -313,6 +316,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Tue Dec 10 2024 Zephyr Lykos - 6.0.2-2 +- fix libdir symlink installation * Thu Nov 14 2024 Ron Olson - 6.0.2-1 - Updated to Swift 6.0.2-RELEASE Resolves: rhbz#2291122 From 0b5c3f8fbf13b09910e6dbe097b0ba74750d1fd4 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Fri, 13 Dec 2024 10:22:54 -0600 Subject: [PATCH 135/152] Updated to Swift-6.0.3-RELEASE --- sources | 46 +++++++++++++++++++++++----------------------- swift-lang.spec | 14 ++++++-------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/sources b/sources index 18bf064..23e982b 100644 --- a/sources +++ b/sources @@ -1,43 +1,43 @@ SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 -SHA512 (cmark.tar.gz) = a7b2a2bb49e2f46da8121f401b23c6d86f082bcd9c22e386e33d7c92af8a9a026291872d71c35d3e7521e504388d7e1943d5107303e49e99de27433f4e26b179 -SHA512 (corelibs-foundation.tar.gz) = aea6cd3a40fda77383c0f34fc301fd55f8309e9501d2917509635663c818ff8897ac8811c91bc13fe29f24bcff39eef0bb0c4f8c169d2b8715655542a4fa1e22 -SHA512 (corelibs-libdispatch.tar.gz) = a2e8439fcd8236068bb9dafbac56991e7a013e848ed07c879d6d02a9ac258010da70538154c35af8341b1987d67b4310ad54a8d1778ed5bfe7a4dba6cfce60a6 -SHA512 (corelibs-xctest.tar.gz) = 67bf72f6dece61ea16627086ee7a8412fc8854571c8a7207cf5ccbe4ba4b2482ead4d3f79fb2a7ca3c3965fc9043df1ea7cccf1257cf43e5e7843ccebce6c5bb +SHA512 (cmark.tar.gz) = d9492f141fb19f39e3b13ac1f2454db64539deb980d0dabac94c76e6ec4a6f19a8d1b5baf12fc7412f6e531b56ca78484f7927450b27832a4829605af9862cef +SHA512 (corelibs-foundation.tar.gz) = d16b9ae36744fa2e56a11dda235eae79a4e505d830ef06275100559afcdc83d8115ba0635ce67916c1305cc2a0f34a2bea21981ea8801f06dbd190eec0d2c404 +SHA512 (corelibs-libdispatch.tar.gz) = e99ad645deb804320cbbbd7a9bcaaa87ea106507d77791147603e027abafba28a815e63c1e93cc903ae5ef2631c78854b46af89a6bb9ef7b521fe322a571deb6 +SHA512 (corelibs-xctest.tar.gz) = 287c00f6c3aa534f25af1bd2ba280086c2f69ec5cc9327804c3b8e7bd3a113257a56fd9c19d5a663081a3e26f6b44c6313e33defc12156a217ea8c0958fabda0 SHA512 (icu.zip) = 3deb56e8109783049c9dac04073aa084bcd92a0370b820ba4dbdad641a5a3f753f6ef8fd575ac82385fc1f2f224118313a6987d513991826ed7355307f6d9696 -SHA512 (indexstore-db.tar.gz) = 9a5fbcc929dfb647ddc3369bd030a2d0892aba613aa52ba84afaac61d2549b2da0975e6fd76b765216c4e30d9c7241e8e9597fea51ae32cfd27df32b108b13bf -SHA512 (llbuild.tar.gz) = 5782aaf63c3b30f54e6c7e85e5c135a15aad786bc9a3d5f8415b894a7f36ad9b13d68c5015682bfac7a93d8276a8f1f8723e111031745de9d613d59710eb3cea -SHA512 (llvm-project.tar.gz) = b410df94c65f4f121bf11ca23cdf6ea5a29c4676904ee03e3685c3d16f984a2164b7b3a7a5dec4d528fba148553b422d326bd7f2f54475b2824381d3a46c1946 +SHA512 (indexstore-db.tar.gz) = c65aced91616858c7946aa7c65d0e11027afe39a7b86c961a13830ad22a352b959331133ec4d179d21edd3696d2bf5a89907c044f25426259a6e21f4e87a84ad +SHA512 (llbuild.tar.gz) = 3dd399fef0da472742b6e180896c53cf685ffed49467f1a145cad8ae64e784e7368190858cf79810b47bd56d294a3c337e6bbf587b93efa3350c29928ac6444d +SHA512 (llvm-project.tar.gz) = d4d515c5a232dfc9d2ad8ff62b5703d746327a1477641d2baacbb68a61e5babdedddcd0f19dd79968e83e4c5eabc4ab892035bf8aaf1ad1f8181fb9cf68f1139 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 1f4ac6dbf250850e9f219e62955157913f8a80feea4554d59ddf5dbd7489e0b8b20add7e0c03555fda6cf6190322c5440aba8de711a67ce51fc7396a92ac089d -SHA512 (sourcekit-lsp.tar.gz) = 80134c860652df83e0e8fd9f474fd77e493b41a93f77bc7d81f7f9a0eff5aa17d431cbbcdd72e625bad54d1451c81a25c0d33b70ce48544b5d39a7a9870af692 +SHA512 (package-manager.tar.gz) = 580028d0a9e20dcef2778681000c89bdd400ead6a273e15208ec36dbe0ce7797726cc2df12f8f36f09c653b19a38abaeb79323c770b4def02c3587ab3e0436cc +SHA512 (sourcekit-lsp.tar.gz) = 613fe106b442d9c6228cd2e4fdb8b464c23f11c4e95d4cebd21c2fd7cd6fbe666ccd3b6f7814160bffc8e77251eac4d21ac8acd8c0d7df5b5b0928a06aeaa258 SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 SHA512 (swift-collections.tar.gz) = 830a3a8923e498a58e5638bda5157c0a8ca20032daa73e752bb445314e3c8050cda85dfba78105f3e76d66832e804b8efc6c05aec117b687a83fc34e9c724639 SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = 4927b61ddb59c8d8d21585460047026c759fa223b8bc3ccd7fcaac6a265805f332b3ee041343c74adc221cac26f4ea5aa4b7c9ebf2d1d1ef73a5aa77344e2706 -SHA512 (swift-docc-symbolkit.tar.gz) = a9b4fec8c2278bb71722891ff236aef4a786c4ae2f159faec831066cba994ad93bc6963d907ed48c8a61dbf2dacdd707871aa6134adb2b59719e1dcf988ef6c2 -SHA512 (swift-docc.tar.gz) = d10457e244c87d7d552dda67a5a1ba7181b80f7abd353fb2a89613741da5cc96f31861abbf7d1799a8a255ba4ef3943ea478795a27dffd45a7128c4ed0601991 -SHA512 (swift-driver.tar.gz) = 0ffb394c759b2f84dba1986925220b194623d326d94c9d5eb663af283ca6e4073810e02c43b6b4ff46516d98e1da60b4a6c14bd022422dac83b3a3283df358db -SHA512 (swift-experimental-string-processing.tar.gz) = 9b8e4b0e1136d399a12b2cf5175688565d52c6e8324f14a0b07d182188d5aa8a2d05e141f98787c2b0e6e985b576406fbf6728a14c2cd01b249a3db5631dd485 +SHA512 (swift-docc-render-artifact.tar.gz) = dcc9ebc451c037416afe9912cdc18ce10f950ab2e64900cf93734a7c59c4bdbb9e17f10e2bf80bbdb253a87ecc0f5935aa99c5e30ac858a15d11c064af463af1 +SHA512 (swift-docc-symbolkit.tar.gz) = 37636c79ffbe5bb3dfa5007c5ac3834da439338ded5b8030a68c41dfb8f89ad16ddbba6cccde86410cef48f3bc36981ee15a70ef10b282ef021a7063e94251ee +SHA512 (swift-docc.tar.gz) = dc9d873a6c4ab484acf396e58ca71ee169b942bd2e654dbd5b537de33f6e7ce96c1ca527876ca2ad2fec2a5b42da72d9cf186ef5f35d85a29bb233df303aad62 +SHA512 (swift-driver.tar.gz) = aa31717e10cc82e4d7721fa2ed8c9c5e704b854c68e0c1c4479dd70a6e02348df55aa4afe9d3ea4acfd7041ac0568362283cd52b72e6985b7ca99ecd39952640 +SHA512 (swift-experimental-string-processing.tar.gz) = 74eb94bd5edb2c793cdbb7eb74d93110e8bb10d5f9dc02649efff76840d58b5cc62d62ba65fb77dfdada33fdd755ea97f9f955f981841713795e7a0bafdb69e4 SHA512 (swift-format.zip) = 0e4ecce3f3b26927cf65109f3b551e5d38b5aa35cdd1ded93736385fec88a612130cddf9f0f04db12a4f144c1f5e4f091fc2328b18473306cf2290ea434b86c5 SHA512 (swift-foundation-icu.zip) = f2e70bffcd6b998a6de6849e71f4cdc97bd28d8d5294823ef2857ee0a9aaabd98d76a4672858ec2c702a4775290d215b5ba81611dc17ec2da34a3dac46a26219 SHA512 (swift-foundation.zip) = 202946c5c3b97bf7b09560d3d1bd6af8fcc6f5ee475175c197df6af1cb1f3d695970de8c890e49fe60c86fb67dedf308f1bd9c8fa9e0a58b56ea222590cf88cb -SHA512 (swift-integration-tests.tar.gz) = 79bc5bb6dee4ff9408e0c6ccbe5184e469da52616d4726634ef32d7c1de04b65e67ed87c3b8eec84402ca1e2c0bf27dc22ecacb8f918b4fe4a64f68d93c697e4 +SHA512 (swift-integration-tests.tar.gz) = 777641377e2d91658415fd9443488c3acf624b4684ddba6405438f7c3833ecfe51e8f3dc9ada17ddf602e5799c2e615c0fc4315d289302d052e176818a1e6313 SHA512 (swift-llvm-bindings.zip) = ef5f5daa8b4cbdd90411a85ebb95bd6279cb4ad30d7a7ea52c8e3d613daa12b8639f7fd5073a6ff759846e3f292773ef446ed3af6f20fa61c9b9a91d61817e4a -SHA512 (swift-lmdb.tar.gz) = 3936c8c569e68e41bef5167f586c4f61ad0399896b1dc7c60eb5c0c6eb041fa671e632dc2b071d6dbdc1a8fd492a4f02cfd8454e3218bfabdf110330d649bb99 -SHA512 (swift-markdown.tar.gz) = 33f8c39a7a0fc67c4993bc7ff3ce000195c20d9a6334442bed80ec6d1cfc0e344f7a5b746eb2be305a51f55ea6e37624e4d0bdb687f96bf7dcdfbc51608f7ec4 +SHA512 (swift-lmdb.tar.gz) = c468b5646101c4f957bf737d5a96ed078e2ac305dacefd220cc6a360d1a6841e04be591f17c5010beaf007537776f3d63ad37c6a652d1225f3c26020e10c86b7 +SHA512 (swift-markdown.tar.gz) = 24f760caf609d419e3ac3cb6fa935a74a142aee174446781ee308a98f9e966971806dde7947e81d94033107dc10a037847924a7c5e02594a2ee33d5ebb6a3d86 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-stress-tester.tar.gz) = 01093ace06cb1ee7d2e64fcc5a73a54ad7f4074fcd648e0f7fb2fd7bebeb046d1b4cee6aa2c2e29852d73e2af3f8c05f6ac3c8159e62b1794b9e95137595d415 -SHA512 (swift-syntax.tar.gz) = bf38508befe788ff7084699cf79f6e8229b57975ada0b401cd4321cfdda37d3337ea5498ccf0ecc563b164d10d582b250b99a84ae79d92e60b18d880b6d4a057 +SHA512 (swift-stress-tester.tar.gz) = 432b1532ba61bfd49a9c384c3618b8d5aea54fcdc893c6e54f5c9172ea7dce5532eb5c2ec5c12cfddb2ff5037966b309722140dc4ceab14d091b152e54108f3c +SHA512 (swift-syntax.tar.gz) = 6c0c6f752c0ab060c2af6aac95faf5023f4dbcac5ddd585ee05e9a337eb000b1e3185fd1f23241f5c6064c7a0c3a2db95bffb5566be2e7411f3d68da145ed976 SHA512 (swift-system.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 -SHA512 (swift-testing.tar.gz) = b128189427a1e741fe5352ba6a416c66e0bbff1cc513f59eadcd6204933309a705601863cd587420f58c6914ffc606d12996134411289eca6496e16d4af2ff37 -SHA512 (swift-tools-support-core.tar.gz) = 976b25254b198d806eed7249e033c1589eabb3fab8016e09e106c8f6c57c6a6f90fc72e63620100048b10a14a62f194ca408af31efd618613d9ff922b0c789ba -SHA512 (swift-xcode-playground-support.tar.gz) = 08880201015e09e0c00c69950502f72d848a6c2f1a2cf1756d8e772aff689006b4e020869bc5a38971f235dd612d791477208384691e8bbe3c293143dd480289 -SHA512 (swift.tar.gz) = c27b9e6ab3cfbf2e8543b5dffca23886add9c34e92def572bf9ffda56696ed3bae0f443831e03f8fdb82195fe80fd864f1524e8e1e9441d82adb79c77dcbb44b +SHA512 (swift-testing.tar.gz) = fbec1c05c419656d207427c2a3191610ce1dceb252ebe5a4455b494d21065271cf6829555995138a9fbbdee1fc33324ba60f87aa62a5b102cc6443ac32d1db33 +SHA512 (swift-tools-support-core.tar.gz) = 7759ff6320e1f87a30d43d47b7f137698e6795cca1515040b90e4b9c6e037cefc4cb4f863925ecd06b606b4a10f6270f3b79325755cf277596332cd62761c1ce +SHA512 (swift-xcode-playground-support.tar.gz) = 26fc7420800f80a327f08d0cebd7a2fda1600341277b03baecf92852ffbd9942fbc371763c3d779af644a8c8dff9733ff632cf081c463073511fccf83aae9a53 +SHA512 (swift.tar.gz) = 710e8df06b7abf58da00024bcdfb743adc11e5acc24dca277a09f53991b9601c8c879a76445d174b428bd2197864b08db3c687d9387074c956f7bc5115152d51 SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff SHA512 (yams.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 diff --git a/swift-lang.spec b/swift-lang.spec index 6c9cf7b..1551678 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -11,9 +11,9 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 6.0.2-RELEASE -%global package_version 6.0.2 -%global fedora_release 2 +%global swift_version 6.0.3-RELEASE +%global package_version 6.0.3 +%global fedora_release 1 %global swift_source_location swift-source @@ -232,11 +232,6 @@ mv zlib-%{zlib_version} zlib # Enable LZMA %patch -P3 -p0 -# https://github.com/swiftlang/swift/pull/74814 -pushd swift -%patch -P4 -p1 -popd - # Weird (hopefully temp) situation of strlcpy and strncat # not being found at the system level # This does not work for EPEL9, so we need to make sure @@ -316,6 +311,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Thu Dec 12 2024 Ron Olson - 6.0.3-1 +- Updated to Swift 6.0.3-RELEASE + Resolves: rhbz#2332031 * Tue Dec 10 2024 Zephyr Lykos - 6.0.2-2 - fix libdir symlink installation * Thu Nov 14 2024 Ron Olson - 6.0.2-1 From 32b96e0808b7d8b2c0ad46fe0efffc7074f65aa0 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Mon, 16 Dec 2024 11:32:12 -0600 Subject: [PATCH 136/152] Added swift-run and swift-build as symlinks for future versions of Swift --- swift-lang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 1551678..713a684 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -13,7 +13,7 @@ ################################################# %global swift_version 6.0.3-RELEASE %global package_version 6.0.3 -%global fedora_release 1 +%global fedora_release 2 %global swift_source_location swift-source @@ -273,6 +273,8 @@ cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version} mkdir -p %{buildroot}%{_bindir} ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc +ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift-build %{buildroot}%{_bindir}/swift-build +ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift-run %{buildroot}%{_bindir}/swift-run ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 @@ -296,6 +298,8 @@ export QA_SKIP_RPATHS=1 %license swift/LICENSE.txt %{_bindir}/swift %{_bindir}/swiftc +%{_bindir}/swift-build +%{_bindir}/swift-run %{_bindir}/sourcekit-lsp %{_mandir}/man1/swift.1.gz %{_libexecdir}/swift/ @@ -311,6 +315,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Mon Dec 16 2024 Ron Olson - 6.0.3-2 +- Added swift-run and swift-build as symlinks for future + versions of Swift * Thu Dec 12 2024 Ron Olson - 6.0.3-1 - Updated to Swift 6.0.3-RELEASE Resolves: rhbz#2332031 From 2bc98629ae7286da4bae715daf62b85ea742a94a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:06:05 +0000 Subject: [PATCH 137/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 713a684..e108c19 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -43,7 +43,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -315,6 +315,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 6.0.3-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Dec 16 2024 Ron Olson - 6.0.3-2 - Added swift-run and swift-build as symlinks for future versions of Swift From 6687e11c025ac3a89637c0e3da4766b2bbc2f548 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 22 Jan 2025 22:14:19 -0600 Subject: [PATCH 138/152] Added patch for explicitly including cstdint --- need_cstdint.patch | 10 ++++++++++ swift-lang.spec | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 need_cstdint.patch diff --git a/need_cstdint.patch b/need_cstdint.patch new file mode 100644 index 0000000..5ce6734 --- /dev/null +++ b/need_cstdint.patch @@ -0,0 +1,10 @@ +--- llvm-project/llvm/include/llvm/ADT/SmallVector.h.orig 2025-01-22 22:02:18.970521076 -0600 ++++ llvm-project/llvm/include/llvm/ADT/SmallVector.h 2025-01-22 22:02:58.143347758 -0600 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/swift-lang.spec b/swift-lang.spec index e108c19..f0cddad 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -13,7 +13,7 @@ ################################################# %global swift_version 6.0.3-RELEASE %global package_version 6.0.3 -%global fedora_release 2 +%global fedora_release 3 %global swift_source_location swift-source @@ -43,7 +43,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -103,6 +103,7 @@ Patch6: latest_python.patch Patch7: disable_warning.patch Patch8: no_testable_package.patch Patch9: clang_crash_fix.patch +Patch10: need_cstdint.patch BuildRequires: clang BuildRequires: swig @@ -261,6 +262,10 @@ mv zlib-%{zlib_version} zlib %endif %endif +# Explicitly include for int64 +%patch -P10 -p0 + + %build export VERBOSE=1 # Here we go! @@ -315,6 +320,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Jan 22 2025 Ron Olson - 6.0.3-3 +- Added patch to explicitly include cstdint * Sun Jan 19 2025 Fedora Release Engineering - 6.0.3-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4b5590325b48c34e8f18a269b474ce5d2aaededa Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Wed, 22 Jan 2025 22:23:45 -0600 Subject: [PATCH 139/152] Added bugzilla number --- swift-lang.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index f0cddad..6c8a61f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -13,7 +13,7 @@ ################################################# %global swift_version 6.0.3-RELEASE %global package_version 6.0.3 -%global fedora_release 3 +%global fedora_release 4 %global swift_source_location swift-source @@ -320,6 +320,8 @@ export QA_SKIP_RPATHS=1 %changelog +* Wed Jan 22 2025 Ron Olson - 6.0.3-4 +- Resolves: rhbz#2341403 * Wed Jan 22 2025 Ron Olson - 6.0.3-3 - Added patch to explicitly include cstdint * Sun Jan 19 2025 Fedora Release Engineering - 6.0.3-2.1 From 1c784137de15289886917049bb1c3bd8db47b3fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:57:44 +0000 Subject: [PATCH 140/152] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- swift-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index 6c8a61f..e3fcda6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -43,7 +43,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %{fedora_release}%{?dist}.1 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -320,6 +320,9 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.0.3-4.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jan 22 2025 Ron Olson - 6.0.3-4 - Resolves: rhbz#2341403 * Wed Jan 22 2025 Ron Olson - 6.0.3-3 From 740299b3f5ae7dedc9999241145e95d8da375316 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Wed, 10 Sep 2025 11:02:11 -0400 Subject: [PATCH 141/152] Updated to Swift 6.1.3-RELEASE Resolves: RHBZ#2356394 Resolves: RHBZ#2385672 --- .gitignore | 5 +++ disable_warning.patch | 20 +++++++++ fix_chain_comparison.patch | 11 +++++ fix_foundation_cmath.patch | 19 +++++++++ have_strcat.patch | 18 -------- latest_python.patch | 34 --------------- need_cstdint.patch | 36 ++++++++++++---- no_pipes.patch | 64 +---------------------------- remove_termio.diff | 70 +++++++++++++++++++++++++++++++ resource_dir.patch | 46 --------------------- sources | 74 +++++++++++++++++---------------- swift-lang.spec | 84 ++++++++++++++++++++------------------ 12 files changed, 237 insertions(+), 244 deletions(-) create mode 100644 fix_chain_comparison.patch create mode 100644 fix_foundation_cmath.patch delete mode 100644 have_strcat.patch delete mode 100644 latest_python.patch create mode 100644 remove_termio.diff delete mode 100644 resource_dir.patch diff --git a/.gitignore b/.gitignore index dd0d0c6..630ea84 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,8 @@ /swift-llvm-bindings.zip /swift-testing.tar.gz /zlib13.zip +/zlib131.zip +/swift-async-algorithms.tar.gz +/swift-log.tar.gz +/swift-sdk-generator.tar.gz +/swift-toolchain-sqlite.tar.gz diff --git a/disable_warning.patch b/disable_warning.patch index a9d3a50..a83ed4b 100644 --- a/disable_warning.patch +++ b/disable_warning.patch @@ -35,3 +35,23 @@ diff --color -Naur swift-corelibs-libdispatch-orig/src/data.c swift-corelibs-lib #endif // HAVE_MACH + +#pragma GCC diagnostic pop +diff --color -Naur swift-corelibs-libdispatch-orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c +--- swift-corelibs-libdispatch-orig/src/event/event_epoll.c 2025-09-11 14:24:00.865948813 -0400 ++++ swift-corelibs-libdispatch/src/event/event_epoll.c 2025-09-11 14:25:11.185712066 -0400 +@@ -20,6 +20,10 @@ + + + #include "internal.h" ++ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wsign-conversion" ++ + #if DISPATCH_EVENT_BACKEND_EPOLL + #include + #include +@@ -723,4 +727,5 @@ + (void)dq_state; + } + ++#pragma GCC diagnostic pop + #endif // DISPATCH_EVENT_BACKEND_EPOLL diff --git a/fix_chain_comparison.patch b/fix_chain_comparison.patch new file mode 100644 index 0000000..f45e10e --- /dev/null +++ b/fix_chain_comparison.patch @@ -0,0 +1,11 @@ +--- swift/lib/Sema/CodeSynthesisDistributedActor.cpp.orig 2025-09-12 06:28:13 ++++ swift/lib/Sema/CodeSynthesisDistributedActor.cpp 2025-09-12 06:29:20 +@@ -859,7 +859,7 @@ + } + if (idIdx + actorSystemIdx + unownedExecutorIdx >= 0 + 1 + 2) { + // we have found all the necessary fields, let's assert their order +- assert(idIdx < actorSystemIdx < unownedExecutorIdx && ++ assert(idIdx < actorSystemIdx && actorSystemIdx < unownedExecutorIdx && + "order of fields MUST be exact."); + } + } diff --git a/fix_foundation_cmath.patch b/fix_foundation_cmath.patch new file mode 100644 index 0000000..eb492cf --- /dev/null +++ b/fix_foundation_cmath.patch @@ -0,0 +1,19 @@ +diff --git swift-foundation.orig/Sources/_FoundationCShims/include/_CStdlib.h swift-foundation/Sources/_FoundationCShims/include/_CStdlib.h +index 71e2fd2..a63a9dc 100644 +--- swift-foundation.orig/Sources/_FoundationCShims/include/_CStdlib.h ++++ swift-foundation/Sources/_FoundationCShims/include/_CStdlib.h +@@ -51,8 +51,14 @@ + #include + #endif + ++#ifndef _GLIBCXX_MATH_H + #if __has_include() ++#ifndef _MATH_H ++#define _GLIBCXX_MATH_H 1 + #include ++#undef _GLIBCXX_MATH_H ++#endif ++#endif + #endif + + #if __has_include() diff --git a/have_strcat.patch b/have_strcat.patch deleted file mode 100644 index 28a687c..0000000 --- a/have_strcat.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- swift-corelibs-foundation/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h.orig 2024-07-31 10:29:42.005997906 -0500 -+++ swift-corelibs-foundation/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h 2024-07-31 10:31:06.147568761 -0500 -@@ -200,6 +200,7 @@ - #endif - - #if !TARGET_OS_MAC -+#if 0 - #if !HAVE_STRLCPY - CF_INLINE size_t - strlcpy(char * dst, const char * src, size_t maxlen) { -@@ -229,6 +230,7 @@ - return dstlen + srclen; - } - #endif -+#endif // XYZZY - We do have them in Fedora - #endif // !TARGET_OS_MAC - - #if TARGET_OS_WIN32 diff --git a/latest_python.patch b/latest_python.patch deleted file mode 100644 index 0b33562..0000000 --- a/latest_python.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp ---- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-08-03 13:04:05.441817601 -0500 -+++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-08-03 13:14:00.001254584 -0500 -@@ -74,7 +74,7 @@ - #if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7 - return _Py_Finalizing != nullptr; - #else -- return _Py_IsFinalizing(); -+ return Py_IsFinalizing(); - #endif - } - -diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ---- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-08-03 13:04:05.442817667 -0500 -+++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-08-03 13:12:15.688335534 -0500 -@@ -182,7 +182,7 @@ - return; - #endif - -- if (PyEval_ThreadsInitialized()) { -+ if (Py_IsInitialized()) { - Log *log = GetLog(LLDBLog::Script); - - m_was_already_initialized = true; -@@ -191,9 +191,6 @@ - m_gil_state == PyGILState_UNLOCKED ? "un" : ""); - return; - } -- -- // InitThreads acquires the GIL if it hasn't been called before. -- PyEval_InitThreads(); - } - - PyGILState_STATE m_gil_state = PyGILState_UNLOCKED; diff --git a/need_cstdint.patch b/need_cstdint.patch index 5ce6734..e603bb2 100644 --- a/need_cstdint.patch +++ b/need_cstdint.patch @@ -1,10 +1,30 @@ ---- llvm-project/llvm/include/llvm/ADT/SmallVector.h.orig 2025-01-22 22:02:18.970521076 -0600 -+++ llvm-project/llvm/include/llvm/ADT/SmallVector.h 2025-01-22 22:02:58.143347758 -0600 -@@ -21,6 +21,7 @@ - #include - #include - #include +--- cmake/Utilities/cmcppdap/include/dap/network.h.orig 2025-09-10 12:04:50.127650599 -0400 ++++ cmake/Utilities/cmcppdap/include/dap/network.h 2025-09-10 12:05:10.419069326 -0400 +@@ -15,6 +15,7 @@ + #ifndef dap_network_h + #define dap_network_h + +#include #include - #include - #include + #include + +--- swift/stdlib/include/llvm/ADT/SmallVector.h.orig 2025-09-11 16:12:59.726654809 -0400 ++++ swift/stdlib/include/llvm/ADT/SmallVector.h 2025-09-11 16:13:22.736555901 -0400 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- llbuild/utils/unittest/googletest/include/gtest/gtest.h.orig 2025-09-12 09:05:05 ++++ llbuild/utils/unittest/googletest/include/gtest/gtest.h 2025-09-12 09:05:22 +@@ -51,6 +51,7 @@ + #ifndef GTEST_INCLUDE_GTEST_GTEST_H_ + #define GTEST_INCLUDE_GTEST_GTEST_H_ + ++#include + #include + #include + #include diff --git a/no_pipes.patch b/no_pipes.patch index 96f1191..6e5ba88 100644 --- a/no_pipes.patch +++ b/no_pipes.patch @@ -1,66 +1,4 @@ -diff --color -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py ---- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-13 19:54:42.303016942 -0500 -+++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-13 19:57:15.922473813 -0500 -@@ -15,7 +15,6 @@ - import stat - import sys - import subprocess --import pipes - import shlex - import tempfile - import shutil -@@ -61,7 +60,7 @@ - - - def quote_cmd(cmd): -- return " ".join(pipes.quote(arg) for arg in cmd) -+ return " ".join(shlex.quote(arg) for arg in cmd) - - - def write_to_script(text, filename): -@@ -220,7 +219,7 @@ - ) - - for msg in self.expected_output: -- output += "grep -F %s t.log || exit 1\n" % pipes.quote(msg) -+ output += "grep -F %s t.log || exit 1\n" % shlex.quote(msg) - - write_to_script(output, self.testfile) - self.check_interestingness() -diff --color -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py ---- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-13 19:55:23.627829920 -0500 -+++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-13 19:57:42.124257373 -0500 -@@ -8,7 +8,7 @@ - - import os - import pickle --import pipes -+import shlex - import platform - import re - import shutil -@@ -281,7 +281,7 @@ - } - #endif - """ -- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales]) -+ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales]) - - - @_memoizeExpensiveOperation(lambda c, flags="": (c.substitutions, c.environment, flags)) -diff --color -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py ---- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-13 19:55:23.627829920 -0500 -+++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-13 19:58:01.911604299 -0500 -@@ -11,7 +11,7 @@ - import lit - import lit.formats - import os --import pipes -+import shlex - import re - import shutil - -diff --color -Naur ninja/configure.py ninja/configure.py + diff --color -Naur ninja/configure.py ninja/configure.py --- ninja/configure.py 2024-06-13 19:54:39.050795565 -0500 +++ ninja/configure.py 2024-06-13 19:56:39.970026531 -0500 @@ -23,7 +23,7 @@ diff --git a/remove_termio.diff b/remove_termio.diff new file mode 100644 index 0000000..df1673a --- /dev/null +++ b/remove_termio.diff @@ -0,0 +1,70 @@ +--- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc.orig 2025-09-11 07:37:07.200743058 -0400 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2025-09-11 07:37:47.237450571 -0400 +@@ -338,17 +338,9 @@ + _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int)); + _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int)); + _(TCFLSH, NONE, 0); +-#if SANITIZER_GLIBC +- _(TCGETA, WRITE, struct_termio_sz); +-#endif + _(TCGETS, WRITE, struct_termios_sz); + _(TCSBRK, NONE, 0); + _(TCSBRKP, NONE, 0); +-#if SANITIZER_GLIBC +- _(TCSETA, READ, struct_termio_sz); +- _(TCSETAF, READ, struct_termio_sz); +- _(TCSETAW, READ, struct_termio_sz); +-#endif + _(TCSETS, READ, struct_termios_sz); + _(TCSETSF, READ, struct_termios_sz); + _(TCSETSW, READ, struct_termios_sz); +--- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp.orig 2025-09-11 07:38:11.756385788 -0400 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2025-09-11 07:44:47.207707878 -0400 +@@ -479,9 +479,6 @@ + unsigned struct_input_id_sz = sizeof(struct input_id); + unsigned struct_mtpos_sz = sizeof(struct mtpos); + unsigned struct_rtentry_sz = sizeof(struct rtentry); +-#if SANITIZER_GLIBC || SANITIZER_ANDROID +- unsigned struct_termio_sz = sizeof(struct termio); +-#endif + unsigned struct_vt_consize_sz = sizeof(struct vt_consize); + unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); + unsigned struct_vt_stat_sz = sizeof(struct vt_stat); +@@ -758,13 +755,9 @@ + unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER; + #endif // SOUND_VERSION + unsigned IOCTL_TCFLSH = TCFLSH; +- unsigned IOCTL_TCGETA = TCGETA; + unsigned IOCTL_TCGETS = TCGETS; + unsigned IOCTL_TCSBRK = TCSBRK; + unsigned IOCTL_TCSBRKP = TCSBRKP; +- unsigned IOCTL_TCSETA = TCSETA; +- unsigned IOCTL_TCSETAF = TCSETAF; +- unsigned IOCTL_TCSETAW = TCSETAW; + unsigned IOCTL_TCSETS = TCSETS; + unsigned IOCTL_TCSETSF = TCSETSF; + unsigned IOCTL_TCSETSW = TCSETSW; +--- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig 2025-09-11 07:39:08.909650398 -0400 ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2025-09-11 07:45:06.340929026 -0400 +@@ -1013,7 +1013,6 @@ + extern unsigned struct_input_absinfo_sz; + extern unsigned struct_input_id_sz; + extern unsigned struct_mtpos_sz; +-extern unsigned struct_termio_sz; + extern unsigned struct_vt_consize_sz; + extern unsigned struct_vt_sizes_sz; + extern unsigned struct_vt_stat_sz; +@@ -1258,13 +1257,9 @@ + extern unsigned IOCTL_SNDCTL_COPR_WCODE; + extern unsigned IOCTL_SNDCTL_COPR_WDATA; + extern unsigned IOCTL_TCFLSH; +-extern unsigned IOCTL_TCGETA; + extern unsigned IOCTL_TCGETS; + extern unsigned IOCTL_TCSBRK; + extern unsigned IOCTL_TCSBRKP; +-extern unsigned IOCTL_TCSETA; +-extern unsigned IOCTL_TCSETAF; +-extern unsigned IOCTL_TCSETAW; + extern unsigned IOCTL_TCSETS; + extern unsigned IOCTL_TCSETSF; + extern unsigned IOCTL_TCSETSW; diff --git a/resource_dir.patch b/resource_dir.patch deleted file mode 100644 index 9d924f5..0000000 --- a/resource_dir.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b7ec9c840722d19dfc81411da02916d30da12893 Mon Sep 17 00:00:00 2001 -From: Finagolfin -Date: Fri, 28 Jun 2024 20:06:06 +0530 -Subject: [PATCH] [ClangImporter] Make sure the `-resource-dir` is checked - before the `-sdk`, as done everywhere else in the compiler - -Otherwise, these module maps can be pulled from a system SDK instead when -building a fresh Swift stdlib, fixes #74696. ---- - lib/ClangImporter/ClangIncludePaths.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/ClangImporter/ClangIncludePaths.cpp b/lib/ClangImporter/ClangIncludePaths.cpp -index 77173166ba494..7399a01b57c62 100644 ---- a/lib/ClangImporter/ClangIncludePaths.cpp -+++ b/lib/ClangImporter/ClangIncludePaths.cpp -@@ -35,10 +35,9 @@ static std::optional getActualModuleMapPath( - - Path result; - -- StringRef SDKPath = Opts.getSDKPath(); -- if (!SDKPath.empty()) { -- result.append(SDKPath.begin(), SDKPath.end()); -- llvm::sys::path::append(result, "usr", "lib", "swift"); -+ if (!Opts.RuntimeResourcePath.empty()) { -+ result.append(Opts.RuntimeResourcePath.begin(), -+ Opts.RuntimeResourcePath.end()); - llvm::sys::path::append(result, platform); - if (isArchSpecific) { - llvm::sys::path::append(result, arch); -@@ -52,10 +51,11 @@ static std::optional getActualModuleMapPath( - return result; - } - -- if (!Opts.RuntimeResourcePath.empty()) { -+ StringRef SDKPath = Opts.getSDKPath(); -+ if (!SDKPath.empty()) { - result.clear(); -- result.append(Opts.RuntimeResourcePath.begin(), -- Opts.RuntimeResourcePath.end()); -+ result.append(SDKPath.begin(), SDKPath.end()); -+ llvm::sys::path::append(result, "usr", "lib", "swift"); - llvm::sys::path::append(result, platform); - if (isArchSpecific) { - llvm::sys::path::append(result, arch); - diff --git a/sources b/sources index 23e982b..3a6ec3f 100644 --- a/sources +++ b/sources @@ -1,44 +1,46 @@ -SHA512 (cmake.tar.gz) = 193e6fb40f29b4e9ff216545248dd25c9e7a54bf79419a312bcdac630d4c9af621d8b4eccfbb9dd0a95af8bc66f410c9972e57e30fd839113ce1516a7f7905b4 -SHA512 (cmark.tar.gz) = d9492f141fb19f39e3b13ac1f2454db64539deb980d0dabac94c76e6ec4a6f19a8d1b5baf12fc7412f6e531b56ca78484f7927450b27832a4829605af9862cef -SHA512 (corelibs-foundation.tar.gz) = d16b9ae36744fa2e56a11dda235eae79a4e505d830ef06275100559afcdc83d8115ba0635ce67916c1305cc2a0f34a2bea21981ea8801f06dbd190eec0d2c404 -SHA512 (corelibs-libdispatch.tar.gz) = e99ad645deb804320cbbbd7a9bcaaa87ea106507d77791147603e027abafba28a815e63c1e93cc903ae5ef2631c78854b46af89a6bb9ef7b521fe322a571deb6 -SHA512 (corelibs-xctest.tar.gz) = 287c00f6c3aa534f25af1bd2ba280086c2f69ec5cc9327804c3b8e7bd3a113257a56fd9c19d5a663081a3e26f6b44c6313e33defc12156a217ea8c0958fabda0 -SHA512 (icu.zip) = 3deb56e8109783049c9dac04073aa084bcd92a0370b820ba4dbdad641a5a3f753f6ef8fd575ac82385fc1f2f224118313a6987d513991826ed7355307f6d9696 -SHA512 (indexstore-db.tar.gz) = c65aced91616858c7946aa7c65d0e11027afe39a7b86c961a13830ad22a352b959331133ec4d179d21edd3696d2bf5a89907c044f25426259a6e21f4e87a84ad -SHA512 (llbuild.tar.gz) = 3dd399fef0da472742b6e180896c53cf685ffed49467f1a145cad8ae64e784e7368190858cf79810b47bd56d294a3c337e6bbf587b93efa3350c29928ac6444d -SHA512 (llvm-project.tar.gz) = d4d515c5a232dfc9d2ad8ff62b5703d746327a1477641d2baacbb68a61e5babdedddcd0f19dd79968e83e4c5eabc4ab892035bf8aaf1ad1f8181fb9cf68f1139 +SHA512 (swift-format.zip) = b9b84ac82d0285afc1c0d961b32a482481ae8c9652a440eb77b3b46b655928ed73d857deebf857ffcdfedbabffd3e13f667a4a3dfff5bca282c6cb849526b4dd +SHA512 (swift-foundation-icu.zip) = 3ec1050c9df735b892b83a11e503797ba50f8da5a42344ef59c4a24e547a590ae9e100e11561332668dcb735a38ebf3d72a99d58ee538fef7f32ded3bcb4136d +SHA512 (swift-foundation.zip) = 2b5cdb75823809df98adf40251cba60b278f785f404104b04e52b9a94616af56037d164fdbefe9ab088d10107151799a68ccf034d16e7726793f6f0b6322f665 +SHA512 (swift-llvm-bindings.zip) = 1031df2d079e1d67241feeb7d021bfaef314501b50c246ffe2168269167844ede03114ba7509dc74f6482d2b6a27e26741401a9a50693c94cc02b291865e0727 +SHA512 (zlib131.zip) = 1f171880153b0120e1364baaf7d0a17f65086eff279f8f8c8538e5950097d1feee37cc173181676ba1e2aeb4565ba68749c814cd3e25bfb06271bea02feb7d94 +SHA512 (cmake.tar.gz) = bd71bbd62a024cc93e97421ea50900072e9ab79ccec3ad0e012b5a9286a3c46a15c1b86a0f8ef2dd8518a4e63d4644d34c80cba869c0e9f9eb419fcc439acfa5 +SHA512 (cmark.tar.gz) = 1cd9de0ff41c62a611a54490e919702114c9d059ee6b8018e291eecda8f610a1712ac6d650c5a19178d38f7b8fde174d8538e893c8f0c022cb55464fd7d4ba36 +SHA512 (corelibs-foundation.tar.gz) = 227304937bda2709aaaaa659707bba0baf044354441d28ce67c527c4214bd9306e26087edcee4e368cffbe2f07ad5e4d5c05103ea9eb95bfd9a60e4ccfc56f5c +SHA512 (corelibs-libdispatch.tar.gz) = 632f5910b76569355a12bb7a1666c5fd282d9e00fd7c9240068a48d6d629fbb085d42be0746657878b7a13e535c1cf1f517a652b5d327125a0bb8921b05d2d9c +SHA512 (corelibs-xctest.tar.gz) = 3933f9a1f8c6fb3887c10a231636e497d8c2d010572fb46145b12cd12ccfe013e70c17c731c32662eb554314cd57939068cd3588b12e2fb558c86a4df3196466 +SHA512 (indexstore-db.tar.gz) = 082a87a20b5da7877fbcbc7c71013582b55a58a6a514a0190c545f6113184de9776202857a956f5b97d1838054d0bd3bdc4d8a741aea7f7443ddee8fdb8e7179 +SHA512 (llbuild.tar.gz) = 5b195b543e1abe482b9e9eedfe7c884dc19c36d71a62787c3e2b1ab05dd7f05fead34d322312ae0f2635dda5a71027d88ba46cd2e5136d92f5e6e284a330637b +SHA512 (llvm-project.tar.gz) = 9f6ecfd1cb0ef312ef4d01ada40d15abad38958e3d9ae24662aeb5a19cb4a90a3bd6e7bdb1826d4a9f8c7c1c483b92f7423b1ca85c3759ad57dbf610adb338c8 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 580028d0a9e20dcef2778681000c89bdd400ead6a273e15208ec36dbe0ce7797726cc2df12f8f36f09c653b19a38abaeb79323c770b4def02c3587ab3e0436cc -SHA512 (sourcekit-lsp.tar.gz) = 613fe106b442d9c6228cd2e4fdb8b464c23f11c4e95d4cebd21c2fd7cd6fbe666ccd3b6f7814160bffc8e77251eac4d21ac8acd8c0d7df5b5b0928a06aeaa258 -SHA512 (swift-argument-parser.tar.gz) = 2fa09e86da67b6feb09f3c11b656e0e17c050243f9cdf40da3646c881f441bb545c3820345934da60ab80f2e77f575d1c1adb55d8017277e4fe01b68b5a2f692 +SHA512 (package-manager.tar.gz) = d55d0337c47cbcdf7da68eb301810f8851ce4da3eaf535e253149b147d4a36225c13c0af7656b774f498393bef2f96bb03c336611e79209a5716368567eeceeb +SHA512 (sourcekit-lsp.tar.gz) = 2656292b378be2e5c6531d9f17a43658ca8be4ed3e443ac25fcd8472e6e5197892db94e3a8319048202ae3bc7e3e3a86e1be6f2fce35e466cbb26b5d6e3d4b2d +SHA512 (swift-argument-parser.tar.gz) = 38f0958c63dc01df1a5ac7164b8c76116050819a8747a71ff07c6c2208526e49c0f5411a2431bce4d3968b7100f95e4b00bbc49f69a6df69edfa7f8589a9892c SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 +SHA512 (swift-async-algorithms.tar.gz) = a5687ddce9d051a671fc34d88cc77e2d30a60b99d7f4381956cee05d41d5afcc8fb34469155984f5b7dbedcc3f7f839a236fa528c3e0f660f4d6d409d39cf2f7 SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 -SHA512 (swift-collections.tar.gz) = 830a3a8923e498a58e5638bda5157c0a8ca20032daa73e752bb445314e3c8050cda85dfba78105f3e76d66832e804b8efc6c05aec117b687a83fc34e9c724639 +SHA512 (swift-collections.tar.gz) = f26586b9c2e13279694a9bbb80b479ce8c34ceb6181dc455a228b52c8f704b88888ed5cdb3f92e913c228ff2aeca4625ee041fba7712086f57ec54ce709f73cd SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = dcc9ebc451c037416afe9912cdc18ce10f950ab2e64900cf93734a7c59c4bdbb9e17f10e2bf80bbdb253a87ecc0f5935aa99c5e30ac858a15d11c064af463af1 -SHA512 (swift-docc-symbolkit.tar.gz) = 37636c79ffbe5bb3dfa5007c5ac3834da439338ded5b8030a68c41dfb8f89ad16ddbba6cccde86410cef48f3bc36981ee15a70ef10b282ef021a7063e94251ee -SHA512 (swift-docc.tar.gz) = dc9d873a6c4ab484acf396e58ca71ee169b942bd2e654dbd5b537de33f6e7ce96c1ca527876ca2ad2fec2a5b42da72d9cf186ef5f35d85a29bb233df303aad62 -SHA512 (swift-driver.tar.gz) = aa31717e10cc82e4d7721fa2ed8c9c5e704b854c68e0c1c4479dd70a6e02348df55aa4afe9d3ea4acfd7041ac0568362283cd52b72e6985b7ca99ecd39952640 -SHA512 (swift-experimental-string-processing.tar.gz) = 74eb94bd5edb2c793cdbb7eb74d93110e8bb10d5f9dc02649efff76840d58b5cc62d62ba65fb77dfdada33fdd755ea97f9f955f981841713795e7a0bafdb69e4 -SHA512 (swift-format.zip) = 0e4ecce3f3b26927cf65109f3b551e5d38b5aa35cdd1ded93736385fec88a612130cddf9f0f04db12a4f144c1f5e4f091fc2328b18473306cf2290ea434b86c5 -SHA512 (swift-foundation-icu.zip) = f2e70bffcd6b998a6de6849e71f4cdc97bd28d8d5294823ef2857ee0a9aaabd98d76a4672858ec2c702a4775290d215b5ba81611dc17ec2da34a3dac46a26219 -SHA512 (swift-foundation.zip) = 202946c5c3b97bf7b09560d3d1bd6af8fcc6f5ee475175c197df6af1cb1f3d695970de8c890e49fe60c86fb67dedf308f1bd9c8fa9e0a58b56ea222590cf88cb -SHA512 (swift-integration-tests.tar.gz) = 777641377e2d91658415fd9443488c3acf624b4684ddba6405438f7c3833ecfe51e8f3dc9ada17ddf602e5799c2e615c0fc4315d289302d052e176818a1e6313 -SHA512 (swift-llvm-bindings.zip) = ef5f5daa8b4cbdd90411a85ebb95bd6279cb4ad30d7a7ea52c8e3d613daa12b8639f7fd5073a6ff759846e3f292773ef446ed3af6f20fa61c9b9a91d61817e4a -SHA512 (swift-lmdb.tar.gz) = c468b5646101c4f957bf737d5a96ed078e2ac305dacefd220cc6a360d1a6841e04be591f17c5010beaf007537776f3d63ad37c6a652d1225f3c26020e10c86b7 -SHA512 (swift-markdown.tar.gz) = 24f760caf609d419e3ac3cb6fa935a74a142aee174446781ee308a98f9e966971806dde7947e81d94033107dc10a037847924a7c5e02594a2ee33d5ebb6a3d86 -SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 -SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e +SHA512 (swift-docc-render-artifact.tar.gz) = 4c612389ffb6e57ebd228fed5c65312a2eb1e43976ee1d228ab1f0885036aeea7a4453ccf936fd156b6f0f8134628b7da4778fcee5c758d4bbed6a26536ad9e5 +SHA512 (swift-docc-symbolkit.tar.gz) = 52021ee5400c48b9c2078062affd3298a1c4e25a56c0ec77404403caacd51daef875dc4152c84d6a93c238b8339096beb18b9b7a92a1e612a25a40a9b6e8a990 +SHA512 (swift-docc.tar.gz) = 80eec33ce371b68cbe1da8fca975115257a0de64e1af83240cfade792310e97dc8317a27c4ee4e531a5f522881f8cc0e086391ecad6f276562426a7189fdc4cc +SHA512 (swift-driver.tar.gz) = 96681f3cc23f1b5baaa6e491a52c10cabda376e556155cb3c391334f2b92072b55f9e21bd0be0974f633ac68cb064a853ffa891f51d9b270f3cb8dff3fb4850c +SHA512 (swift-experimental-string-processing.tar.gz) = 4eee590d06930718e7e4ffb505e35c8b7a6b3e2ac50271a39f93776be1f35d7a333bec0903cd81e3362fbc7f03b49f7239df67be11d83938ec0911f24664841e +SHA512 (swift-integration-tests.tar.gz) = 87fda82e881ea03c425d02858001fa0024ff2243f2ad20c8d49c239720b900b40bc3e4a1bfea004eb1c40ec7e42391a231abfef972f2f54b51380f82a28e36b4 +SHA512 (swift-lmdb.tar.gz) = a5312e5d9844b90bdfacd00ee307b151c665f9335684ac7ccbb0cd99c4fed249742aecc8be957d84130d2cfde248529c32610ba005bcb169a917ccf68ced53dc +SHA512 (swift-log.tar.gz) = c148f7a20072fba57226bfbc0d9e9f6bb9ebfc952e920d7f4b6a12028fa49a2f61f1f7f13e53c2421b562b83e8160e3d64da51437840b9312c77113b1484c39f +SHA512 (swift-markdown.tar.gz) = d230041f0e7c1bac3c3fbd8dcb9797833c64325429ac3929ca29680a395a32c0ce416443428237207e6d17ad24c974761cb24be879463b2fb2104a75bd429c45 +SHA512 (swift-nio.tar.gz) = 3eb24d634c8937270b88eda8c34b7b70290b28a601228e051cd2b414003902d18d066dc82f8682835b2c788d5d2b27ac0a1f1723e16f902b1d3d321ac7807f6d SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-stress-tester.tar.gz) = 432b1532ba61bfd49a9c384c3618b8d5aea54fcdc893c6e54f5c9172ea7dce5532eb5c2ec5c12cfddb2ff5037966b309722140dc4ceab14d091b152e54108f3c -SHA512 (swift-syntax.tar.gz) = 6c0c6f752c0ab060c2af6aac95faf5023f4dbcac5ddd585ee05e9a337eb000b1e3185fd1f23241f5c6064c7a0c3a2db95bffb5566be2e7411f3d68da145ed976 +SHA512 (swift-sdk-generator.tar.gz) = 5ff61111a20e5e41c7945c0b0c8e8f5e7a67aac13bf44658614ca8e81e343841c9c465499ec4d834bd0e1902dfa01d57630dd890c8294e64e425f2e146b39402 +SHA512 (swift-stress-tester.tar.gz) = 66d43e5b98d84fe83cc5c2d587f9586528c4e5ee853844f2395626725104796faccfa8d66083d3bfa9c8fa83e0b2461c67313c417a5fb262604dd8a4dba67285 +SHA512 (swift-syntax.tar.gz) = fa3f58003c1ee572247586c844d80bbe9d50e44c8e6654f48139872374db4749b5bb6ec053903edbac32b4a75338992815ea1313bbb0426f97143484e2bece41 SHA512 (swift-system.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 -SHA512 (swift-testing.tar.gz) = fbec1c05c419656d207427c2a3191610ce1dceb252ebe5a4455b494d21065271cf6829555995138a9fbbdee1fc33324ba60f87aa62a5b102cc6443ac32d1db33 -SHA512 (swift-tools-support-core.tar.gz) = 7759ff6320e1f87a30d43d47b7f137698e6795cca1515040b90e4b9c6e037cefc4cb4f863925ecd06b606b4a10f6270f3b79325755cf277596332cd62761c1ce -SHA512 (swift-xcode-playground-support.tar.gz) = 26fc7420800f80a327f08d0cebd7a2fda1600341277b03baecf92852ffbd9942fbc371763c3d779af644a8c8dff9733ff632cf081c463073511fccf83aae9a53 -SHA512 (swift.tar.gz) = 710e8df06b7abf58da00024bcdfb743adc11e5acc24dca277a09f53991b9601c8c879a76445d174b428bd2197864b08db3c687d9387074c956f7bc5115152d51 -SHA512 (wasi-sdk.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05 -SHA512 (wasm.tar.gz) = b65ba20ec64b1c4fbaa7f4d0ce421bdae0cdc8c263dedeeca43c5ae1efec6dbd575a2d1bc80e0d43cfc9d3a6aea90e9ea56a49ea9d10d3141b4af8f2950ae3ff +SHA512 (swift.tar.gz) = 0a96840ac7390d3ea484b76ebd862a747cb15609371b9010605e1f74f1dcd9d9c3c28233a71f782e670f5b068726f91879c39f7cb801ba7836e0714ca683902d +SHA512 (swift-testing.tar.gz) = 0dd155b3e1224781e692e2942be73490ddf6402efb8ad6389fea78ed50b34ea9feb2e0df289c7fa1c17f3b6379b47f60ba2b320277e25a1a385f92c1699bead5 +SHA512 (swift-toolchain-sqlite.tar.gz) = 2b2fe0287c7220505445a3143bdc8de31f4b38907025b42d016151f209ae63edc2a423f0fe9a6b78b6202392c8387e9b88ffa15c71b9c3b0ad9c5106ef16564a +SHA512 (swift-tools-support-core.tar.gz) = 2e40fee992841eefb5f36d870ab9b9be244b9666d8ee6b18fb588a80cfbac1480d28a0857e89b8ec737e157e4d3193788cb1ff5765c77f34225fb64b5c7a711e +SHA512 (swift-xcode-playground-support.tar.gz) = 8ae335712592a1126ddd2d772b3e733b524d539f01ea5d4baf39a7802797bd3aeb659c742f5ac93db7be42eb7662fc6b50a95f9761a713430f642c7ed8f863b4 +SHA512 (wasi-sdk.tar.gz) = 3fcd5d6c0e09d824702165d8f1236e400b1d5e95fad14f1821d40de05340a044f0ec8a587d8478854252cc938a663aa9f854e6a5e683ef8f8349c60dc6c628ed +SHA512 (wasm.tar.gz) = ad14d710c9846b2258e01c7fb08fe7ac02cce7dc4f9335c13df872ab194d7827c2781e62bbc342cd00f04210c9165851aa4ee899e45a66ac286549e68e877a18 SHA512 (yams.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 -SHA512 (zlib13.zip) = 7309db617cfc389544d84b8d6cd89ac1720bcb66925e6f0e56e9240f12ea17ae14f36fd4016fbd2c77203812e43040cd80c4649a0b099f2884af959812d9a581 diff --git a/swift-lang.spec b/swift-lang.spec index e3fcda6..c34801c 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -11,39 +11,43 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 6.0.3-RELEASE -%global package_version 6.0.3 -%global fedora_release 4 +%global swift_version 6.1.3-RELEASE +%global package_version 6.1.3 +%global fedora_release 1 %global swift_source_location swift-source # Set to the right version per the json file -%global icu_version 69 +# Run 'extract_versions.sh' to get updated +# versions. %global yams_version 5.0.6 -%global swift_argument_parser_version 1.2.3 +%global swift_argument_parser_version 1.4.0 %global swift_crypto_version 3.0.0 %global ninja_version 1.11.1 -%global cmake_version 3.24.2 +%global cmake_version 3.30.2 %global swift_atomics_version 1.2.0 -%global swift_collections_version 1.1.2 +%global swift_collections_version 1.1.3 %global swift_numerics_version 1.0.2 %global swift_system_version 1.3.0 -%global swift_nio_version 2.31.2 -%global swift_nio_ssl_version 2.15.0 +%global swift_nio_version 2.65.0 %global swift_certificates_version 1.0.1 %global swift_asn1_version 1.0.0 -%global wasmkit_version 0.0.3 -%global wasi_version 20 -%global swift_format_version 6.0 -%global swift_llvm_bindings_version 6.0 -%global swift_foundation_icu_version 6.0 -%global swift_foundation_version 6.0 -%global zlib_version 1.3 +%global wasmkit_version 0.1.2 +%global wasi_version 22 +%global swift_format_version 6.1 +%global swift_llvm_bindings_version 6.1 +%global swift_foundation_icu_version 6.1 +%global swift_foundation_version 6.1 +%global swift_sdk_generator_version 6.1 +%global swift_async_algorithms_version 1.0.1 +%global swift_log_version 1.5.4 +%global swift_toolchain_sqlite_version 1.0.1 +%global zlib_version 1.3.1 Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -77,33 +81,35 @@ Source25: https://github.com/apple/swift-collections/archive/%{swift_colle Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source29: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz +Source29: https://github.com/apple/swift-sdk-generator/archive/refs/tags/swift-%{swift_sdk_generator_version}-RELEASE.tar.gz#/swift-sdk-generator.tar.gz Source30: https://github.com/apple/swift-format/archive/refs/heads/release/%{swift_format_version}.zip#/swift-format.zip Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz -Source36: https://github.com/unicode-org/icu/archive/refs/heads/maint/maint-%{icu_version}.zip#/icu.zip +Source36: https://github.com/apple/swift-async-algorithms/archive/refs/tags/%{swift_async_algorithms_version}.tar.gz#/swift-async-algorithms.tar.gz Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz Source39: https://github.com/apple/swift-llvm-bindings/archive/refs/heads/swift/release/%{swift_llvm_bindings_version}.zip#/swift-llvm-bindings.zip Source40: https://github.com/apple/swift-foundation-icu/archive/refs/heads/release/%{swift_foundation_icu_version}.zip#/swift-foundation-icu.zip Source41: https://github.com/apple/swift-foundation/archive/refs/heads/release/%{swift_foundation_version}.zip#/swift-foundation.zip Source42: https://github.com/apple/swift-testing/archive/refs/tags/swift-%{swift_version}.tar.gz#/swift-testing.tar.gz -Source43: https://github.com/madler/zlib/releases/download/v%{zlib_version}/zlib13.zip +Source43: https://github.com/madler/zlib/releases/download/v%{zlib_version}/zlib131.zip Source44: swiftlang.conf +Source45: https://github.com/apple/swift-log/archive/refs/tags/%{swift_log_version}.tar.gz#/swift-log.tar.gz +Source46: https://github.com/swiftlang/swift-toolchain-sqlite/archive/refs/tags/%{swift_toolchain_sqlite_version}.tar.gz#/swift-toolchain-sqlite.tar.gz Patch1: need_pic.patch Patch2: no_pipes.patch Patch3: enable_lzma.patch -Patch4: resource_dir.patch -Patch5: have_strcat.patch -Patch6: latest_python.patch +Patch5: remove_termio.diff +Patch6: fix_chain_comparison.patch Patch7: disable_warning.patch Patch8: no_testable_package.patch Patch9: clang_crash_fix.patch Patch10: need_cstdint.patch +Patch11: fix_foundation_cmath.patch BuildRequires: clang BuildRequires: swig @@ -162,7 +168,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39 -a 40 -a 41 -a 42 -a 43 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39 -a 40 -a 41 -a 42 -a 43 -a 45 -a 46 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -193,7 +199,6 @@ mv swift-collections-%{swift_collections_version} swift-collections mv swift-numerics-%{swift_numerics_version} swift-numerics mv swift-system-%{swift_system_version} swift-system mv swift-nio-%{swift_nio_version} swift-nio -mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl mv swift-format-release-%{swift_format_version} swift-format mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown @@ -204,9 +209,10 @@ mv swift-asn1-%{swift_asn1_version} swift-asn1 mv swift-llvm-bindings-swift-release-%{swift_llvm_bindings_version} swift-llvm-bindings mv swift-foundation-icu-release-%{swift_foundation_icu_version} swift-foundation-icu mv swift-foundation-release-%{swift_foundation_version} swift-foundation - -# ICU -mv icu-maint-maint-%{icu_version} icu +mv swift-sdk-generator-swift-%{swift_sdk_generator_version}-RELEASE swift-sdk-generator +mv swift-async-algorithms-%{swift_async_algorithms_version} swift-async-algorithms +mv swift-log-%{swift_log_version} swift-log +mv swift-toolchain-sqlite-%{swift_toolchain_sqlite_version} swift-toolchain-sqlite # Yams mv Yams-%{yams_version} yams @@ -216,6 +222,7 @@ mv ninja-%{ninja_version} ninja # WasmKit mv WasmKit-%{wasmkit_version} wasmkit +mv wasi-libc-wasi-sdk-%{wasi_version} wasi-libc # zlib mv zlib-%{zlib_version} zlib @@ -233,19 +240,11 @@ mv zlib-%{zlib_version} zlib # Enable LZMA %patch -P3 -p0 -# Weird (hopefully temp) situation of strlcpy and strncat -# not being found at the system level -# This does not work for EPEL9, so we need to make sure -# that this patch is _not_ applied when building for EPEL9 -%if ! 0%{?el9} +# Remove references to obsolete termio struct %patch -P5 -p0 -%endif -# After Python 3.12 certain functions have been removed, -# which is in Fedora 41 -%if 0%{?fedora} >= 41 +# Fix a chained comparison discrepancy %patch -P6 -p0 -%endif # disable warning treated as error in libdispatch %patch -P7 -p0 @@ -265,11 +264,14 @@ mv zlib-%{zlib_version} zlib # Explicitly include for int64 %patch -P10 -p0 +# Fix C/C++ math header conflicts in Foundation +%patch -P11 -p0 + %build export VERBOSE=1 # Here we go! -swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_test skip-early-swiftsyntax=true install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz %install @@ -320,6 +322,10 @@ export QA_SKIP_RPATHS=1 %changelog +* Fri Sep 12 2025 Link Dupont - 6.1.3-1 +- Update to 6.1.3-RELEASE (RHBZ#2356394) +- Fix FTBFS in Fedora 43 (RHBZ#2385672) + * Fri Jul 25 2025 Fedora Release Engineering - 6.0.3-4.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cb9b38358795c4845ee819a587d62edb4bd644c3 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Tue, 16 Sep 2025 22:56:22 -0400 Subject: [PATCH 142/152] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 716 +++++++++++++++++++++++++++++++++++++++++++++++ swift-lang.spec | 720 +----------------------------------------------- 2 files changed, 718 insertions(+), 718 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..b3a89c1 --- /dev/null +++ b/changelog @@ -0,0 +1,716 @@ +* Fri Sep 12 2025 Link Dupont - 6.1.3-1 +- Update to 6.1.3-RELEASE (RHBZ#2356394) +- Fix FTBFS in Fedora 43 (RHBZ#2385672) + +* Fri Jul 25 2025 Fedora Release Engineering - 6.0.3-4.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jan 22 2025 Ron Olson - 6.0.3-4 +- Resolves: rhbz#2341403 +* Wed Jan 22 2025 Ron Olson - 6.0.3-3 +- Added patch to explicitly include cstdint +* Sun Jan 19 2025 Fedora Release Engineering - 6.0.3-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Dec 16 2024 Ron Olson - 6.0.3-2 +- Added swift-run and swift-build as symlinks for future + versions of Swift +* Thu Dec 12 2024 Ron Olson - 6.0.3-1 +- Updated to Swift 6.0.3-RELEASE + Resolves: rhbz#2332031 +* Tue Dec 10 2024 Zephyr Lykos - 6.0.2-2 +- fix libdir symlink installation +* Thu Nov 14 2024 Ron Olson - 6.0.2-1 +- Updated to Swift 6.0.2-RELEASE + Resolves: rhbz#2291122 + Resolves: rhbz#2322729 + Resolves: rhbz#2324076 +* Wed Sep 25 2024 Ron Olson - 6.0.1-1 +- Updated to Swift 6.0.1-RELEASE +* Mon Sep 16 2024 Ron Olson - 6.0-1 +- Updated to Swift 6.0-RELEASE +* Mon Aug 26 2024 Zephyr Lykos - 6.0-1 +- Export Swift development tool libraries to libdir +* Mon Jul 22 2024 Byoungchan Lee - 6.0-1 +- Minimize runtime/compile time dependencies +* Fri Jul 19 2024 Ron Olson - 6.0-1 +- Added file to add the Swift libraries to the ld.so.conf.d directory +* Sun Jun 30 2024 Ron Olson - 6.0-1 +- Patch from finagolfin + https://github.com/swiftlang/swift/pull/74814 +* Tue Apr 23 2024 Ron Olson - 6.0-1 +- First attempt at getting 6.0 working +* Mon Sep 18 2023 Ron Olson - 5.9-1 +- Updated to Swift 5.9-RELEASE + Resolves: rhbz#2239543 +* Fri Sep 15 2023 Ron Olson - 5.10-1 +- First working version of Swift 5.10 +* Wed Mar 29 2023 Ron Olson - 5.9-1 +- Cleanup and first attempt at getting 5.9 going though + 5.8 hasn't been released yet +* Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Tue Dec 27 2022 Ron Olson - 5.8-1 +- Cleanup and first attempt at getting 5.8 going +* Fri Dec 16 2022 Ron Olson - 5.7.2-2 +- SPDX migration +* Wed Dec 14 2022 Ron Olson - 5.7.2-1 +- Updated to Swift 5.7.2-RELEASE + Resolves: rhbz#2153189 +* Wed Nov 02 2022 Ron Olson - 5.7.1-1 +- Updated to Swift 5.7.1-RELEASE + Resolves: rhbz#2139320 +* Tue Nov 01 2022 Ron Olson - 5.7-4 +- Merged fix from Lumír Balhar to replace the pathfix.py tool + with the new way for Python 3.12 +* Tue Sep 27 2022 Ron Olson - 5.7-3 +- Resolves: rhbz#2130233 +* Tue Sep 27 2022 Ron Olson - 5.7-2 +- Added patch to handle an initialized variable but not + used +* Tue Sep 13 2022 Ron Olson - 5.7-1 +- Updated to Swift 5.7-RELEASE +* Thu May 05 2022 Ron Olson - 5.7-1 +- First working version of Swift 5.7 +* Mon Apr 25 2022 Ron Olson - 5.7-1 +- First attempt to build swift-5.7 +* Thu Apr 21 2022 Ron Olson - 5.6.1-2 +- Removed ncurses-compat-libs as a runtime dependency as it + has been removed from Fedora Rawhide +* Mon Apr 11 2022 Ron Olson - 5.6.1-1 +- Updated to Swift 5.6.1-RELEASE +* Wed Mar 30 2022 Ron Olson - 5.6-1 +- Updated to Swift 5.6-RELEASE +* Tue Feb 15 2022 Ron Olson - 5.5.3-1 +- Updated to Swift 5.5.3-RELEASE +* Sat Jan 22 2022 Fedora Release Engineering - 5.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Wed Jan 12 2022 Ron Olson - 5.6-1 +- First build of Swift-5.6 +* Tue Dec 14 2021 Ron Olson - 5.5.2-1 +- Updated to Swift 5.5.2-RELEASE +* Wed Oct 27 2021 Ron Olson - 5.5.1-1 +- Updated to Swift 5.5.1-RELEASE +* Tue Sep 21 2021 Ron Olson - 5.5-1 +- Updated to Swift 5.5-RELEASE +* Fri Sep 17 2021 Ron Olson - 5.4.3-2 +- Added patch to allow building using Clang 13 +* Wed Sep 15 2021 Ron Olson - 5.4.3-1 +- Updated to swift-5.4.3-RELEASE +* Fri Jul 23 2021 Fedora Release Engineering - 5.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Thu Jul 15 2021 Ron Olson - 5.4.2-2 +- Discovered that EPEL-8 doesn't have binutils-gold +* Mon Jul 05 2021 Ron Olson - 5.4.2-1 +- Updated to swift-5.4.2-RELEASE +* Mon Jun 21 2021 Ron Olson - 5.4.1-2 +- Changes for EPEL-8 +* Thu Jun 10 2021 Ron Olson - 5.4.1-1 +- Added fix for RPATH problems +* Fri Jun 04 2021 Python Maint - 5.4-2 +- Rebuilt for Python 3.10 +* Thu Jun 03 2021 Ron Olson 5.5-1 +- Removed special CMake stuff for EPEL 8 +* Tue Jun 01 2021 Ron Olson 5.5-1 +- Added patch to remove Cyclades from LLVM +* Fri May 28 2021 Jesús Abelardo Saldívar Aguilar 5.5-1 +- Added patches to fix circular dependency on PkgConfig +* Fri May 21 2021 Ron Olson 5.5-1 +- First version of Swift 5.5 - 5.5-DEVELOPMENT-SNAPSHOT-2021-05-18-a +* Tue Apr 27 2021 Ron Olson 5.4-1 +- Updated to swift-5.4-RELEASE +* Tue Apr 06 2021 Ron Olson 5.4-1 +- Updated to swift-5.4-DEVELOPMENT-SNAPSHOT-2021-03-25-a +* Tue Mar 30 2021 Jonathan Wakely - 5.3.3-2 +- Rebuilt for removed libstdc++ symbol (#1937698) +* Thu Jan 28 2021 Ron Olson 5.3.3-1 +- Updated to swift-5.3.3-RELEASE +* Wed Jan 27 2021 Fedora Release Engineering - 5.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Thu Jan 21 2021 Ron Olson 5.4-1 +- First working version of Swift 5.4 +* Tue Dec 22 2020 Ron Olson 5.3.2-1 +- Updated to swift-5.3.2-RELEASE +* Fri Dec 04 2020 Jeff Law 5.3.1-2 +- Fix missing #include for gcc-11 + +* Fri Nov 13 2020 Ron Olson 5.3.1-1 +- Updated to swift-5.3.1-RELEASE +* Thu Sep 17 2020 Ron Olson 5.3-1 +- Updated to swift-5.3-RELEASE +* Mon Aug 10 2020 Ron Olson 5.2.5-1 +- Updated to swift-5.2.5-RELEASE +* Wed Jul 29 2020 Fedora Release Engineering - 5.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 5.2.4-2 +- Rebuilt for Python 3.9 + +* Wed May 20 2020 Ron Olson 5.2.4-1 +- Updated to swift-5.2.4-RELEASE +* Wed Apr 29 2020 Ron Olson 5.2.3-1 +- Updated to swift-5.2.3-RELEASE +* Fri Apr 17 2020 Ron Olson 5.2.2-2 +- Added patch to remove use of sys/sysctl.h as it was removed + in Rawhide (future F33) +* Wed Apr 15 2020 Ron Olson 5.2.2-1 +- Updated to swift-5.2.2-RELEASE +* Sun Apr 12 2020 Ron Olson 5.2.1-3 +- Put CMake back as a build step because the version in EPEL 8 is too + old +* Sun Apr 12 2020 Ron Olson 5.2.1-2 +- Added s390x architecture and F30-specific requires +* Mon Apr 06 2020 Ron Olson 5.2.1-1 +- Reorganized the package to place everything in a single location, + changed the versioning scheme, and removed a number of obsolete patches +* Wed Apr 01 2020 Ron Olson 5.2.1-0.1.20200331git2e3b1b3 +- Updated to swift-5.2.1-RELEASE +* Wed Mar 25 2020 Ron Olson 5.2-0.10.20200324git443e9a4 +- Updated to swift-5.2-RELEASE +* Thu Mar 12 2020 Ron Olson 5.2-0.9.20200311git33150e3 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-03-11-a and switched to + using patched version of cmake to get around issues building 5.2 with + 3.17 +* Fri Feb 28 2020 Ron Olson 5.2-0.8.20200227git33150e3 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-27-a +* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a +* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a +* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a +* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a +* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a +* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a +* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 +- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a +* Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a +* Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-19-a +* Thu Dec 19 2019 Ron Olson 5.1-0.4.20191218git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-18-a +* Wed Dec 18 2019 Ron Olson 5.1-0.3.20191217git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-17-a +* Tue Dec 17 2019 Ron Olson 5.1-0.2.20191216git04833a6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-16-a +* Fri Dec 13 2019 Ron Olson 5.1.3-0.1.20191213git005fc1f +- Updated to swift-5.1.3-RELEASE +* Fri Dec 13 2019 Ron Olson 5.1-0.20.20191212gita22eb08 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-12-a +* Wed Dec 11 2019 Ron Olson 5.1-0.19.20191210git4a1b378 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-10-a +* Tue Dec 10 2019 Ron Olson 5.1-0.18.20191209git4a1b378 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-09-a +* Mon Dec 09 2019 Ron Olson 5.1-0.17.20191130gited9117a +- Release of 5.1.2 with sourcekit-lsp enabled. The user still needs to build + and install the plugin for vscode; if they do this version will support + code-completion, also works with neovim too +* Sat Dec 07 2019 Ron Olson 5.1-0.16.20191206git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-06-a +* Fri Dec 06 2019 Ron Olson 5.1-0.15.20191205git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-05-a +* Thu Dec 05 2019 Ron Olson 5.1-0.14.20191204git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-04-a +* Wed Dec 04 2019 Ron Olson 5.1-0.13.20191203git4b8db65 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-03-a +* Sat Nov 30 2019 Ron Olson 5.1-0.12.20191129git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-29-a +* Fri Nov 29 2019 Ron Olson 5.1-0.11.20191128git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-28-a +* Thu Nov 28 2019 Ron Olson 5.1-0.10.20191127git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-27-a +* Wed Nov 27 2019 Ron Olson 5.1-0.9.20191126git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-26-a +* Tue Nov 26 2019 Ron Olson 5.1-0.8.20191125git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-25-a +* Mon Nov 25 2019 Ron Olson 5.1-0.7.20191124git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-24-a +* Sat Nov 23 2019 Ron Olson 5.1-0.6.20191122git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-22-a +* Fri Nov 22 2019 Ron Olson 5.1-0.5.20191121git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-21-a +* Tue Nov 19 2019 Ron Olson 5.1-0.4.20191118git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-18-a +* Mon Nov 18 2019 Ron Olson 5.1-0.3.20191117git60f3082 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-17-a +* Sat Nov 16 2019 Ron Olson 5.1-0.2.20191115git51fe191 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-15-a +* Fri Nov 15 2019 Ron Olson 5.1.3-0.1.20191114gite74feb6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-14-a +* Thu Nov 07 2019 Ron Olson 5.1.2-0.1.20191107git71def56 +- Updated to swift-5.1.2-RELEASE +* Wed Nov 06 2019 Ron Olson 5.1-0.7.20191105gitb368b0d +- Added icu, also updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-05-a +* Mon Nov 04 2019 Ron Olson 5.1-0.6.20191101git74328cd +- Added unpackaged files, switched to new llvm-project-based subproject +* Sun Nov 03 2019 Ron Olson 5.1-0.5.20191101git74328cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-01-a +* Thu Oct 31 2019 Ron Olson 5.1.1-0.4.20191004git4242edd +- Added sourcekit-lsp +* Wed Oct 30 2019 Ron Olson 5.1.1-0.3.20191004git4242edd +- Clang 9 was causing compiler-rt to not build properly due to a macro. +* Thu Oct 17 2019 Ron Olson 5.1.1-0.2.20191004git4242edd +- Fixed issue with installing swift-lang only gave the option for + swift-lang-runtime +* Fri Oct 04 2019 Ron Olson 5.1.1-0.1.20191004git4242edd +- Updated to swift-5.1.1-RELEASE +* Thu Sep 19 2019 Ron Olson 5.1-0.57.20190919gitfa33242 +- Updated to swift-5.1-RELEASE and removed FrameworkABIBaseline as apparently + it disappeared +* Thu Sep 19 2019 Ron Olson 5.1-0.56.20190918gite05f800 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-18-a +* Wed Sep 18 2019 Ron Olson 5.1-0.55.20190917git1f49050 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-17-a +* Tue Sep 17 2019 Ron Olson 5.1-0.54.20190916git279ca88 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-16-a +* Mon Sep 16 2019 Ron Olson 5.1-0.53.20190915git279ca88 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-15-a +* Sun Sep 15 2019 Ron Olson 5.1-0.52.20190914git279ca88 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-14-a +* Sat Sep 14 2019 Ron Olson 5.1-0.51.20190913git11b9972 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-13-a +* Fri Sep 13 2019 Ron Olson 5.1-0.50.20190912gitb9d082f +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-12-a +* Thu Sep 12 2019 Ron Olson 5.1-0.49.20190911gitb8f4481 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-11-a +* Tue Sep 10 2019 Ron Olson 5.1-0.48.20190909git28a0436 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-09-a +* Mon Sep 09 2019 Ron Olson 5.1-0.47.20190908git28a0436 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-08-a also added test for + Red Hat Enterprise Linux and CentOS (when it is updated to match RHEL 8) + Also packaged some new files +* Fri Sep 06 2019 Ron Olson 5.1-0.46.20190905git1880eb0 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-05-a +* Thu Sep 05 2019 Ron Olson 5.1-0.45.20190904git1880eb0 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-04-a +* Wed Sep 04 2019 Ron Olson 5.1-0.44.20190903gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-03-a +* Tue Sep 03 2019 Ron Olson 5.1-0.43.20190902gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-02-a +* Mon Sep 02 2019 Ron Olson 5.1-0.42.20190901gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-01-a +* Sun Sep 01 2019 Ron Olson 5.1-0.41.20190831gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-31-a +* Fri Aug 30 2019 Ron Olson 5.1-0.40.20190829gitfcc37cd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-29-a +* Thu Aug 29 2019 Ron Olson 5.1-0.39.20190828gite90298c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-28-a and added explicit + requirement for python3-distro +* Wed Aug 28 2019 Ron Olson 5.1-0.38.20190827gite90298c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-27-a and added a patch + to allow LLDB to be built using Python 3.8 (currently in F32/Rawhide) +* Tue Aug 27 2019 Ron Olson 5.1-0.37.20190826git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-26-a +* Mon Aug 26 2019 Ron Olson 5.1-0.36.20190825git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-25-a +* Sun Aug 25 2019 Ron Olson 5.1-0.35.20190824git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a +* Sat Aug 24 2019 Ron Olson 5.1-0.34.20190823git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-23-a +* Fri Aug 23 2019 Ron Olson 5.1-0.33.20190822git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-22-a +* Wed Aug 21 2019 Ron Olson 5.1-0.32.20190820git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-20-a +* Mon Aug 19 2019 Ron Olson 5.1-0.31.20190817git3b0cf9e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-17-a +* Sat Aug 17 2019 Ron Olson 5.1-0.30.20190816git1329017 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-16-a +* Fri Aug 16 2019 Ron Olson 5.1-0.29.20190815git1329017 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-15-a +* Wed Aug 14 2019 Ron Olson 5.1-0.28.20190813git425a146 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a +* Tue Aug 13 2019 Ron Olson 5.1-0.27.20190812git425a146 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-12-a and added another + directory +* Fri Jul 26 2019 Ron Olson 5.1-0.26.20190725git0450b7d +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-25-a +* Thu Jul 25 2019 Ron Olson 5.1-0.25.20190724gite9b6385 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-24-a +* Wed Jul 24 2019 Ron Olson 5.1-0.24.20190723git3e8f631 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-23-a +* Tue Jul 23 2019 Ron Olson 5.1-0.23.20190719gitf883175 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-19-a and first version + that relies on Python 3 for building +* Mon Jul 15 2019 Ron Olson 5.1-0.22.20190714git7b90512 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-14-a +* Sun Jul 14 2019 Ron Olson 5.1-0.21.20190713git26c2dbe +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-13-a +* Sat Jul 13 2019 Ron Olson 5.1-0.20.20190712gita062b3c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-12-a +* Fri Jul 12 2019 Ron Olson 5.1-0.19.20190711gitacd767e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-11-a +* Thu Jul 11 2019 Ron Olson 5.1-0.18.20190710gitd7f811d +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-10-a +* Wed Jul 10 2019 Ron Olson 5.1-0.17.20190709gitf67864b +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-09-a +* Thu Jul 04 2019 Ron Olson 5.1-0.16.20190703gitd2c038e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-03-a +* Wed Jul 03 2019 Ron Olson 5.1-0.15.20190702git2efadfd +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-02-a +* Tue Jul 02 2019 Ron Olson 5.1-0.14.20190701git6761ba4 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-01-a and removed + dependency on python-sphinx as a problem with a pygments lexer was being + treated as an error and causing the builds to fail +* Sun Jun 30 2019 Ron Olson 5.1-0.13.20190629gitdcde8ac +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-29-a +* Sat Jun 29 2019 Ron Olson 5.1-0.12.20190628gitca3c825 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-28-a +* Fri Jun 28 2019 Ron Olson 5.1-0.11.20190627git993b248 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-27-a +* Thu Jun 27 2019 Ron Olson 5.1-0.10.20190626git16859f1 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-26-a and added patch + to remove reference to depreciated header file +* Wed Jun 26 2019 Ron Olson 5.1-0.9.20190624git4e7bcdb +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-24-a and got the REPL + to work +* Sun Jun 23 2019 Ron Olson 5.1-0.8.20190621git9729868 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-21-a +* Fri Jun 21 2019 Ron Olson 5.1-0.7.20190620gita5aa0c6 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-20-a +* Thu Jun 20 2019 Ron Olson 5.1-0.6.20190619git500333c +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-19-a +* Thu Jun 20 2019 Ron Olson 5.1-0.5.20190619git500333c +- Cleaned up the spec file to remove 4.2 to 5 migration code and some + old patches +* Mon Jun 17 2019 Ron Olson 5.1-0.4.20190616gitcbfbc8e +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-16-a +* Sun Jun 02 2019 Ron Olson 5.1-0.3.20190529git37f230a +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-05-29-a +* Fri Apr 26 2019 Ron Olson 5.1-0.2.20190425git6d89fc9 +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-04-25-a +* Thu Apr 18 2019 Ron Olson 5.1-0.1.20190416git85a776d +- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-04-16-a +* Thu Mar 28 2019 Ron Olson 5.0-0.53.20190325gitba33f9e +- Modified spec file to handle upgrades from 4.2 to 5.0. +* Mon Mar 25 2019 Ron Olson 5.0-0.52.20190325gitba33f9e +- Updated to swift-5.0-RELEASE +* Mon Mar 25 2019 Ron Olson 5.0-0.51.20190324git130a414 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-24-a, removed _gettid + patch as the changed were merged upstream +* Fri Mar 22 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- The swift-corelibs-xctest library was being zeroed out due to issue with + CMake 3.14 where it was being copied into the same directory. A bug + report has been filed with CMake but until it is resolved, the cmake file + has been patched to not perform the copy. +* Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- Modules did not work properly in the REPL due to additional lib path; + fixed with symlinks to the lower directory structures +* Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- python2-sphinx was removed from Fedora after 30 so it will use the python3 + version +* Thu Mar 14 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- Fixed issues introduced by upstream changes +* Mon Mar 11 2019 Ron Olson 5.0-0.50.20190310git4d6e741 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a +* Thu Mar 07 2019 Ron Olson 5.0-0.49.20190306git5834830 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-06-a +* Wed Mar 06 2019 Ron Olson 5.0-0.48.20190305git5834830 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-05-a +* Tue Mar 05 2019 Ron Olson 5.0-0.47.20190304gitad10379 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-04-a +* Fri Mar 01 2019 Ron Olson 5.0-0.46.20190228gitfeacc3f +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a +* Wed Feb 27 2019 Ron Olson 5.0-0.45.20190226gitfa5d493 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-26-a +* Tue Feb 26 2019 Ron Olson 5.0-0.44.20190225gita8126fb +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-25-a +* Mon Feb 25 2019 Ron Olson 5.0-0.43.20190224gita8126fb +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-24-a +* Sun Feb 24 2019 Ron Olson 5.0-0.42.20190223gita8126fb +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-23-a +* Sat Feb 23 2019 Ron Olson 5.0-0.41.20190222gita24adaf +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-22-a +* Fri Feb 22 2019 Ron Olson 5.0-0.40.20190221git86a39df +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-21-a +* Thu Feb 21 2019 Ron Olson 5.0-0.39.20190220git817dff3 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-20-a +* Wed Feb 20 2019 Ron Olson 5.0-0.38.20190219git817dff3 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-19-a +* Mon Feb 18 2019 Ron Olson 5.0-0.37.20190217git15be364 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-17-a +* Sun Feb 17 2019 Ron Olson 5.0-0.36.20190216git15be364 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-16-a +* Sat Feb 16 2019 Ron Olson 5.0-0.35.20190215git15be364 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-15-a +* Fri Feb 15 2019 Ron Olson 5.0-0.34.20190214git8d88441 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-14-a +* Wed Feb 13 2019 Ron Olson 5.0-0.33.20190206gitd07c25a +- Added patch to fix an issue with compiler-rt using std::thread in a vector +* Fri Feb 08 2019 Ron Olson 5.0-0.32.20190206gitd07c25a +- Added patch to allow the Swift REPL to work properly, also removed patch + for aarch64 because the changes were merged upstream +* Sun Feb 03 2019 Fedora Release Engineering - 5.0-0.31.20181214gitee39236 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* 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 +* 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 +- 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 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a +* Wed Dec 05 2018 Egor Zhdan +- Include dependencies to ncurses which are required by SourceKit and + included in Apple installation guide +* 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 +- 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 +- 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 +- 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 +- 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 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-16-a +* Fri Nov 16 2018 Ron Olson 5.0-0.10.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 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-29-a +* Sat Oct 27 2018 Ron Olson 4.2-0.99.20181026gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-26-a +* Fri Oct 26 2018 Ron Olson 4.2-0.98.20181025gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-25-a +* Wed Oct 24 2018 Ron Olson 4.2-0.97.20181023gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-23-a +* Tue Oct 23 2018 Ron Olson 4.2-0.96.20181022gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-22-a +* Mon Oct 22 2018 Ron Olson 4.2-0.95.20181021gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-21-a +* Sun Oct 21 2018 Ron Olson 4.2-0.94.20181020gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-20-a +* Fri Oct 19 2018 Ron Olson 4.2-0.93.20181018gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-18-a +* Thu Oct 18 2018 Ron Olson 4.2-0.92.20181017gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-17-a +* Wed Oct 17 2018 Ron Olson 4.2-0.91.20181016gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-16-a +* Tue Oct 16 2018 Ron Olson 4.2-0.90.20181015gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-15-a +* Mon Oct 15 2018 Ron Olson 4.2-0.89.20181014gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-14-a +* Sun Oct 14 2018 Ron Olson 4.2-0.88.20181013gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-13-a +* Sat Oct 13 2018 Ron Olson 4.2-0.87.20181012gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-12-a +* Fri Oct 12 2018 Ron Olson 4.2-0.86.20181011gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-11-a +* Thu Oct 11 2018 Ron Olson 4.2-0.85.20181010gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-10-a +* Wed Oct 10 2018 Ron Olson 4.2-0.84.20181009gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-09-a +* Tue Oct 09 2018 Ron Olson 4.2-0.83.20181008gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-08-a +* Mon Oct 08 2018 Ron Olson 4.2-0.82.20181007gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-07-a +* Sun Oct 07 2018 Ron Olson 4.2-0.81.20181006gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-06-a +* Sat Oct 06 2018 Ron Olson 4.2-0.80.20181005gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-05-a +* Thu Oct 04 2018 Ron Olson 4.2-0.79.20181003gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-03-a +* Wed Oct 03 2018 Ron Olson 4.2-0.78.20181002gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-02-a +* Tue Oct 02 2018 Ron Olson 4.2-0.77.20181001gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-01-a +* Sat Sep 29 2018 Ron Olson 4.2-0.76.20180928gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-28-a +* Fri Sep 28 2018 Ron Olson 4.2-0.75.20180927gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-27-a +* Thu Sep 27 2018 Ron Olson 4.2-0.74.20180926gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-26-a +* Wed Sep 26 2018 Ron Olson 4.2-0.73.20180925gitf4134eb +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-25-a +* Tue Sep 25 2018 Ron Olson 4.2-0.72.20180924git01644d5 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-24-a +* Mon Sep 24 2018 Ron Olson 4.2-0.71.20180922gitac7c511 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-22-a +* Sat Sep 15 2018 Ron Olson 4.2-0.70.20180914git2dfdbf2 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-14-a +* Fri Sep 14 2018 Ron Olson 4.2-0.69.20180913git2dfdbf2 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-13-a +* Thu Sep 13 2018 Ron Olson 4.2-0.68.20180912git2c6399a +- Updated to swift-4.2-RELEASE +* Wed Sep 12 2018 Ron Olson 4.2-0.67.20180911gitbe88499 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-11-a +* Sun Sep 09 2018 Ron Olson 4.2-0.66.20180908gitbe88499 +- Added patch for clang 7.0 +* Sun Sep 09 2018 Ron Olson 4.2-0.65.20180908gitbe88499 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-08-a +* Sat Sep 08 2018 Ron Olson 4.2-0.64.20180907gitc922f68 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-07-a +* Sun Aug 26 2018 Ron Olson 4.2-0.63.20180825git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-25-a +* Sat Aug 25 2018 Ron Olson 4.2-0.62.20180824git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-24-a +* Fri Aug 24 2018 Ron Olson 4.2-0.61.20180823git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-23-a +* Thu Aug 23 2018 Ron Olson 4.2-0.60.20180822git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-22-a +* Wed Aug 22 2018 Ron Olson 4.2-0.59.20180821git7d204ce +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-21-a +* Tue Aug 21 2018 Ron Olson 4.2-0.58.20180820gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a +* Sun Aug 19 2018 Ron Olson 4.2-0.57.20180818gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-18-a +* Sat Aug 18 2018 Ron Olson 4.2-0.56.20180817gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-17-a +* Fri Aug 17 2018 Ron Olson 4.2-0.55.20180816gitde88335 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-16-a +* Thu Aug 16 2018 Ron Olson 4.2-0.54.20180815gitefbe78e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-15-a +* Wed Aug 15 2018 Ron Olson 4.2-0.53.20180814git3146921 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-14-a +* Sat Aug 11 2018 Ron Olson 4.2-0.52.20180810gita710c2f +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-10-a +* Thu Aug 09 2018 Ron Olson 4.2-0.51.20180808git1c8f885 +- Updated to swift-4.2-CONVERGENCE +* Wed Aug 08 2018 Ron Olson 4.2-0.50.20180807gitab5ce2e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-07-a +* Tue Aug 07 2018 Ron Olson 4.2-0.49.20180806gitab5ce2e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-06-a +* Sat Aug 04 2018 Ron Olson 4.2-0.48.20180803git68f32fc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-03-a +* Fri Aug 03 2018 Ron Olson 4.2-0.47.20180802git44a88d4 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-02-a +* Thu Aug 02 2018 Ron Olson 4.2-0.46.20180801git3f7d681 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-01-a +* Wed Aug 01 2018 Ron Olson 4.2-0.45.20180731git00acd41 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-31-a +* Tue Jul 31 2018 Ron Olson 4.2-0.44.20180730gitfe1f442 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-30-a +* Sun Jul 29 2018 Ron Olson 4.2-0.43.20180728gitfe1f442 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-28-a +* Sat Jul 28 2018 Ron Olson 4.2-0.42.20180727git9d01b59 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-27-a +* Wed Jul 25 2018 Ron Olson 4.2-0.41.20180724git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a and removed + lldb patches as they were merged upstream into the 4.2 branch +* Tue Jul 24 2018 Ron Olson 4.2-0.40.20180723git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-23-a +* Mon Jul 23 2018 Ron Olson 4.2-0.39.20180722git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-22-a +* Sun Jul 22 2018 Ron Olson 4.2-0.38.20180721git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-21-a +* Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc +- Added patches for lldb to fix relative path issue (see URL by patches) until + it's merged into the 4.2 branch +* Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-20-a +* Fri Jul 20 2018 Ron Olson 4.2-0.36.20180719git9277281 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-19-a +* Thu Jul 19 2018 Ron Olson 4.2-0.35.20180718gite325e32 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-18-a +* Tue Jul 17 2018 Ron Olson 4.2-0.34.20180716gitaaf545a +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-16-a +* Sun Jul 15 2018 Ron Olson 4.2-0.33.20180703git107e307 +- Switched from __provides_exclude_from to __provides_exclude to inhibit + lldb being included as a dependency +* Thu Jul 12 2018 Ron Olson 4.2-0.32.20180703git107e307 +- Reverted to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a as loading modules + in the REPL seems to have been broken as of the 2018-07-04 builds. + 2018-07-03 is currently the best version until the issue is resolved. +* Thu Jul 12 2018 Ron Olson 4.2-0.31.20180711git104c96a +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-11-a +* Wed Jul 11 2018 Ron Olson 4.2-0.30.20180709gitd9561d9 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-09-a and added a check to + include python-unversioned-command for verisons greated than 28 while + working on making patches/pull requests upstream to be explicit about + which version of Python to use. Also removed patch for time struct issue + as the fix has been handled upstream. Also switched to ExclusiveArch + instead of ExcludeArch per suggestion from Dan Horák. +* Thu Jul 05 2018 Ron Olson 4.2-0.29.20180705git1e2dc99 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a +* Thu Jul 05 2018 Ron Olson 4.2-0.28.20180704gitf56a941 +- Removed explicit requirement on libatomic and libbsd, modifed files section + of the runtime package so it can own the directory +* Thu Jul 05 2018 Ron Olson 4.2-0.27.20180704gitf56a941 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-04-a +* Tue Jul 03 2018 Ron Olson 4.2-0.26.20180703git107e307 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a, added a + filter for excluding lldb libraries from public view, and broke out the + runtime libraries into their own -runtime package. +* Mon Jul 02 2018 Ron Olson 4.2-0.25.20180702gitc2e1567 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-02-a +* Mon Jul 02 2018 Ron Olson 4.2-0.24.20180701git6079032 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-01-a, removed unnecessary + lldb headers +* Sat Jun 30 2018 Ron Olson 4.2-0.23.20180630gitb3408e8 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-30-a +* Fri Jun 29 2018 Ron Olson 4.2-0.22.20180629gitdab0d8e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-29-a, removed unnecessary + files and links +* Fri Jun 29 2018 Ron Olson 4.2-0.21.20180628git9f8f2a1 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-28-a +* Thu Jun 28 2018 Ron Olson 4.2-0.20.20180626gitbe3b9a7 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-26-a +* Wed Jun 13 2018 Ron Olson 4.2-0.19.20180612gitbb9532c +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-12-a and removed + gcc-c++ as a build requirement +* Tue Jun 12 2018 Ron Olson 4.2-0.18.20180611gitd99cd32 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a and removed + separate ninja build (will now use the repo-based one) +* Mon Jun 11 2018 Ron Olson 4.2-0.17.20180610git7a35ad0 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a +* Fri Jun 08 2018 Ron Olson 4.2-0.16.20180607git78e9497 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-07-a +* Thu Jun 07 2018 Ron Olson 4.2-0.15.20180606git4e2064e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-06-a +* Tue Jun 05 2018 Ron Olson 4.2-0.14.20180604git9e274fc +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a +* Sun Jun 03 2018 Ron Olson 4.2-0.13.20180602gitadad0f5 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-02-a +* Wed May 30 2018 Ron Olson 4.2-0.12.20180529git4160301 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-29-a +* Wed May 23 2018 Ron Olson 4.2-0.11.20180522git58f7399 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-22-a +* Mon May 21 2018 Ron Olson 4.2-0.10.20180520gitbb77484 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-20-a and added + patch for removing sys/ustat.h references +* Tue May 15 2018 Ron Olson 4.2-0.9.20180514gitf58f528 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-14-a +* Wed May 09 2018 Ron Olson 4.2-0.8.20180508git0e6d867 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-08-a +* Wed May 02 2018 Ron Olson 4.2-0.7.20180502gitb08fb12 +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-02-a +* Mon Apr 23 2018 Ron Olson 4.2-0.6.20180422git5030d38 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-22-a +* Thu Apr 19 2018 Ron Olson 4.2-0.5.20180418gitac06163 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-18-a +* Mon Apr 16 2018 Ron Olson 4.2-0.4.20180415git22530b9 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-15-a +* Thu Apr 12 2018 Ron Olson 4.2-0.3.20180411git537a846 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-11-a +* Wed Feb 28 2018 Ron Olson 4.1-0.2.20180227git5f2f440 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-02-27-a +* Wed Feb 14 2018 Ron Olson 4.1-0.1.20180214git5a1a34b +- Initial package for Fedora diff --git a/swift-lang.spec b/swift-lang.spec index c34801c..5d6df21 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -13,7 +13,6 @@ ################################################# %global swift_version 6.1.3-RELEASE %global package_version 6.1.3 -%global fedora_release 1 %global swift_source_location swift-source @@ -47,7 +46,7 @@ Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist} +Release: %autorelease Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -322,719 +321,4 @@ export QA_SKIP_RPATHS=1 %changelog -* Fri Sep 12 2025 Link Dupont - 6.1.3-1 -- Update to 6.1.3-RELEASE (RHBZ#2356394) -- Fix FTBFS in Fedora 43 (RHBZ#2385672) - -* Fri Jul 25 2025 Fedora Release Engineering - 6.0.3-4.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed Jan 22 2025 Ron Olson - 6.0.3-4 -- Resolves: rhbz#2341403 -* Wed Jan 22 2025 Ron Olson - 6.0.3-3 -- Added patch to explicitly include cstdint -* Sun Jan 19 2025 Fedora Release Engineering - 6.0.3-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 16 2024 Ron Olson - 6.0.3-2 -- Added swift-run and swift-build as symlinks for future - versions of Swift -* Thu Dec 12 2024 Ron Olson - 6.0.3-1 -- Updated to Swift 6.0.3-RELEASE - Resolves: rhbz#2332031 -* Tue Dec 10 2024 Zephyr Lykos - 6.0.2-2 -- fix libdir symlink installation -* Thu Nov 14 2024 Ron Olson - 6.0.2-1 -- Updated to Swift 6.0.2-RELEASE - Resolves: rhbz#2291122 - Resolves: rhbz#2322729 - Resolves: rhbz#2324076 -* Wed Sep 25 2024 Ron Olson - 6.0.1-1 -- Updated to Swift 6.0.1-RELEASE -* Mon Sep 16 2024 Ron Olson - 6.0-1 -- Updated to Swift 6.0-RELEASE -* Mon Aug 26 2024 Zephyr Lykos - 6.0-1 -- Export Swift development tool libraries to libdir -* Mon Jul 22 2024 Byoungchan Lee - 6.0-1 -- Minimize runtime/compile time dependencies -* Fri Jul 19 2024 Ron Olson - 6.0-1 -- Added file to add the Swift libraries to the ld.so.conf.d directory -* Sun Jun 30 2024 Ron Olson - 6.0-1 -- Patch from finagolfin - https://github.com/swiftlang/swift/pull/74814 -* Tue Apr 23 2024 Ron Olson - 6.0-1 -- First attempt at getting 6.0 working -* Mon Sep 18 2023 Ron Olson - 5.9-1 -- Updated to Swift 5.9-RELEASE - Resolves: rhbz#2239543 -* Fri Sep 15 2023 Ron Olson - 5.10-1 -- First working version of Swift 5.10 -* Wed Mar 29 2023 Ron Olson - 5.9-1 -- Cleanup and first attempt at getting 5.9 going though - 5.8 hasn't been released yet -* Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Tue Dec 27 2022 Ron Olson - 5.8-1 -- Cleanup and first attempt at getting 5.8 going -* Fri Dec 16 2022 Ron Olson - 5.7.2-2 -- SPDX migration -* Wed Dec 14 2022 Ron Olson - 5.7.2-1 -- Updated to Swift 5.7.2-RELEASE - Resolves: rhbz#2153189 -* Wed Nov 02 2022 Ron Olson - 5.7.1-1 -- Updated to Swift 5.7.1-RELEASE - Resolves: rhbz#2139320 -* Tue Nov 01 2022 Ron Olson - 5.7-4 -- Merged fix from Lumír Balhar to replace the pathfix.py tool - with the new way for Python 3.12 -* Tue Sep 27 2022 Ron Olson - 5.7-3 -- Resolves: rhbz#2130233 -* Tue Sep 27 2022 Ron Olson - 5.7-2 -- Added patch to handle an initialized variable but not - used -* Tue Sep 13 2022 Ron Olson - 5.7-1 -- Updated to Swift 5.7-RELEASE -* Thu May 05 2022 Ron Olson - 5.7-1 -- First working version of Swift 5.7 -* Mon Apr 25 2022 Ron Olson - 5.7-1 -- First attempt to build swift-5.7 -* Thu Apr 21 2022 Ron Olson - 5.6.1-2 -- Removed ncurses-compat-libs as a runtime dependency as it - has been removed from Fedora Rawhide -* Mon Apr 11 2022 Ron Olson - 5.6.1-1 -- Updated to Swift 5.6.1-RELEASE -* Wed Mar 30 2022 Ron Olson - 5.6-1 -- Updated to Swift 5.6-RELEASE -* Tue Feb 15 2022 Ron Olson - 5.5.3-1 -- Updated to Swift 5.5.3-RELEASE -* Sat Jan 22 2022 Fedora Release Engineering - 5.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Wed Jan 12 2022 Ron Olson - 5.6-1 -- First build of Swift-5.6 -* Tue Dec 14 2021 Ron Olson - 5.5.2-1 -- Updated to Swift 5.5.2-RELEASE -* Wed Oct 27 2021 Ron Olson - 5.5.1-1 -- Updated to Swift 5.5.1-RELEASE -* Tue Sep 21 2021 Ron Olson - 5.5-1 -- Updated to Swift 5.5-RELEASE -* Fri Sep 17 2021 Ron Olson - 5.4.3-2 -- Added patch to allow building using Clang 13 -* Wed Sep 15 2021 Ron Olson - 5.4.3-1 -- Updated to swift-5.4.3-RELEASE -* Fri Jul 23 2021 Fedora Release Engineering - 5.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Thu Jul 15 2021 Ron Olson - 5.4.2-2 -- Discovered that EPEL-8 doesn't have binutils-gold -* Mon Jul 05 2021 Ron Olson - 5.4.2-1 -- Updated to swift-5.4.2-RELEASE -* Mon Jun 21 2021 Ron Olson - 5.4.1-2 -- Changes for EPEL-8 -* Thu Jun 10 2021 Ron Olson - 5.4.1-1 -- Added fix for RPATH problems -* Fri Jun 04 2021 Python Maint - 5.4-2 -- Rebuilt for Python 3.10 -* Thu Jun 03 2021 Ron Olson 5.5-1 -- Removed special CMake stuff for EPEL 8 -* Tue Jun 01 2021 Ron Olson 5.5-1 -- Added patch to remove Cyclades from LLVM -* Fri May 28 2021 Jesús Abelardo Saldívar Aguilar 5.5-1 -- Added patches to fix circular dependency on PkgConfig -* Fri May 21 2021 Ron Olson 5.5-1 -- First version of Swift 5.5 - 5.5-DEVELOPMENT-SNAPSHOT-2021-05-18-a -* Tue Apr 27 2021 Ron Olson 5.4-1 -- Updated to swift-5.4-RELEASE -* Tue Apr 06 2021 Ron Olson 5.4-1 -- Updated to swift-5.4-DEVELOPMENT-SNAPSHOT-2021-03-25-a -* Tue Mar 30 2021 Jonathan Wakely - 5.3.3-2 -- Rebuilt for removed libstdc++ symbol (#1937698) -* Thu Jan 28 2021 Ron Olson 5.3.3-1 -- Updated to swift-5.3.3-RELEASE -* Wed Jan 27 2021 Fedora Release Engineering - 5.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Thu Jan 21 2021 Ron Olson 5.4-1 -- First working version of Swift 5.4 -* Tue Dec 22 2020 Ron Olson 5.3.2-1 -- Updated to swift-5.3.2-RELEASE -* Fri Dec 04 2020 Jeff Law 5.3.1-2 -- Fix missing #include for gcc-11 - -* Fri Nov 13 2020 Ron Olson 5.3.1-1 -- Updated to swift-5.3.1-RELEASE -* Thu Sep 17 2020 Ron Olson 5.3-1 -- Updated to swift-5.3-RELEASE -* Mon Aug 10 2020 Ron Olson 5.2.5-1 -- Updated to swift-5.2.5-RELEASE -* Wed Jul 29 2020 Fedora Release Engineering - 5.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 5.2.4-2 -- Rebuilt for Python 3.9 - -* Wed May 20 2020 Ron Olson 5.2.4-1 -- Updated to swift-5.2.4-RELEASE -* Wed Apr 29 2020 Ron Olson 5.2.3-1 -- Updated to swift-5.2.3-RELEASE -* Fri Apr 17 2020 Ron Olson 5.2.2-2 -- Added patch to remove use of sys/sysctl.h as it was removed - in Rawhide (future F33) -* Wed Apr 15 2020 Ron Olson 5.2.2-1 -- Updated to swift-5.2.2-RELEASE -* Sun Apr 12 2020 Ron Olson 5.2.1-3 -- Put CMake back as a build step because the version in EPEL 8 is too - old -* Sun Apr 12 2020 Ron Olson 5.2.1-2 -- Added s390x architecture and F30-specific requires -* Mon Apr 06 2020 Ron Olson 5.2.1-1 -- Reorganized the package to place everything in a single location, - changed the versioning scheme, and removed a number of obsolete patches -* Wed Apr 01 2020 Ron Olson 5.2.1-0.1.20200331git2e3b1b3 -- Updated to swift-5.2.1-RELEASE -* Wed Mar 25 2020 Ron Olson 5.2-0.10.20200324git443e9a4 -- Updated to swift-5.2-RELEASE -* Thu Mar 12 2020 Ron Olson 5.2-0.9.20200311git33150e3 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-03-11-a and switched to - using patched version of cmake to get around issues building 5.2 with - 3.17 -* Fri Feb 28 2020 Ron Olson 5.2-0.8.20200227git33150e3 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-27-a -* Sun Feb 02 2020 Ron Olson 5.2-0.7.20200201git66c06ab -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-02-01-a -* Sat Feb 01 2020 Ron Olson 5.2-0.6.20200131gitfab20c6 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-31-a -* Thu Jan 30 2020 Ron Olson 5.2-0.5.20200129gita0c1677 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-29-a -* Tue Jan 28 2020 Ron Olson 5.2-0.4.20200127git7c02102 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-27-a -* Mon Jan 20 2020 Ron Olson 5.2-0.3.20200117git3194881 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-17-a -* Fri Jan 10 2020 Ron Olson 5.2-0.2.20200109git880e9e6 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-09-a -* Tue Jan 07 2020 Ron Olson 5.2-0.1.20200106git74df113 -- Updated to swift-5.2-DEVELOPMENT-SNAPSHOT-2020-01-06-a -* Sat Dec 21 2019 Ron Olson 5.1-0.6.20191220git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-20-a -* Fri Dec 20 2019 Ron Olson 5.1-0.5.20191219git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-19-a -* Thu Dec 19 2019 Ron Olson 5.1-0.4.20191218git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-18-a -* Wed Dec 18 2019 Ron Olson 5.1-0.3.20191217git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-17-a -* Tue Dec 17 2019 Ron Olson 5.1-0.2.20191216git04833a6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-16-a -* Fri Dec 13 2019 Ron Olson 5.1.3-0.1.20191213git005fc1f -- Updated to swift-5.1.3-RELEASE -* Fri Dec 13 2019 Ron Olson 5.1-0.20.20191212gita22eb08 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-12-a -* Wed Dec 11 2019 Ron Olson 5.1-0.19.20191210git4a1b378 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-10-a -* Tue Dec 10 2019 Ron Olson 5.1-0.18.20191209git4a1b378 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-09-a -* Mon Dec 09 2019 Ron Olson 5.1-0.17.20191130gited9117a -- Release of 5.1.2 with sourcekit-lsp enabled. The user still needs to build - and install the plugin for vscode; if they do this version will support - code-completion, also works with neovim too -* Sat Dec 07 2019 Ron Olson 5.1-0.16.20191206git4b8db65 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-06-a -* Fri Dec 06 2019 Ron Olson 5.1-0.15.20191205git4b8db65 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-05-a -* Thu Dec 05 2019 Ron Olson 5.1-0.14.20191204git4b8db65 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-04-a -* Wed Dec 04 2019 Ron Olson 5.1-0.13.20191203git4b8db65 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-12-03-a -* Sat Nov 30 2019 Ron Olson 5.1-0.12.20191129git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-29-a -* Fri Nov 29 2019 Ron Olson 5.1-0.11.20191128git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-28-a -* Thu Nov 28 2019 Ron Olson 5.1-0.10.20191127git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-27-a -* Wed Nov 27 2019 Ron Olson 5.1-0.9.20191126git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-26-a -* Tue Nov 26 2019 Ron Olson 5.1-0.8.20191125git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-25-a -* Mon Nov 25 2019 Ron Olson 5.1-0.7.20191124git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-24-a -* Sat Nov 23 2019 Ron Olson 5.1-0.6.20191122git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-22-a -* Fri Nov 22 2019 Ron Olson 5.1-0.5.20191121git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-21-a -* Tue Nov 19 2019 Ron Olson 5.1-0.4.20191118git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-18-a -* Mon Nov 18 2019 Ron Olson 5.1-0.3.20191117git60f3082 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-17-a -* Sat Nov 16 2019 Ron Olson 5.1-0.2.20191115git51fe191 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-15-a -* Fri Nov 15 2019 Ron Olson 5.1.3-0.1.20191114gite74feb6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-14-a -* Thu Nov 07 2019 Ron Olson 5.1.2-0.1.20191107git71def56 -- Updated to swift-5.1.2-RELEASE -* Wed Nov 06 2019 Ron Olson 5.1-0.7.20191105gitb368b0d -- Added icu, also updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-05-a -* Mon Nov 04 2019 Ron Olson 5.1-0.6.20191101git74328cd -- Added unpackaged files, switched to new llvm-project-based subproject -* Sun Nov 03 2019 Ron Olson 5.1-0.5.20191101git74328cd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-11-01-a -* Thu Oct 31 2019 Ron Olson 5.1.1-0.4.20191004git4242edd -- Added sourcekit-lsp -* Wed Oct 30 2019 Ron Olson 5.1.1-0.3.20191004git4242edd -- Clang 9 was causing compiler-rt to not build properly due to a macro. -* Thu Oct 17 2019 Ron Olson 5.1.1-0.2.20191004git4242edd -- Fixed issue with installing swift-lang only gave the option for - swift-lang-runtime -* Fri Oct 04 2019 Ron Olson 5.1.1-0.1.20191004git4242edd -- Updated to swift-5.1.1-RELEASE -* Thu Sep 19 2019 Ron Olson 5.1-0.57.20190919gitfa33242 -- Updated to swift-5.1-RELEASE and removed FrameworkABIBaseline as apparently - it disappeared -* Thu Sep 19 2019 Ron Olson 5.1-0.56.20190918gite05f800 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-18-a -* Wed Sep 18 2019 Ron Olson 5.1-0.55.20190917git1f49050 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-17-a -* Tue Sep 17 2019 Ron Olson 5.1-0.54.20190916git279ca88 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-16-a -* Mon Sep 16 2019 Ron Olson 5.1-0.53.20190915git279ca88 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-15-a -* Sun Sep 15 2019 Ron Olson 5.1-0.52.20190914git279ca88 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-14-a -* Sat Sep 14 2019 Ron Olson 5.1-0.51.20190913git11b9972 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-13-a -* Fri Sep 13 2019 Ron Olson 5.1-0.50.20190912gitb9d082f -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-12-a -* Thu Sep 12 2019 Ron Olson 5.1-0.49.20190911gitb8f4481 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-11-a -* Tue Sep 10 2019 Ron Olson 5.1-0.48.20190909git28a0436 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-09-a -* Mon Sep 09 2019 Ron Olson 5.1-0.47.20190908git28a0436 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-08-a also added test for - Red Hat Enterprise Linux and CentOS (when it is updated to match RHEL 8) - Also packaged some new files -* Fri Sep 06 2019 Ron Olson 5.1-0.46.20190905git1880eb0 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-05-a -* Thu Sep 05 2019 Ron Olson 5.1-0.45.20190904git1880eb0 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-04-a -* Wed Sep 04 2019 Ron Olson 5.1-0.44.20190903gitfcc37cd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-03-a -* Tue Sep 03 2019 Ron Olson 5.1-0.43.20190902gitfcc37cd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-02-a -* Mon Sep 02 2019 Ron Olson 5.1-0.42.20190901gitfcc37cd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-09-01-a -* Sun Sep 01 2019 Ron Olson 5.1-0.41.20190831gitfcc37cd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-31-a -* Fri Aug 30 2019 Ron Olson 5.1-0.40.20190829gitfcc37cd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-29-a -* Thu Aug 29 2019 Ron Olson 5.1-0.39.20190828gite90298c -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-28-a and added explicit - requirement for python3-distro -* Wed Aug 28 2019 Ron Olson 5.1-0.38.20190827gite90298c -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-27-a and added a patch - to allow LLDB to be built using Python 3.8 (currently in F32/Rawhide) -* Tue Aug 27 2019 Ron Olson 5.1-0.37.20190826git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-26-a -* Mon Aug 26 2019 Ron Olson 5.1-0.36.20190825git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-25-a -* Sun Aug 25 2019 Ron Olson 5.1-0.35.20190824git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a -* Sat Aug 24 2019 Ron Olson 5.1-0.34.20190823git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-23-a -* Fri Aug 23 2019 Ron Olson 5.1-0.33.20190822git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-22-a -* Wed Aug 21 2019 Ron Olson 5.1-0.32.20190820git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-20-a -* Mon Aug 19 2019 Ron Olson 5.1-0.31.20190817git3b0cf9e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-17-a -* Sat Aug 17 2019 Ron Olson 5.1-0.30.20190816git1329017 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-16-a -* Fri Aug 16 2019 Ron Olson 5.1-0.29.20190815git1329017 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-15-a -* Wed Aug 14 2019 Ron Olson 5.1-0.28.20190813git425a146 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-13-a -* Tue Aug 13 2019 Ron Olson 5.1-0.27.20190812git425a146 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-12-a and added another - directory -* Fri Jul 26 2019 Ron Olson 5.1-0.26.20190725git0450b7d -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-25-a -* Thu Jul 25 2019 Ron Olson 5.1-0.25.20190724gite9b6385 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-24-a -* Wed Jul 24 2019 Ron Olson 5.1-0.24.20190723git3e8f631 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-23-a -* Tue Jul 23 2019 Ron Olson 5.1-0.23.20190719gitf883175 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-19-a and first version - that relies on Python 3 for building -* Mon Jul 15 2019 Ron Olson 5.1-0.22.20190714git7b90512 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-14-a -* Sun Jul 14 2019 Ron Olson 5.1-0.21.20190713git26c2dbe -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-13-a -* Sat Jul 13 2019 Ron Olson 5.1-0.20.20190712gita062b3c -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-12-a -* Fri Jul 12 2019 Ron Olson 5.1-0.19.20190711gitacd767e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-11-a -* Thu Jul 11 2019 Ron Olson 5.1-0.18.20190710gitd7f811d -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-10-a -* Wed Jul 10 2019 Ron Olson 5.1-0.17.20190709gitf67864b -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-09-a -* Thu Jul 04 2019 Ron Olson 5.1-0.16.20190703gitd2c038e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-03-a -* Wed Jul 03 2019 Ron Olson 5.1-0.15.20190702git2efadfd -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-02-a -* Tue Jul 02 2019 Ron Olson 5.1-0.14.20190701git6761ba4 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-07-01-a and removed - dependency on python-sphinx as a problem with a pygments lexer was being - treated as an error and causing the builds to fail -* Sun Jun 30 2019 Ron Olson 5.1-0.13.20190629gitdcde8ac -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-29-a -* Sat Jun 29 2019 Ron Olson 5.1-0.12.20190628gitca3c825 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-28-a -* Fri Jun 28 2019 Ron Olson 5.1-0.11.20190627git993b248 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-27-a -* Thu Jun 27 2019 Ron Olson 5.1-0.10.20190626git16859f1 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-26-a and added patch - to remove reference to depreciated header file -* Wed Jun 26 2019 Ron Olson 5.1-0.9.20190624git4e7bcdb -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-24-a and got the REPL - to work -* Sun Jun 23 2019 Ron Olson 5.1-0.8.20190621git9729868 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-21-a -* Fri Jun 21 2019 Ron Olson 5.1-0.7.20190620gita5aa0c6 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-20-a -* Thu Jun 20 2019 Ron Olson 5.1-0.6.20190619git500333c -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-19-a -* Thu Jun 20 2019 Ron Olson 5.1-0.5.20190619git500333c -- Cleaned up the spec file to remove 4.2 to 5 migration code and some - old patches -* Mon Jun 17 2019 Ron Olson 5.1-0.4.20190616gitcbfbc8e -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-16-a -* Sun Jun 02 2019 Ron Olson 5.1-0.3.20190529git37f230a -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-05-29-a -* Fri Apr 26 2019 Ron Olson 5.1-0.2.20190425git6d89fc9 -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-04-25-a -* Thu Apr 18 2019 Ron Olson 5.1-0.1.20190416git85a776d -- Updated to swift-5.1-DEVELOPMENT-SNAPSHOT-2019-04-16-a -* Thu Mar 28 2019 Ron Olson 5.0-0.53.20190325gitba33f9e -- Modified spec file to handle upgrades from 4.2 to 5.0. -* Mon Mar 25 2019 Ron Olson 5.0-0.52.20190325gitba33f9e -- Updated to swift-5.0-RELEASE -* Mon Mar 25 2019 Ron Olson 5.0-0.51.20190324git130a414 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-24-a, removed _gettid - patch as the changed were merged upstream -* Fri Mar 22 2019 Ron Olson 5.0-0.50.20190310git4d6e741 -- The swift-corelibs-xctest library was being zeroed out due to issue with - CMake 3.14 where it was being copied into the same directory. A bug - report has been filed with CMake but until it is resolved, the cmake file - has been patched to not perform the copy. -* Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 -- Modules did not work properly in the REPL due to additional lib path; - fixed with symlinks to the lower directory structures -* Fri Mar 15 2019 Ron Olson 5.0-0.50.20190310git4d6e741 -- python2-sphinx was removed from Fedora after 30 so it will use the python3 - version -* Thu Mar 14 2019 Ron Olson 5.0-0.50.20190310git4d6e741 -- Fixed issues introduced by upstream changes -* Mon Mar 11 2019 Ron Olson 5.0-0.50.20190310git4d6e741 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a -* Thu Mar 07 2019 Ron Olson 5.0-0.49.20190306git5834830 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-06-a -* Wed Mar 06 2019 Ron Olson 5.0-0.48.20190305git5834830 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-05-a -* Tue Mar 05 2019 Ron Olson 5.0-0.47.20190304gitad10379 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-04-a -* Fri Mar 01 2019 Ron Olson 5.0-0.46.20190228gitfeacc3f -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a -* Wed Feb 27 2019 Ron Olson 5.0-0.45.20190226gitfa5d493 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-26-a -* Tue Feb 26 2019 Ron Olson 5.0-0.44.20190225gita8126fb -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-25-a -* Mon Feb 25 2019 Ron Olson 5.0-0.43.20190224gita8126fb -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-24-a -* Sun Feb 24 2019 Ron Olson 5.0-0.42.20190223gita8126fb -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-23-a -* Sat Feb 23 2019 Ron Olson 5.0-0.41.20190222gita24adaf -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-22-a -* Fri Feb 22 2019 Ron Olson 5.0-0.40.20190221git86a39df -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-21-a -* Thu Feb 21 2019 Ron Olson 5.0-0.39.20190220git817dff3 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-20-a -* Wed Feb 20 2019 Ron Olson 5.0-0.38.20190219git817dff3 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-19-a -* Mon Feb 18 2019 Ron Olson 5.0-0.37.20190217git15be364 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-17-a -* Sun Feb 17 2019 Ron Olson 5.0-0.36.20190216git15be364 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-16-a -* Sat Feb 16 2019 Ron Olson 5.0-0.35.20190215git15be364 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-15-a -* Fri Feb 15 2019 Ron Olson 5.0-0.34.20190214git8d88441 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-14-a -* Wed Feb 13 2019 Ron Olson 5.0-0.33.20190206gitd07c25a -- Added patch to fix an issue with compiler-rt using std::thread in a vector -* Fri Feb 08 2019 Ron Olson 5.0-0.32.20190206gitd07c25a -- Added patch to allow the Swift REPL to work properly, also removed patch - for aarch64 because the changes were merged upstream -* Sun Feb 03 2019 Fedora Release Engineering - 5.0-0.31.20181214gitee39236 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* 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 -* 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 -- 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 -- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2018-12-04-a -* Wed Dec 05 2018 Egor Zhdan -- Include dependencies to ncurses which are required by SourceKit and - included in Apple installation guide -* 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 -- 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 -- 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 -- 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 -- 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 -- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-11-16-a -* Fri Nov 16 2018 Ron Olson 5.0-0.10.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 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-29-a -* Sat Oct 27 2018 Ron Olson 4.2-0.99.20181026gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-26-a -* Fri Oct 26 2018 Ron Olson 4.2-0.98.20181025gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-25-a -* Wed Oct 24 2018 Ron Olson 4.2-0.97.20181023gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-23-a -* Tue Oct 23 2018 Ron Olson 4.2-0.96.20181022gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-22-a -* Mon Oct 22 2018 Ron Olson 4.2-0.95.20181021gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-21-a -* Sun Oct 21 2018 Ron Olson 4.2-0.94.20181020gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-20-a -* Fri Oct 19 2018 Ron Olson 4.2-0.93.20181018gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-18-a -* Thu Oct 18 2018 Ron Olson 4.2-0.92.20181017gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-17-a -* Wed Oct 17 2018 Ron Olson 4.2-0.91.20181016gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-16-a -* Tue Oct 16 2018 Ron Olson 4.2-0.90.20181015gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-15-a -* Mon Oct 15 2018 Ron Olson 4.2-0.89.20181014gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-14-a -* Sun Oct 14 2018 Ron Olson 4.2-0.88.20181013gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-13-a -* Sat Oct 13 2018 Ron Olson 4.2-0.87.20181012gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-12-a -* Fri Oct 12 2018 Ron Olson 4.2-0.86.20181011gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-11-a -* Thu Oct 11 2018 Ron Olson 4.2-0.85.20181010gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-10-a -* Wed Oct 10 2018 Ron Olson 4.2-0.84.20181009gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-09-a -* Tue Oct 09 2018 Ron Olson 4.2-0.83.20181008gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-08-a -* Mon Oct 08 2018 Ron Olson 4.2-0.82.20181007gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-07-a -* Sun Oct 07 2018 Ron Olson 4.2-0.81.20181006gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-06-a -* Sat Oct 06 2018 Ron Olson 4.2-0.80.20181005gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-05-a -* Thu Oct 04 2018 Ron Olson 4.2-0.79.20181003gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-03-a -* Wed Oct 03 2018 Ron Olson 4.2-0.78.20181002gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-02-a -* Tue Oct 02 2018 Ron Olson 4.2-0.77.20181001gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-01-a -* Sat Sep 29 2018 Ron Olson 4.2-0.76.20180928gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-28-a -* Fri Sep 28 2018 Ron Olson 4.2-0.75.20180927gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-27-a -* Thu Sep 27 2018 Ron Olson 4.2-0.74.20180926gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-26-a -* Wed Sep 26 2018 Ron Olson 4.2-0.73.20180925gitf4134eb -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-25-a -* Tue Sep 25 2018 Ron Olson 4.2-0.72.20180924git01644d5 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-24-a -* Mon Sep 24 2018 Ron Olson 4.2-0.71.20180922gitac7c511 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-22-a -* Sat Sep 15 2018 Ron Olson 4.2-0.70.20180914git2dfdbf2 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-14-a -* Fri Sep 14 2018 Ron Olson 4.2-0.69.20180913git2dfdbf2 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-13-a -* Thu Sep 13 2018 Ron Olson 4.2-0.68.20180912git2c6399a -- Updated to swift-4.2-RELEASE -* Wed Sep 12 2018 Ron Olson 4.2-0.67.20180911gitbe88499 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-11-a -* Sun Sep 09 2018 Ron Olson 4.2-0.66.20180908gitbe88499 -- Added patch for clang 7.0 -* Sun Sep 09 2018 Ron Olson 4.2-0.65.20180908gitbe88499 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-08-a -* Sat Sep 08 2018 Ron Olson 4.2-0.64.20180907gitc922f68 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-07-a -* Sun Aug 26 2018 Ron Olson 4.2-0.63.20180825git7d204ce -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-25-a -* Sat Aug 25 2018 Ron Olson 4.2-0.62.20180824git7d204ce -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-24-a -* Fri Aug 24 2018 Ron Olson 4.2-0.61.20180823git7d204ce -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-23-a -* Thu Aug 23 2018 Ron Olson 4.2-0.60.20180822git7d204ce -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-22-a -* Wed Aug 22 2018 Ron Olson 4.2-0.59.20180821git7d204ce -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-21-a -* Tue Aug 21 2018 Ron Olson 4.2-0.58.20180820gitde88335 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a -* Sun Aug 19 2018 Ron Olson 4.2-0.57.20180818gitde88335 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-18-a -* Sat Aug 18 2018 Ron Olson 4.2-0.56.20180817gitde88335 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-17-a -* Fri Aug 17 2018 Ron Olson 4.2-0.55.20180816gitde88335 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-16-a -* Thu Aug 16 2018 Ron Olson 4.2-0.54.20180815gitefbe78e -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-15-a -* Wed Aug 15 2018 Ron Olson 4.2-0.53.20180814git3146921 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-14-a -* Sat Aug 11 2018 Ron Olson 4.2-0.52.20180810gita710c2f -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-10-a -* Thu Aug 09 2018 Ron Olson 4.2-0.51.20180808git1c8f885 -- Updated to swift-4.2-CONVERGENCE -* Wed Aug 08 2018 Ron Olson 4.2-0.50.20180807gitab5ce2e -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-07-a -* Tue Aug 07 2018 Ron Olson 4.2-0.49.20180806gitab5ce2e -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-06-a -* Sat Aug 04 2018 Ron Olson 4.2-0.48.20180803git68f32fc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-03-a -* Fri Aug 03 2018 Ron Olson 4.2-0.47.20180802git44a88d4 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-02-a -* Thu Aug 02 2018 Ron Olson 4.2-0.46.20180801git3f7d681 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-01-a -* Wed Aug 01 2018 Ron Olson 4.2-0.45.20180731git00acd41 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-31-a -* Tue Jul 31 2018 Ron Olson 4.2-0.44.20180730gitfe1f442 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-30-a -* Sun Jul 29 2018 Ron Olson 4.2-0.43.20180728gitfe1f442 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-28-a -* Sat Jul 28 2018 Ron Olson 4.2-0.42.20180727git9d01b59 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-27-a -* Wed Jul 25 2018 Ron Olson 4.2-0.41.20180724git18650bc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a and removed - lldb patches as they were merged upstream into the 4.2 branch -* Tue Jul 24 2018 Ron Olson 4.2-0.40.20180723git18650bc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-23-a -* Mon Jul 23 2018 Ron Olson 4.2-0.39.20180722git18650bc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-22-a -* Sun Jul 22 2018 Ron Olson 4.2-0.38.20180721git18650bc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-21-a -* Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc -- Added patches for lldb to fix relative path issue (see URL by patches) until - it's merged into the 4.2 branch -* Sat Jul 21 2018 Ron Olson 4.2-0.37.20180720git18650bc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-20-a -* Fri Jul 20 2018 Ron Olson 4.2-0.36.20180719git9277281 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-19-a -* Thu Jul 19 2018 Ron Olson 4.2-0.35.20180718gite325e32 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-18-a -* Tue Jul 17 2018 Ron Olson 4.2-0.34.20180716gitaaf545a -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-16-a -* Sun Jul 15 2018 Ron Olson 4.2-0.33.20180703git107e307 -- Switched from __provides_exclude_from to __provides_exclude to inhibit - lldb being included as a dependency -* Thu Jul 12 2018 Ron Olson 4.2-0.32.20180703git107e307 -- Reverted to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a as loading modules - in the REPL seems to have been broken as of the 2018-07-04 builds. - 2018-07-03 is currently the best version until the issue is resolved. -* Thu Jul 12 2018 Ron Olson 4.2-0.31.20180711git104c96a -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-11-a -* Wed Jul 11 2018 Ron Olson 4.2-0.30.20180709gitd9561d9 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-09-a and added a check to - include python-unversioned-command for verisons greated than 28 while - working on making patches/pull requests upstream to be explicit about - which version of Python to use. Also removed patch for time struct issue - as the fix has been handled upstream. Also switched to ExclusiveArch - instead of ExcludeArch per suggestion from Dan Horák. -* Thu Jul 05 2018 Ron Olson 4.2-0.29.20180705git1e2dc99 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a -* Thu Jul 05 2018 Ron Olson 4.2-0.28.20180704gitf56a941 -- Removed explicit requirement on libatomic and libbsd, modifed files section - of the runtime package so it can own the directory -* Thu Jul 05 2018 Ron Olson 4.2-0.27.20180704gitf56a941 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-04-a -* Tue Jul 03 2018 Ron Olson 4.2-0.26.20180703git107e307 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a, added a - filter for excluding lldb libraries from public view, and broke out the - runtime libraries into their own -runtime package. -* Mon Jul 02 2018 Ron Olson 4.2-0.25.20180702gitc2e1567 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-02-a -* Mon Jul 02 2018 Ron Olson 4.2-0.24.20180701git6079032 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-01-a, removed unnecessary - lldb headers -* Sat Jun 30 2018 Ron Olson 4.2-0.23.20180630gitb3408e8 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-30-a -* Fri Jun 29 2018 Ron Olson 4.2-0.22.20180629gitdab0d8e -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-29-a, removed unnecessary - files and links -* Fri Jun 29 2018 Ron Olson 4.2-0.21.20180628git9f8f2a1 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-28-a -* Thu Jun 28 2018 Ron Olson 4.2-0.20.20180626gitbe3b9a7 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-26-a -* Wed Jun 13 2018 Ron Olson 4.2-0.19.20180612gitbb9532c -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-12-a and removed - gcc-c++ as a build requirement -* Tue Jun 12 2018 Ron Olson 4.2-0.18.20180611gitd99cd32 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a and removed - separate ninja build (will now use the repo-based one) -* Mon Jun 11 2018 Ron Olson 4.2-0.17.20180610git7a35ad0 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a -* Fri Jun 08 2018 Ron Olson 4.2-0.16.20180607git78e9497 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-07-a -* Thu Jun 07 2018 Ron Olson 4.2-0.15.20180606git4e2064e -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-06-a -* Tue Jun 05 2018 Ron Olson 4.2-0.14.20180604git9e274fc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a -* Sun Jun 03 2018 Ron Olson 4.2-0.13.20180602gitadad0f5 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-02-a -* Wed May 30 2018 Ron Olson 4.2-0.12.20180529git4160301 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-29-a -* Wed May 23 2018 Ron Olson 4.2-0.11.20180522git58f7399 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-22-a -* Mon May 21 2018 Ron Olson 4.2-0.10.20180520gitbb77484 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-20-a and added - patch for removing sys/ustat.h references -* Tue May 15 2018 Ron Olson 4.2-0.9.20180514gitf58f528 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-14-a -* Wed May 09 2018 Ron Olson 4.2-0.8.20180508git0e6d867 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-08-a -* Wed May 02 2018 Ron Olson 4.2-0.7.20180502gitb08fb12 -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-05-02-a -* Mon Apr 23 2018 Ron Olson 4.2-0.6.20180422git5030d38 -- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-22-a -* Thu Apr 19 2018 Ron Olson 4.2-0.5.20180418gitac06163 -- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-18-a -* Mon Apr 16 2018 Ron Olson 4.2-0.4.20180415git22530b9 -- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-15-a -* Thu Apr 12 2018 Ron Olson 4.2-0.3.20180411git537a846 -- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-11-a -* Wed Feb 28 2018 Ron Olson 4.1-0.2.20180227git5f2f440 -- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-02-27-a -* Wed Feb 14 2018 Ron Olson 4.1-0.1.20180214git5a1a34b -- Initial package for Fedora +%autochangelog From 222f3a5c72c724d68a8518aca8d20aa3abedcb22 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Thu, 18 Sep 2025 05:57:23 -0400 Subject: [PATCH 143/152] Refactor sources and patches [skip changelog] --- .gitignore | 49 ++ clang_crash_fix.patch | 11 - cmake.patch | 12 + cmark.patch | 13 + enable_lzma.patch | 11 - fix_chain_comparison.patch | 11 - llbuild.patch | 12 + remove_termio.diff => llvm-project.patch | 28 +- need_cstdint.patch | 30 -- need_pic.patch | 11 - no_pipes.patch => ninja.patch | 11 +- no_testable_package.patch | 11 - sources | 95 ++-- swift-corelibs-foundation.patch | 0 ....patch => swift-corelibs-libdispatch.patch | 37 +- ...tion_cmath.patch => swift-foundation.patch | 0 swift-lang.spec | 453 ++++++++++-------- swift.patch | 51 ++ swiftpm.patch | 13 + 19 files changed, 497 insertions(+), 362 deletions(-) delete mode 100644 clang_crash_fix.patch create mode 100644 cmake.patch create mode 100644 cmark.patch delete mode 100644 enable_lzma.patch delete mode 100644 fix_chain_comparison.patch create mode 100644 llbuild.patch rename remove_termio.diff => llvm-project.patch (63%) delete mode 100644 need_cstdint.patch delete mode 100644 need_pic.patch rename no_pipes.patch => ninja.patch (66%) delete mode 100644 no_testable_package.patch create mode 100644 swift-corelibs-foundation.patch rename disable_warning.patch => swift-corelibs-libdispatch.patch (50%) rename fix_foundation_cmath.patch => swift-foundation.patch (100%) create mode 100644 swift.patch create mode 100644 swiftpm.patch diff --git a/.gitignore b/.gitignore index 630ea84..80f7f15 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,52 @@ /swift-log.tar.gz /swift-sdk-generator.tar.gz /swift-toolchain-sqlite.tar.gz +/CMake-3.30.2.tar.gz +/curl-curl-8_9_1.tar.gz +/indexstore-db-swift-6.1.3-RELEASE.tar.gz +/libxml2-2.11.5.tar.gz +/llvm-project-swift-6.1.3-RELEASE.tar.gz +/ninja-1.11.1.tar.gz +/sourcekit-lsp-swift-6.1.3-RELEASE.tar.gz +/swift-argument-parser-1.4.0.tar.gz +/swift-asn1-1.0.0.tar.gz +/swift-async-algorithms-1.0.1.tar.gz +/swift-atomics-1.2.0.tar.gz +/swift-certificates-1.0.1.tar.gz +/swift-cmark-swift-6.1.3-RELEASE.tar.gz +/swift-collections-1.1.3.tar.gz +/swift-corelibs-foundation-swift-6.1.3-RELEASE.tar.gz +/swift-corelibs-libdispatch-swift-6.1.3-RELEASE.tar.gz +/swift-corelibs-xctest-swift-6.1.3-RELEASE.tar.gz +/swift-crypto-3.0.0.tar.gz +/swift-docc-render-artifact-swift-6.1.3-RELEASE.tar.gz +/swift-docc-swift-6.1.3-RELEASE.tar.gz +/swift-docc-symbolkit-swift-6.1.3-RELEASE.tar.gz +/swift-driver-swift-6.1.3-RELEASE.tar.gz +/swift-experimental-string-processing-swift-6.1.3-RELEASE.tar.gz +/swift-format-swift-6.1.3-RELEASE.tar.gz +/swift-foundation-icu-swift-6.1.3-RELEASE.tar.gz +/swift-foundation-swift-6.1.3-RELEASE.tar.gz +/swift-installer-scripts-swift-6.1.3-RELEASE.tar.gz +/swift-integration-tests-swift-6.1.3-RELEASE.tar.gz +/swift-llbuild-swift-6.1.3-RELEASE.tar.gz +/swift-llvm-bindings-swift-6.1.3-RELEASE.tar.gz +/swift-lmdb-swift-6.1.3-RELEASE.tar.gz +/swift-log-1.5.4.tar.gz +/swift-markdown-swift-6.1.3-RELEASE.tar.gz +/swift-nio-2.65.0.tar.gz +/swift-numerics-1.0.2.tar.gz +/swift-package-manager-swift-6.1.3-RELEASE.tar.gz +/swift-sdk-generator-swift-6.1.3-RELEASE.tar.gz +/swift-stress-tester-swift-6.1.3-RELEASE.tar.gz +/swift-swift-6.1.3-RELEASE.tar.gz +/swift-syntax-swift-6.1.3-RELEASE.tar.gz +/swift-system-1.3.0.tar.gz +/swift-testing-swift-6.1.3-RELEASE.tar.gz +/swift-toolchain-sqlite-1.0.1.tar.gz +/swift-tools-support-core-swift-6.1.3-RELEASE.tar.gz +/swift-xcode-playground-support-swift-6.1.3-RELEASE.tar.gz +/wasi-libc-wasi-sdk-22.tar.gz +/WasmKit-0.1.2.tar.gz +/Yams-5.0.6.tar.gz +/zlib-1.3.1.tar.gz diff --git a/clang_crash_fix.patch b/clang_crash_fix.patch deleted file mode 100644 index 4b3801b..0000000 --- a/clang_crash_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swiftpm/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift.orig 2024-11-23 08:51:29.212470347 -0600 -+++ swiftpm/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift 2024-11-23 08:51:57.609260467 -0600 -@@ -406,7 +406,7 @@ - case .debug: - return ["-O0"] - case .release: -- return ["-O2"] -+ return ["-O1"] - } - } - diff --git a/cmake.patch b/cmake.patch new file mode 100644 index 0000000..6e5a113 --- /dev/null +++ b/cmake.patch @@ -0,0 +1,12 @@ +diff --git cmake.orig/Utilities/cmcppdap/include/dap/network.h cmake/Utilities/cmcppdap/include/dap/network.h +index 9d14f6b70f..491f023493 100644 +--- cmake.orig/Utilities/cmcppdap/include/dap/network.h ++++ cmake/Utilities/cmcppdap/include/dap/network.h +@@ -15,6 +15,7 @@ + #ifndef dap_network_h + #define dap_network_h + ++#include + #include + #include + diff --git a/cmark.patch b/cmark.patch new file mode 100644 index 0000000..cfd11c8 --- /dev/null +++ b/cmark.patch @@ -0,0 +1,13 @@ +diff --git cmark.orig/CMakeLists.txt cmark/CMakeLists.txt +index 23eca3c5..beba0702 100755 +--- cmark.orig/CMakeLists.txt ++++ cmark/CMakeLists.txt +@@ -22,6 +22,8 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE) + + set(CMAKE_INCLUDE_CURRENT_DIR YES) + ++set(CMAKE_POSITION_INDEPENDENT_CODE YES) ++ + option(CMARK_FUZZ_QUADRATIC "Build quadratic fuzzing harness" OFF) + option(CMARK_LIB_FUZZER "Build libFuzzer fuzzing harness" OFF) + option(CMARK_THREADING "Add locks around static accesses" OFF) diff --git a/enable_lzma.patch b/enable_lzma.patch deleted file mode 100644 index 286ca55..0000000 --- a/enable_lzma.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift/utils/build-script-impl.orig 2024-06-25 09:36:26.767949217 -0500 -+++ swift/utils/build-script-impl 2024-06-25 09:36:46.207322186 -0500 -@@ -2243,7 +2243,7 @@ - -DLLDB_ENABLE_CURSES=ON - -DLLDB_ENABLE_LIBEDIT=ON - -DLLDB_ENABLE_PYTHON=ON -- -DLLDB_ENABLE_LZMA=OFF -+ -DLLDB_ENABLE_LZMA=ON - -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" - -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" diff --git a/fix_chain_comparison.patch b/fix_chain_comparison.patch deleted file mode 100644 index f45e10e..0000000 --- a/fix_chain_comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift/lib/Sema/CodeSynthesisDistributedActor.cpp.orig 2025-09-12 06:28:13 -+++ swift/lib/Sema/CodeSynthesisDistributedActor.cpp 2025-09-12 06:29:20 -@@ -859,7 +859,7 @@ - } - if (idIdx + actorSystemIdx + unownedExecutorIdx >= 0 + 1 + 2) { - // we have found all the necessary fields, let's assert their order -- assert(idIdx < actorSystemIdx < unownedExecutorIdx && -+ assert(idIdx < actorSystemIdx && actorSystemIdx < unownedExecutorIdx && - "order of fields MUST be exact."); - } - } diff --git a/llbuild.patch b/llbuild.patch new file mode 100644 index 0000000..c1ff87a --- /dev/null +++ b/llbuild.patch @@ -0,0 +1,12 @@ +diff --git llbuild.orig/utils/unittest/googletest/include/gtest/gtest.h llbuild/utils/unittest/googletest/include/gtest/gtest.h +index eb5c5cc0..30c8d68a 100644 +--- llbuild.orig/utils/unittest/googletest/include/gtest/gtest.h ++++ llbuild/utils/unittest/googletest/include/gtest/gtest.h +@@ -51,6 +51,7 @@ + #ifndef GTEST_INCLUDE_GTEST_GTEST_H_ + #define GTEST_INCLUDE_GTEST_GTEST_H_ + ++#include + #include + #include + #include diff --git a/remove_termio.diff b/llvm-project.patch similarity index 63% rename from remove_termio.diff rename to llvm-project.patch index df1673a..6faeb85 100644 --- a/remove_termio.diff +++ b/llvm-project.patch @@ -1,6 +1,8 @@ ---- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc.orig 2025-09-11 07:37:07.200743058 -0400 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc 2025-09-11 07:37:47.237450571 -0400 -@@ -338,17 +338,9 @@ +diff --git llvm-project.orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 49ec4097c900..dda11daa77f4 100644 +--- llvm-project.orig/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -338,17 +338,9 @@ static void ioctl_table_fill() { _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int)); _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int)); _(TCFLSH, NONE, 0); @@ -18,9 +20,11 @@ _(TCSETS, READ, struct_termios_sz); _(TCSETSF, READ, struct_termios_sz); _(TCSETSW, READ, struct_termios_sz); ---- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp.orig 2025-09-11 07:38:11.756385788 -0400 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2025-09-11 07:44:47.207707878 -0400 -@@ -479,9 +479,6 @@ +diff --git llvm-project.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 6d61d276d77e..3fb5a40ba852 100644 +--- llvm-project.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -479,9 +479,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned struct_input_id_sz = sizeof(struct input_id); unsigned struct_mtpos_sz = sizeof(struct mtpos); unsigned struct_rtentry_sz = sizeof(struct rtentry); @@ -30,7 +34,7 @@ unsigned struct_vt_consize_sz = sizeof(struct vt_consize); unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); unsigned struct_vt_stat_sz = sizeof(struct vt_stat); -@@ -758,13 +755,9 @@ +@@ -758,13 +755,9 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER; #endif // SOUND_VERSION unsigned IOCTL_TCFLSH = TCFLSH; @@ -44,9 +48,11 @@ unsigned IOCTL_TCSETS = TCSETS; unsigned IOCTL_TCSETSF = TCSETSF; unsigned IOCTL_TCSETSW = TCSETSW; ---- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig 2025-09-11 07:39:08.909650398 -0400 -+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2025-09-11 07:45:06.340929026 -0400 -@@ -1013,7 +1013,6 @@ +diff --git llvm-project.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +index 34bfef1f7ef4..62d553b18ef5 100644 +--- llvm-project.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -1013,7 +1013,6 @@ extern unsigned struct_hd_geometry_sz; extern unsigned struct_input_absinfo_sz; extern unsigned struct_input_id_sz; extern unsigned struct_mtpos_sz; @@ -54,7 +60,7 @@ extern unsigned struct_vt_consize_sz; extern unsigned struct_vt_sizes_sz; extern unsigned struct_vt_stat_sz; -@@ -1258,13 +1257,9 @@ +@@ -1258,13 +1257,9 @@ extern unsigned IOCTL_SNDCTL_COPR_SENDMSG; extern unsigned IOCTL_SNDCTL_COPR_WCODE; extern unsigned IOCTL_SNDCTL_COPR_WDATA; extern unsigned IOCTL_TCFLSH; diff --git a/need_cstdint.patch b/need_cstdint.patch deleted file mode 100644 index e603bb2..0000000 --- a/need_cstdint.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- cmake/Utilities/cmcppdap/include/dap/network.h.orig 2025-09-10 12:04:50.127650599 -0400 -+++ cmake/Utilities/cmcppdap/include/dap/network.h 2025-09-10 12:05:10.419069326 -0400 -@@ -15,6 +15,7 @@ - #ifndef dap_network_h - #define dap_network_h - -+#include - #include - #include - ---- swift/stdlib/include/llvm/ADT/SmallVector.h.orig 2025-09-11 16:12:59.726654809 -0400 -+++ swift/stdlib/include/llvm/ADT/SmallVector.h 2025-09-11 16:13:22.736555901 -0400 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- llbuild/utils/unittest/googletest/include/gtest/gtest.h.orig 2025-09-12 09:05:05 -+++ llbuild/utils/unittest/googletest/include/gtest/gtest.h 2025-09-12 09:05:22 -@@ -51,6 +51,7 @@ - #ifndef GTEST_INCLUDE_GTEST_GTEST_H_ - #define GTEST_INCLUDE_GTEST_GTEST_H_ - -+#include - #include - #include - #include diff --git a/need_pic.patch b/need_pic.patch deleted file mode 100644 index e78f4f4..0000000 --- a/need_pic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmark/CMakeLists.txt.orig 2024-06-11 14:38:17.531997089 -0500 -+++ cmark/CMakeLists.txt 2024-06-11 14:38:24.161433974 -0500 -@@ -22,6 +22,8 @@ - - set(CMAKE_INCLUDE_CURRENT_DIR YES) - -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - option(CMARK_FUZZ_QUADRATIC "Build quadratic fuzzing harness" OFF) - option(CMARK_LIB_FUZZER "Build libFuzzer fuzzing harness" OFF) - option(CMARK_THREADING "Add locks around static accesses" OFF) diff --git a/no_pipes.patch b/ninja.patch similarity index 66% rename from no_pipes.patch rename to ninja.patch index 6e5ba88..ee5d71a 100644 --- a/no_pipes.patch +++ b/ninja.patch @@ -1,7 +1,8 @@ - diff --color -Naur ninja/configure.py ninja/configure.py ---- ninja/configure.py 2024-06-13 19:54:39.050795565 -0500 -+++ ninja/configure.py 2024-06-13 19:56:39.970026531 -0500 -@@ -23,7 +23,7 @@ +diff --git ninja.orig/configure.py ninja/configure.py +index 4390434..c80a43b 100755 +--- ninja.orig/configure.py ++++ ninja/configure.py +@@ -23,7 +23,7 @@ from __future__ import print_function from optparse import OptionParser import os @@ -10,7 +11,7 @@ import string import subprocess import sys -@@ -264,7 +264,7 @@ +@@ -264,7 +264,7 @@ n.variable('configure_args', ' '.join(configure_args)) env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) if configure_env: diff --git a/no_testable_package.patch b/no_testable_package.patch deleted file mode 100644 index dee925c..0000000 --- a/no_testable_package.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2024-11-11 12:30:06.743565294 -0600 -+++ swift/utils/build-presets.ini 2024-11-11 12:31:15.936936014 -0600 -@@ -870,7 +870,7 @@ - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out - --test-installable-package -+# test-installable-package - - # Build the benchmarks against the toolchain. - toolchain-benchmarks diff --git a/sources b/sources index 3a6ec3f..f372b72 100644 --- a/sources +++ b/sources @@ -1,46 +1,49 @@ -SHA512 (swift-format.zip) = b9b84ac82d0285afc1c0d961b32a482481ae8c9652a440eb77b3b46b655928ed73d857deebf857ffcdfedbabffd3e13f667a4a3dfff5bca282c6cb849526b4dd -SHA512 (swift-foundation-icu.zip) = 3ec1050c9df735b892b83a11e503797ba50f8da5a42344ef59c4a24e547a590ae9e100e11561332668dcb735a38ebf3d72a99d58ee538fef7f32ded3bcb4136d -SHA512 (swift-foundation.zip) = 2b5cdb75823809df98adf40251cba60b278f785f404104b04e52b9a94616af56037d164fdbefe9ab088d10107151799a68ccf034d16e7726793f6f0b6322f665 -SHA512 (swift-llvm-bindings.zip) = 1031df2d079e1d67241feeb7d021bfaef314501b50c246ffe2168269167844ede03114ba7509dc74f6482d2b6a27e26741401a9a50693c94cc02b291865e0727 -SHA512 (zlib131.zip) = 1f171880153b0120e1364baaf7d0a17f65086eff279f8f8c8538e5950097d1feee37cc173181676ba1e2aeb4565ba68749c814cd3e25bfb06271bea02feb7d94 -SHA512 (cmake.tar.gz) = bd71bbd62a024cc93e97421ea50900072e9ab79ccec3ad0e012b5a9286a3c46a15c1b86a0f8ef2dd8518a4e63d4644d34c80cba869c0e9f9eb419fcc439acfa5 -SHA512 (cmark.tar.gz) = 1cd9de0ff41c62a611a54490e919702114c9d059ee6b8018e291eecda8f610a1712ac6d650c5a19178d38f7b8fde174d8538e893c8f0c022cb55464fd7d4ba36 -SHA512 (corelibs-foundation.tar.gz) = 227304937bda2709aaaaa659707bba0baf044354441d28ce67c527c4214bd9306e26087edcee4e368cffbe2f07ad5e4d5c05103ea9eb95bfd9a60e4ccfc56f5c -SHA512 (corelibs-libdispatch.tar.gz) = 632f5910b76569355a12bb7a1666c5fd282d9e00fd7c9240068a48d6d629fbb085d42be0746657878b7a13e535c1cf1f517a652b5d327125a0bb8921b05d2d9c -SHA512 (corelibs-xctest.tar.gz) = 3933f9a1f8c6fb3887c10a231636e497d8c2d010572fb46145b12cd12ccfe013e70c17c731c32662eb554314cd57939068cd3588b12e2fb558c86a4df3196466 -SHA512 (indexstore-db.tar.gz) = 082a87a20b5da7877fbcbc7c71013582b55a58a6a514a0190c545f6113184de9776202857a956f5b97d1838054d0bd3bdc4d8a741aea7f7443ddee8fdb8e7179 -SHA512 (llbuild.tar.gz) = 5b195b543e1abe482b9e9eedfe7c884dc19c36d71a62787c3e2b1ab05dd7f05fead34d322312ae0f2635dda5a71027d88ba46cd2e5136d92f5e6e284a330637b -SHA512 (llvm-project.tar.gz) = 9f6ecfd1cb0ef312ef4d01ada40d15abad38958e3d9ae24662aeb5a19cb4a90a3bd6e7bdb1826d4a9f8c7c1c483b92f7423b1ca85c3759ad57dbf610adb338c8 -SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = d55d0337c47cbcdf7da68eb301810f8851ce4da3eaf535e253149b147d4a36225c13c0af7656b774f498393bef2f96bb03c336611e79209a5716368567eeceeb -SHA512 (sourcekit-lsp.tar.gz) = 2656292b378be2e5c6531d9f17a43658ca8be4ed3e443ac25fcd8472e6e5197892db94e3a8319048202ae3bc7e3e3a86e1be6f2fce35e466cbb26b5d6e3d4b2d -SHA512 (swift-argument-parser.tar.gz) = 38f0958c63dc01df1a5ac7164b8c76116050819a8747a71ff07c6c2208526e49c0f5411a2431bce4d3968b7100f95e4b00bbc49f69a6df69edfa7f8589a9892c -SHA512 (swift-asn1.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 -SHA512 (swift-async-algorithms.tar.gz) = a5687ddce9d051a671fc34d88cc77e2d30a60b99d7f4381956cee05d41d5afcc8fb34469155984f5b7dbedcc3f7f839a236fa528c3e0f660f4d6d409d39cf2f7 -SHA512 (swift-atomics.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 -SHA512 (swift-certificates.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 -SHA512 (swift-collections.tar.gz) = f26586b9c2e13279694a9bbb80b479ce8c34ceb6181dc455a228b52c8f704b88888ed5cdb3f92e913c228ff2aeca4625ee041fba7712086f57ec54ce709f73cd -SHA512 (swift-crypto.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact.tar.gz) = 4c612389ffb6e57ebd228fed5c65312a2eb1e43976ee1d228ab1f0885036aeea7a4453ccf936fd156b6f0f8134628b7da4778fcee5c758d4bbed6a26536ad9e5 -SHA512 (swift-docc-symbolkit.tar.gz) = 52021ee5400c48b9c2078062affd3298a1c4e25a56c0ec77404403caacd51daef875dc4152c84d6a93c238b8339096beb18b9b7a92a1e612a25a40a9b6e8a990 -SHA512 (swift-docc.tar.gz) = 80eec33ce371b68cbe1da8fca975115257a0de64e1af83240cfade792310e97dc8317a27c4ee4e531a5f522881f8cc0e086391ecad6f276562426a7189fdc4cc -SHA512 (swift-driver.tar.gz) = 96681f3cc23f1b5baaa6e491a52c10cabda376e556155cb3c391334f2b92072b55f9e21bd0be0974f633ac68cb064a853ffa891f51d9b270f3cb8dff3fb4850c -SHA512 (swift-experimental-string-processing.tar.gz) = 4eee590d06930718e7e4ffb505e35c8b7a6b3e2ac50271a39f93776be1f35d7a333bec0903cd81e3362fbc7f03b49f7239df67be11d83938ec0911f24664841e -SHA512 (swift-integration-tests.tar.gz) = 87fda82e881ea03c425d02858001fa0024ff2243f2ad20c8d49c239720b900b40bc3e4a1bfea004eb1c40ec7e42391a231abfef972f2f54b51380f82a28e36b4 -SHA512 (swift-lmdb.tar.gz) = a5312e5d9844b90bdfacd00ee307b151c665f9335684ac7ccbb0cd99c4fed249742aecc8be957d84130d2cfde248529c32610ba005bcb169a917ccf68ced53dc -SHA512 (swift-log.tar.gz) = c148f7a20072fba57226bfbc0d9e9f6bb9ebfc952e920d7f4b6a12028fa49a2f61f1f7f13e53c2421b562b83e8160e3d64da51437840b9312c77113b1484c39f -SHA512 (swift-markdown.tar.gz) = d230041f0e7c1bac3c3fbd8dcb9797833c64325429ac3929ca29680a395a32c0ce416443428237207e6d17ad24c974761cb24be879463b2fb2104a75bd429c45 -SHA512 (swift-nio.tar.gz) = 3eb24d634c8937270b88eda8c34b7b70290b28a601228e051cd2b414003902d18d066dc82f8682835b2c788d5d2b27ac0a1f1723e16f902b1d3d321ac7807f6d -SHA512 (swift-numerics.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-sdk-generator.tar.gz) = 5ff61111a20e5e41c7945c0b0c8e8f5e7a67aac13bf44658614ca8e81e343841c9c465499ec4d834bd0e1902dfa01d57630dd890c8294e64e425f2e146b39402 -SHA512 (swift-stress-tester.tar.gz) = 66d43e5b98d84fe83cc5c2d587f9586528c4e5ee853844f2395626725104796faccfa8d66083d3bfa9c8fa83e0b2461c67313c417a5fb262604dd8a4dba67285 -SHA512 (swift-syntax.tar.gz) = fa3f58003c1ee572247586c844d80bbe9d50e44c8e6654f48139872374db4749b5bb6ec053903edbac32b4a75338992815ea1313bbb0426f97143484e2bece41 -SHA512 (swift-system.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 -SHA512 (swift.tar.gz) = 0a96840ac7390d3ea484b76ebd862a747cb15609371b9010605e1f74f1dcd9d9c3c28233a71f782e670f5b068726f91879c39f7cb801ba7836e0714ca683902d -SHA512 (swift-testing.tar.gz) = 0dd155b3e1224781e692e2942be73490ddf6402efb8ad6389fea78ed50b34ea9feb2e0df289c7fa1c17f3b6379b47f60ba2b320277e25a1a385f92c1699bead5 -SHA512 (swift-toolchain-sqlite.tar.gz) = 2b2fe0287c7220505445a3143bdc8de31f4b38907025b42d016151f209ae63edc2a423f0fe9a6b78b6202392c8387e9b88ffa15c71b9c3b0ad9c5106ef16564a -SHA512 (swift-tools-support-core.tar.gz) = 2e40fee992841eefb5f36d870ab9b9be244b9666d8ee6b18fb588a80cfbac1480d28a0857e89b8ec737e157e4d3193788cb1ff5765c77f34225fb64b5c7a711e -SHA512 (swift-xcode-playground-support.tar.gz) = 8ae335712592a1126ddd2d772b3e733b524d539f01ea5d4baf39a7802797bd3aeb659c742f5ac93db7be42eb7662fc6b50a95f9761a713430f642c7ed8f863b4 -SHA512 (wasi-sdk.tar.gz) = 3fcd5d6c0e09d824702165d8f1236e400b1d5e95fad14f1821d40de05340a044f0ec8a587d8478854252cc938a663aa9f854e6a5e683ef8f8349c60dc6c628ed -SHA512 (wasm.tar.gz) = ad14d710c9846b2258e01c7fb08fe7ac02cce7dc4f9335c13df872ab194d7827c2781e62bbc342cd00f04210c9165851aa4ee899e45a66ac286549e68e877a18 -SHA512 (yams.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 +SHA512 (CMake-3.30.2.tar.gz) = bd71bbd62a024cc93e97421ea50900072e9ab79ccec3ad0e012b5a9286a3c46a15c1b86a0f8ef2dd8518a4e63d4644d34c80cba869c0e9f9eb419fcc439acfa5 +SHA512 (curl-curl-8_9_1.tar.gz) = f5c425c3fbd7bfda13137e8e9bc969ed7dc94c5bfcf0681a2358ab7d3b5d10402781a93385255a80c402c9824aeb97d70213b412f2d208dee4abdba5bbed2ca4 +SHA512 (indexstore-db-swift-6.1.3-RELEASE.tar.gz) = 082a87a20b5da7877fbcbc7c71013582b55a58a6a514a0190c545f6113184de9776202857a956f5b97d1838054d0bd3bdc4d8a741aea7f7443ddee8fdb8e7179 +SHA512 (libxml2-2.11.5.tar.gz) = 303528ead0f020c8e172beca54d00bb1281f4080885c9f44b979158516b585d71bbcb024999a5712a850e48647b19b1f634a1428ea29f39a48e8e6cbf7c71936 +SHA512 (llvm-project-swift-6.1.3-RELEASE.tar.gz) = 9f6ecfd1cb0ef312ef4d01ada40d15abad38958e3d9ae24662aeb5a19cb4a90a3bd6e7bdb1826d4a9f8c7c1c483b92f7423b1ca85c3759ad57dbf610adb338c8 +SHA512 (ninja-1.11.1.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 +SHA512 (sourcekit-lsp-swift-6.1.3-RELEASE.tar.gz) = 2656292b378be2e5c6531d9f17a43658ca8be4ed3e443ac25fcd8472e6e5197892db94e3a8319048202ae3bc7e3e3a86e1be6f2fce35e466cbb26b5d6e3d4b2d +SHA512 (swift-argument-parser-1.4.0.tar.gz) = 38f0958c63dc01df1a5ac7164b8c76116050819a8747a71ff07c6c2208526e49c0f5411a2431bce4d3968b7100f95e4b00bbc49f69a6df69edfa7f8589a9892c +SHA512 (swift-asn1-1.0.0.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 +SHA512 (swift-async-algorithms-1.0.1.tar.gz) = a5687ddce9d051a671fc34d88cc77e2d30a60b99d7f4381956cee05d41d5afcc8fb34469155984f5b7dbedcc3f7f839a236fa528c3e0f660f4d6d409d39cf2f7 +SHA512 (swift-atomics-1.2.0.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 +SHA512 (swift-certificates-1.0.1.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 +SHA512 (swift-cmark-swift-6.1.3-RELEASE.tar.gz) = 1cd9de0ff41c62a611a54490e919702114c9d059ee6b8018e291eecda8f610a1712ac6d650c5a19178d38f7b8fde174d8538e893c8f0c022cb55464fd7d4ba36 +SHA512 (swift-collections-1.1.3.tar.gz) = f26586b9c2e13279694a9bbb80b479ce8c34ceb6181dc455a228b52c8f704b88888ed5cdb3f92e913c228ff2aeca4625ee041fba7712086f57ec54ce709f73cd +SHA512 (swift-corelibs-foundation-swift-6.1.3-RELEASE.tar.gz) = 227304937bda2709aaaaa659707bba0baf044354441d28ce67c527c4214bd9306e26087edcee4e368cffbe2f07ad5e4d5c05103ea9eb95bfd9a60e4ccfc56f5c +SHA512 (swift-corelibs-libdispatch-swift-6.1.3-RELEASE.tar.gz) = 632f5910b76569355a12bb7a1666c5fd282d9e00fd7c9240068a48d6d629fbb085d42be0746657878b7a13e535c1cf1f517a652b5d327125a0bb8921b05d2d9c +SHA512 (swift-corelibs-xctest-swift-6.1.3-RELEASE.tar.gz) = 3933f9a1f8c6fb3887c10a231636e497d8c2d010572fb46145b12cd12ccfe013e70c17c731c32662eb554314cd57939068cd3588b12e2fb558c86a4df3196466 +SHA512 (swift-crypto-3.0.0.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f +SHA512 (swift-docc-render-artifact-swift-6.1.3-RELEASE.tar.gz) = 4c612389ffb6e57ebd228fed5c65312a2eb1e43976ee1d228ab1f0885036aeea7a4453ccf936fd156b6f0f8134628b7da4778fcee5c758d4bbed6a26536ad9e5 +SHA512 (swift-docc-swift-6.1.3-RELEASE.tar.gz) = 80eec33ce371b68cbe1da8fca975115257a0de64e1af83240cfade792310e97dc8317a27c4ee4e531a5f522881f8cc0e086391ecad6f276562426a7189fdc4cc +SHA512 (swift-docc-symbolkit-swift-6.1.3-RELEASE.tar.gz) = 52021ee5400c48b9c2078062affd3298a1c4e25a56c0ec77404403caacd51daef875dc4152c84d6a93c238b8339096beb18b9b7a92a1e612a25a40a9b6e8a990 +SHA512 (swift-driver-swift-6.1.3-RELEASE.tar.gz) = 96681f3cc23f1b5baaa6e491a52c10cabda376e556155cb3c391334f2b92072b55f9e21bd0be0974f633ac68cb064a853ffa891f51d9b270f3cb8dff3fb4850c +SHA512 (swift-experimental-string-processing-swift-6.1.3-RELEASE.tar.gz) = 4eee590d06930718e7e4ffb505e35c8b7a6b3e2ac50271a39f93776be1f35d7a333bec0903cd81e3362fbc7f03b49f7239df67be11d83938ec0911f24664841e +SHA512 (swift-format-swift-6.1.3-RELEASE.tar.gz) = bbfb899f9527c08fedf433a391c5e9ecae0815d9824952d31ecf2fa3badea745cab1c72ac88b09eec6044ab7e2c62bb34b37574f46959b87e0cb27ec8eebcd97 +SHA512 (swift-foundation-icu-swift-6.1.3-RELEASE.tar.gz) = 35921e588bdb6981006542a2ee5e77273fbd62a1f5c896f258cf911e3818ec5e8b5d13c523725dd27b6d79cb08138a276834f1cd40ba88e9ebc4490c5dfe7c76 +SHA512 (swift-foundation-swift-6.1.3-RELEASE.tar.gz) = 99e59cbe1c97ec79738d061e9d2f2f551e37664cbe7e3ce41ba7b30b2139b59e82ab2f1b956c1f7fe3ba171a57cc54fa0eea727f9b5438dd029931f141a9833b +SHA512 (swift-installer-scripts-swift-6.1.3-RELEASE.tar.gz) = 3ffdc0d5d5ebe2eba27dc2ee81588673f811201da2e3de910f3e58c642821a4f1109bf3682e31eb1a06a2fbc90a1053c47dfdba7514b2e801ab70c60d63f912f +SHA512 (swift-integration-tests-swift-6.1.3-RELEASE.tar.gz) = 87fda82e881ea03c425d02858001fa0024ff2243f2ad20c8d49c239720b900b40bc3e4a1bfea004eb1c40ec7e42391a231abfef972f2f54b51380f82a28e36b4 +SHA512 (swift-llbuild-swift-6.1.3-RELEASE.tar.gz) = 5b195b543e1abe482b9e9eedfe7c884dc19c36d71a62787c3e2b1ab05dd7f05fead34d322312ae0f2635dda5a71027d88ba46cd2e5136d92f5e6e284a330637b +SHA512 (swift-llvm-bindings-swift-6.1.3-RELEASE.tar.gz) = 5ed94bf212ba6386bb99751dcf9885ecf44dd498f789276ea82d259f7d069c0dbbe7ff9bc4a9ddd4afdc1c7d195591b2d3fb8ff1fc128221b37f9ffd89822edf +SHA512 (swift-lmdb-swift-6.1.3-RELEASE.tar.gz) = a5312e5d9844b90bdfacd00ee307b151c665f9335684ac7ccbb0cd99c4fed249742aecc8be957d84130d2cfde248529c32610ba005bcb169a917ccf68ced53dc +SHA512 (swift-log-1.5.4.tar.gz) = c148f7a20072fba57226bfbc0d9e9f6bb9ebfc952e920d7f4b6a12028fa49a2f61f1f7f13e53c2421b562b83e8160e3d64da51437840b9312c77113b1484c39f +SHA512 (swift-markdown-swift-6.1.3-RELEASE.tar.gz) = d230041f0e7c1bac3c3fbd8dcb9797833c64325429ac3929ca29680a395a32c0ce416443428237207e6d17ad24c974761cb24be879463b2fb2104a75bd429c45 +SHA512 (swift-nio-2.65.0.tar.gz) = 3eb24d634c8937270b88eda8c34b7b70290b28a601228e051cd2b414003902d18d066dc82f8682835b2c788d5d2b27ac0a1f1723e16f902b1d3d321ac7807f6d +SHA512 (swift-numerics-1.0.2.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a +SHA512 (swift-package-manager-swift-6.1.3-RELEASE.tar.gz) = d55d0337c47cbcdf7da68eb301810f8851ce4da3eaf535e253149b147d4a36225c13c0af7656b774f498393bef2f96bb03c336611e79209a5716368567eeceeb +SHA512 (swift-sdk-generator-swift-6.1.3-RELEASE.tar.gz) = b77365e9cee9bf8680ef6f11aeda1ab9fddfcb168e0a64fac2d95ef537831483b16796a634a421fe16c770be37e5c402fd760195d2b0fecfe17386e9f1e076d7 +SHA512 (swift-stress-tester-swift-6.1.3-RELEASE.tar.gz) = 66d43e5b98d84fe83cc5c2d587f9586528c4e5ee853844f2395626725104796faccfa8d66083d3bfa9c8fa83e0b2461c67313c417a5fb262604dd8a4dba67285 +SHA512 (swift-swift-6.1.3-RELEASE.tar.gz) = 0a96840ac7390d3ea484b76ebd862a747cb15609371b9010605e1f74f1dcd9d9c3c28233a71f782e670f5b068726f91879c39f7cb801ba7836e0714ca683902d +SHA512 (swift-syntax-swift-6.1.3-RELEASE.tar.gz) = 8a79a9f636e64aa7764b2bbaa24ecbdc65ed2d3298b2af239e5bb39a4204cfef17020326c9a892082dfeaa94acc17488b02c3c10a829f39c25ee7aa58da5ee86 +SHA512 (swift-system-1.3.0.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 +SHA512 (swift-testing-swift-6.1.3-RELEASE.tar.gz) = 0dd155b3e1224781e692e2942be73490ddf6402efb8ad6389fea78ed50b34ea9feb2e0df289c7fa1c17f3b6379b47f60ba2b320277e25a1a385f92c1699bead5 +SHA512 (swift-toolchain-sqlite-1.0.1.tar.gz) = 2b2fe0287c7220505445a3143bdc8de31f4b38907025b42d016151f209ae63edc2a423f0fe9a6b78b6202392c8387e9b88ffa15c71b9c3b0ad9c5106ef16564a +SHA512 (swift-tools-support-core-swift-6.1.3-RELEASE.tar.gz) = 2e40fee992841eefb5f36d870ab9b9be244b9666d8ee6b18fb588a80cfbac1480d28a0857e89b8ec737e157e4d3193788cb1ff5765c77f34225fb64b5c7a711e +SHA512 (swift-xcode-playground-support-swift-6.1.3-RELEASE.tar.gz) = 8ae335712592a1126ddd2d772b3e733b524d539f01ea5d4baf39a7802797bd3aeb659c742f5ac93db7be42eb7662fc6b50a95f9761a713430f642c7ed8f863b4 +SHA512 (wasi-libc-wasi-sdk-22.tar.gz) = 3fcd5d6c0e09d824702165d8f1236e400b1d5e95fad14f1821d40de05340a044f0ec8a587d8478854252cc938a663aa9f854e6a5e683ef8f8349c60dc6c628ed +SHA512 (WasmKit-0.1.2.tar.gz) = ad14d710c9846b2258e01c7fb08fe7ac02cce7dc4f9335c13df872ab194d7827c2781e62bbc342cd00f04210c9165851aa4ee899e45a66ac286549e68e877a18 +SHA512 (Yams-5.0.6.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 +SHA512 (zlib-1.3.1.tar.gz) = 8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088 diff --git a/swift-corelibs-foundation.patch b/swift-corelibs-foundation.patch new file mode 100644 index 0000000..e69de29 diff --git a/disable_warning.patch b/swift-corelibs-libdispatch.patch similarity index 50% rename from disable_warning.patch rename to swift-corelibs-libdispatch.patch index a83ed4b..6dbb56e 100644 --- a/disable_warning.patch +++ b/swift-corelibs-libdispatch.patch @@ -1,6 +1,7 @@ -diff --color -Naur swift-corelibs-libdispatch-orig/src/apply.c swift-corelibs-libdispatch/src/apply.c ---- swift-corelibs-libdispatch-orig/src/apply.c 2024-11-08 21:55:26.837737053 -0600 -+++ swift-corelibs-libdispatch/src/apply.c 2024-11-08 21:55:45.136893055 -0600 +diff --git swift-corelibs-libdispatch.orig/src/apply.c swift-corelibs-libdispatch/src/apply.c +index 9c7d60f..c682f95 100644 +--- swift-corelibs-libdispatch.orig/src/apply.c ++++ swift-corelibs-libdispatch/src/apply.c @@ -20,6 +20,9 @@ #include "internal.h" @@ -11,47 +12,49 @@ diff --color -Naur swift-corelibs-libdispatch-orig/src/apply.c swift-corelibs-li typedef void (*dispatch_apply_function_t)(void *, size_t); static char const * const _dispatch_apply_key = "apply"; -@@ -366,3 +369,5 @@ +@@ -366,3 +369,5 @@ dispatch_apply(size_t iterations, dispatch_queue_t dq, void (^work)(size_t)) (dispatch_apply_function_t)_dispatch_Block_invoke(work)); } #endif + +#pragma GCC diagnostic pop -diff --color -Naur swift-corelibs-libdispatch-orig/src/data.c swift-corelibs-libdispatch/src/data.c ---- swift-corelibs-libdispatch-orig/src/data.c 2024-11-08 21:55:26.837737053 -0600 -+++ swift-corelibs-libdispatch/src/data.c 2024-11-08 21:55:53.953450013 -0600 -@@ -20,6 +20,8 @@ +diff --git swift-corelibs-libdispatch.orig/src/data.c swift-corelibs-libdispatch/src/data.c +index 0a3cb1a..81a483b 100644 +--- swift-corelibs-libdispatch.orig/src/data.c ++++ swift-corelibs-libdispatch/src/data.c +@@ -20,6 +20,9 @@ #include "internal.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-function-type-mismatch" ++ /* * Dispatch data objects are dispatch objects with standard retain/release * memory management. A dispatch data object either points to a number of other -@@ -738,3 +740,5 @@ +@@ -738,3 +741,5 @@ retry: return mep; } #endif // HAVE_MACH + +#pragma GCC diagnostic pop -diff --color -Naur swift-corelibs-libdispatch-orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c ---- swift-corelibs-libdispatch-orig/src/event/event_epoll.c 2025-09-11 14:24:00.865948813 -0400 -+++ swift-corelibs-libdispatch/src/event/event_epoll.c 2025-09-11 14:25:11.185712066 -0400 -@@ -20,6 +20,10 @@ +diff --git swift-corelibs-libdispatch.orig/src/event/event_epoll.c swift-corelibs-libdispatch/src/event/event_epoll.c +index f31d13e..ac80dfd 100644 +--- swift-corelibs-libdispatch.orig/src/event/event_epoll.c ++++ swift-corelibs-libdispatch/src/event/event_epoll.c +@@ -20,6 +20,9 @@ #include "internal.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsign-conversion" -+ #if DISPATCH_EVENT_BACKEND_EPOLL #include #include -@@ -723,4 +727,5 @@ - (void)dq_state; +@@ -724,3 +727,5 @@ _dispatch_event_loop_leave_immediate(uint64_t dq_state) } -+#pragma GCC diagnostic pop #endif // DISPATCH_EVENT_BACKEND_EPOLL ++ ++#pragma GCC diagnostic pop diff --git a/fix_foundation_cmath.patch b/swift-foundation.patch similarity index 100% rename from fix_foundation_cmath.patch rename to swift-foundation.patch diff --git a/swift-lang.spec b/swift-lang.spec index 5d6df21..f59df5f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,109 +6,235 @@ %global debug_package %{nil} %undefine _auto_set_build_flags -%global linux_version fedora +Version: 6.1.3 -################################################# -# Make sure these are changed for every release! -################################################# -%global swift_version 6.1.3-RELEASE -%global package_version 6.1.3 +# Main swift source and version +%global forgeurl0 https://github.com/swiftlang/swift +%global version0 6.1.3 +%global tag0 swift-%{version0}-RELEASE +%global subdir0 swift -%global swift_source_location swift-source +%global forgeurl1 https://github.com/swiftlang/llvm-project +%global tag1 swift-%{version0}-RELEASE +%global subdir1 llvm-project -# Set to the right version per the json file -# Run 'extract_versions.sh' to get updated -# versions. -%global yams_version 5.0.6 -%global swift_argument_parser_version 1.4.0 -%global swift_crypto_version 3.0.0 -%global ninja_version 1.11.1 -%global cmake_version 3.30.2 -%global swift_atomics_version 1.2.0 -%global swift_collections_version 1.1.3 -%global swift_numerics_version 1.0.2 -%global swift_system_version 1.3.0 -%global swift_nio_version 2.65.0 -%global swift_certificates_version 1.0.1 -%global swift_asn1_version 1.0.0 -%global wasmkit_version 0.1.2 -%global wasi_version 22 -%global swift_format_version 6.1 -%global swift_llvm_bindings_version 6.1 -%global swift_foundation_icu_version 6.1 -%global swift_foundation_version 6.1 -%global swift_sdk_generator_version 6.1 -%global swift_async_algorithms_version 1.0.1 -%global swift_log_version 1.5.4 -%global swift_toolchain_sqlite_version 1.0.1 -%global zlib_version 1.3.1 +%global forgeurl2 https://github.com/swiftlang/swift-llvm-bindings +%global tag2 swift-%{version0}-RELEASE +%global subdir2 swift-llvm-bindings +%global forgeurl3 https://github.com/swiftlang/swift-cmark +%global tag3 swift-%{version0}-RELEASE +%global subdir3 cmark + +%global forgeurl4 https://github.com/swiftlang/swift-llbuild +%global tag4 swift-%{version0}-RELEASE +%global subdir4 llbuild + +%global forgeurl5 https://github.com/swiftlang/swift-toolchain-sqlite +%global tag5 1.0.1 +%global subdir5 swift-toolchain-sqlite + +%global forgeurl6 https://github.com/swiftlang/swift-tools-support-core +%global tag6 swift-%{version0}-RELEASE +%global subdir6 swift-tools-support-core + +%global forgeurl7 https://github.com/swiftlang/swift-package-manager +%global tag7 swift-%{version0}-RELEASE +%global subdir7 swiftpm + +%global forgeurl8 https://github.com/apple/swift-argument-parser +%global tag8 1.4.0 +%global subdir8 swift-argument-parser + +%global forgeurl9 https://github.com/apple/swift-atomics +%global tag9 1.2.0 +%global subdir9 swift-atomics + +%global forgeurl10 https://github.com/apple/swift-collections +%global tag10 1.1.3 +%global subdir10 swift-collections + +%global forgeurl11 https://github.com/apple/swift-crypto +%global tag11 3.0.0 +%global subdir11 swift-crypto + +%global forgeurl12 https://github.com/apple/swift-certificates +%global tag12 1.0.1 +%global subdir12 swift-certificates + +%global forgeurl13 https://github.com/apple/swift-asn1 +%global tag13 1.0.0 +%global subdir13 swift-asn1 + +%global forgeurl14 https://github.com/apple/swift-async-algorithms +%global tag14 1.0.1 +%global subdir14 swift-async-algorithms + +%global forgeurl15 https://github.com/swiftlang/swift-driver +%global tag15 swift-%{version0}-RELEASE +%global subdir15 swift-driver + +%global forgeurl16 https://github.com/apple/swift-log +%global tag16 1.5.4 +%global subdir16 swift-log + +%global forgeurl17 https://github.com/apple/swift-numerics +%global tag17 1.0.2 +%global subdir17 swift-numerics + +%global forgeurl18 https://github.com/swiftlang/swift-syntax +%global tag18 swift-%{version0}-RELEASE +%global subdir18 swift-syntax + +%global forgeurl19 https://github.com/apple/swift-system +%global tag19 1.3.0 +%global subdir19 swift-system + +%global forgeurl20 https://github.com/swiftlang/swift-stress-tester +%global tag20 swift-%{version0}-RELEASE +%global subdir20 swift-stres-tester + +%global forgeurl21 https://github.com/swiftlang/swift-testing +%global tag21 swift-%{version0}-RELEASE +%global subdir21 swift-testing + +%global forgeurl22 https://github.com/swiftlang/swift-corelibs-xctest +%global tag22 swift-%{version0}-RELEASE +%global subdir22 swift-corelibs-xctest + +%global forgeurl23 https://github.com/swiftlang/swift-corelibs-foundation +%global tag23 swift-%{version0}-RELEASE +%global subdir23 swift-corelibs-foundation + +%global forgeurl24 https://github.com/swiftlang/swift-foundation-icu +%global tag24 swift-%{version0}-RELEASE +%global subdir24 swift-foundation-icu + +%global forgeurl25 https://github.com/swiftlang/swift-foundation +%global tag25 swift-%{version0}-RELEASE +%global subdir25 swift-foundation + +%global forgeurl26 https://github.com/swiftlang/swift-corelibs-libdispatch +%global tag26 swift-%{version0}-RELEASE +%global subdir26 swift-corelibs-libdispatch + +%global forgeurl27 https://github.com/swiftlang/swift-integration-tests +%global tag27 swift-%{version0}-RELEASE +%global subdir27 swift-integration-tests + +%global forgeurl28 https://github.com/apple/swift-xcode-playground-support +%global tag28 swift-%{version0}-RELEASE +%global subdir28 swift-xcode-playground-support + +%global forgeurl29 https://github.com/ninja-build/ninja +%global tag29 v1.11.1 +%global subdir29 ninja + +%global forgeurl30 https://github.com/jpsim/Yams +%global tag30 5.0.6 +%global subdir30 yams + +%global forgeurl31 https://github.com/KitWare/CMake +%global tag31 v3.30.2 +%global subdir31 cmake + +%global forgeurl32 https://github.com/swiftlang/indexstore-db +%global tag32 swift-%{version0}-RELEASE +%global subdir32 indexstore-db + +%global forgeurl33 https://github.com/swiftlang/sourcekit-lsp +%global tag33 swift-%{version0}-RELEASE +%global subdir33 sourcekit-lsp + +%global forgeurl34 https://github.com/swiftlang/swift-format +%global tag34 swift-%{version0}-RELEASE +%global subdir34 swift-format + +%global forgeurl35 https://github.com/swiftlang/swift-installer-scripts +%global tag35 swift-%{version0}-RELEASE +%global subdir35 swift-installer-scripts + +%global forgeurl36 https://github.com/swiftlang/swift-docc +%global tag36 swift-%{version0}-RELEASE +%global subdir36 swift-docc + +%global forgeurl37 https://github.com/swiftlang/swift-lmdb +%global tag37 swift-%{version0}-RELEASE +%global subdir37 swift-lmdb + +%global forgeurl38 https://github.com/swiftlang/swift-docc-render-artifact +%global tag38 swift-%{version0}-RELEASE +%global subdir38 swift-docc-render-artifact + +%global forgeurl39 https://github.com/swiftlang/swift-docc-symbolkit +%global tag39 swift-%{version0}-RELEASE +%global subdir39 swift-docc-symbolkit + +%global forgeurl40 https://github.com/swiftlang/swift-markdown +%global tag40 swift-%{version0}-RELEASE +%global subdir40 swift-markdown + +%global forgeurl41 https://github.com/apple/swift-nio +%global tag41 2.65.0 +%global subdir41 swift-nio + +%global forgeurl42 https://github.com/swiftlang/swift-experimental-string-processing +%global tag42 swift-%{version0}-RELEASE +%global subdir42 swift-experimental-string-processing + +%global forgeurl43 https://github.com/swiftlang/swift-sdk-generator +%global tag43 swift-%{version0}-RELEASE +%global subdir43 swift-sdk-generator + +%global forgeurl44 https://github.com/WebAssembly/wasi-libc +%global tag44 wasi-sdk-22 +%global subdir44 wasi-libc + +%global forgeurl45 https://github.com/swiftwasm/WasmKit +%global tag45 0.1.2 +%global subdir45 wasmkit + +%global forgeurl46 https://github.com/curl/curl +%global tag46 curl-8_9_1 +%global subdir46 curl + +%global forgeurl47 https://github.com/gnome/libxml2 +%global tag47 v2.11.5 +%global subdir47 libxml2 + +%global forgeurl48 https://github.com/madler/zlib +%global tag48 v1.3.1 +%global subdir48 zlib Name: swift-lang -Version: %{package_version} Release: %autorelease +%forgemeta -a + Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org -Source0: https://github.com/apple/swift/archive/refs/tags/swift-%{swift_version}.tar.gz#/swift.tar.gz -Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swift_version}.tar.gz#/corelibs-libdispatch.tar.gz -Source2: https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swift_version}.tar.gz#/corelibs-foundation.tar.gz -Source3: https://github.com/apple/swift-integration-tests/archive/swift-%{swift_version}.tar.gz#/swift-integration-tests.tar.gz -Source4: https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swift_version}.tar.gz#/corelibs-xctest.tar.gz -Source5: https://github.com/apple/swift-package-manager/archive/swift-%{swift_version}.tar.gz#/package-manager.tar.gz -Source6: https://github.com/apple/swift-llbuild/archive/swift-%{swift_version}.tar.gz#/llbuild.tar.gz -Source7: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}.tar.gz#/cmark.tar.gz -Source8: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swift_version}.tar.gz#/swift-xcode-playground-support.tar.gz -Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%{swift_version}.tar.gz#/sourcekit-lsp.tar.gz -Source10: https://github.com/apple/indexstore-db/archive/swift-%{swift_version}.tar.gz#/indexstore-db.tar.gz -Source11: https://github.com/apple/llvm-project/archive/swift-%{swift_version}.tar.gz#/llvm-project.tar.gz -Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz -Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz -Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz -Source15: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz -Source16: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz -Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz -Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz -Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz -Source20: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source21: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz -Source22: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz -Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz -Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz -Source25: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz -Source26: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz -Source27: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz -Source28: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz -Source29: https://github.com/apple/swift-sdk-generator/archive/refs/tags/swift-%{swift_sdk_generator_version}-RELEASE.tar.gz#/swift-sdk-generator.tar.gz -Source30: https://github.com/apple/swift-format/archive/refs/heads/release/%{swift_format_version}.zip#/swift-format.zip -Source31: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz -Source32: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz -Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz -Source34: https://github.com/apple/swift-certificates/archive/%{swift_certificates_version}.tar.gz#/swift-certificates.tar.gz -Source35: https://github.com/apple/swift-asn1/archive/%{swift_asn1_version}.tar.gz#/swift-asn1.tar.gz -Source36: https://github.com/apple/swift-async-algorithms/archive/refs/tags/%{swift_async_algorithms_version}.tar.gz#/swift-async-algorithms.tar.gz -Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%{wasmkit_version}.tar.gz#/wasm.tar.gz -Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{wasi_version}.tar.gz#/wasi-sdk.tar.gz -Source39: https://github.com/apple/swift-llvm-bindings/archive/refs/heads/swift/release/%{swift_llvm_bindings_version}.zip#/swift-llvm-bindings.zip -Source40: https://github.com/apple/swift-foundation-icu/archive/refs/heads/release/%{swift_foundation_icu_version}.zip#/swift-foundation-icu.zip -Source41: https://github.com/apple/swift-foundation/archive/refs/heads/release/%{swift_foundation_version}.zip#/swift-foundation.zip -Source42: https://github.com/apple/swift-testing/archive/refs/tags/swift-%{swift_version}.tar.gz#/swift-testing.tar.gz -Source43: https://github.com/madler/zlib/releases/download/v%{zlib_version}/zlib131.zip -Source44: swiftlang.conf -Source45: https://github.com/apple/swift-log/archive/refs/tags/%{swift_log_version}.tar.gz#/swift-log.tar.gz -Source46: https://github.com/swiftlang/swift-toolchain-sqlite/archive/refs/tags/%{swift_toolchain_sqlite_version}.tar.gz#/swift-toolchain-sqlite.tar.gz +%{lua: +for i = 0, 48 do + local forgesource = rpm.expand("%{?forgesource" .. i .. "}") + if forgesource ~= "" then + print("Source" .. i .. ": " .. forgesource .. "\n") + end +end +} +Source99: swiftlang.conf -Patch1: need_pic.patch -Patch2: no_pipes.patch -Patch3: enable_lzma.patch -Patch5: remove_termio.diff -Patch6: fix_chain_comparison.patch -Patch7: disable_warning.patch -Patch8: no_testable_package.patch -Patch9: clang_crash_fix.patch -Patch10: need_cstdint.patch -Patch11: fix_foundation_cmath.patch +# NOTE: The patch number corresponds to the source it's packaging. For example, +# Patch25 is patching Source25, swift-foundation. +Patch0: swift.patch +Patch1: llvm-project.patch +Patch3: cmark.patch +Patch4: llbuild.patch +Patch7: swiftpm.patch +Patch25: swift-foundation.patch +Patch26: swift-corelibs-libdispatch.patch +Patch29: ninja.patch +Patch31: cmake.patch BuildRequires: clang BuildRequires: swig @@ -167,132 +293,63 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39 -a 40 -a 41 -a 42 -a 43 -a 45 -a 46 -# The Swift build script requires directories to be named -# in a specific way so renaming the source directories is -# necessary -mv swift-cmark-swift-%{swift_version} cmark -mv swift-testing-swift-%{swift_version} swift-testing -mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swift_version} swift-integration-tests -mv swift-llbuild-swift-%{swift_version} llbuild -mv swift-package-manager-swift-%{swift_version} swiftpm -mv swift-swift-%{swift_version} swift -mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp -mv indexstore-db-swift-%{swift_version} indexstore-db -mv llvm-project-swift-%{swift_version} llvm-project -mv swift-syntax-swift-%{swift_version} swift-syntax -mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core -mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser -mv swift-driver-swift-%{swift_version} swift-driver -mv swift-crypto-%{swift_crypto_version} swift-crypto -mv CMake-%{cmake_version} cmake -mv swift-atomics-%{swift_atomics_version} swift-atomics -mv swift-docc-swift-%{swift_version} swift-docc -mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact -mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit -mv swift-collections-%{swift_collections_version} swift-collections -mv swift-numerics-%{swift_numerics_version} swift-numerics -mv swift-system-%{swift_system_version} swift-system -mv swift-nio-%{swift_nio_version} swift-nio -mv swift-format-release-%{swift_format_version} swift-format -mv swift-lmdb-swift-%{swift_version} swift-lmdb -mv swift-markdown-swift-%{swift_version} swift-markdown -mv swift-stress-tester-swift-%{swift_version} swift-stress-tester -mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing -mv swift-certificates-%{swift_certificates_version} swift-certificates -mv swift-asn1-%{swift_asn1_version} swift-asn1 -mv swift-llvm-bindings-swift-release-%{swift_llvm_bindings_version} swift-llvm-bindings -mv swift-foundation-icu-release-%{swift_foundation_icu_version} swift-foundation-icu -mv swift-foundation-release-%{swift_foundation_version} swift-foundation -mv swift-sdk-generator-swift-%{swift_sdk_generator_version}-RELEASE swift-sdk-generator -mv swift-async-algorithms-%{swift_async_algorithms_version} swift-async-algorithms -mv swift-log-%{swift_log_version} swift-log -mv swift-toolchain-sqlite-%{swift_toolchain_sqlite_version} swift-toolchain-sqlite +%forgesetup -a +cd %{builddir} +%{lua: +for i = 0, 48 do + local subdir = rpm.expand("%{?subdir" .. i .. "}") + if subdir ~= "" then + print(rpm.expand("mv %{archivename" .. i .. "} " .. subdir .. "\n")) + end +end +} -# Yams -mv Yams-%{yams_version} yams - -# Ninja -mv ninja-%{ninja_version} ninja - -# WasmKit -mv WasmKit-%{wasmkit_version} wasmkit -mv wasi-libc-wasi-sdk-%{wasi_version} wasi-libc - -# zlib -mv zlib-%{zlib_version} zlib +%patch 0 +%patch 1 +%patch 3 +%patch 4 +%patch 7 +%patch 25 +%patch 26 +%patch 29 +%patch 31 # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Enable PIC for cmark -%patch -P1 -p0 - -# Pipes has been removed in Python -%patch -P2 -p0 - -# Enable LZMA -%patch -P3 -p0 - -# Remove references to obsolete termio struct -%patch -P5 -p0 - -# Fix a chained comparison discrepancy -%patch -P6 -p0 - -# disable warning treated as error in libdispatch -%patch -P7 -p0 - -# Disable integration tests as they are causing the packaging -# to fail (after Swift has been successfully built) -%patch -P8 -p0 - -# The clang compiler crashes on Fedora 42 and Rawhide -# on x86_64 on a particular file -%if 0%{?fedora} >= 42 -%ifarch x86_64 -%patch -P9 -p0 -%endif -%endif - -# Explicitly include for int64 -%patch -P10 -p0 - -# Fix C/C++ math header conflicts in Foundation -%patch -P11 -p0 - +# Build wasmkit using current swift-tools-version +sed -i 's/swift-tools-version:999.0.0/swift-tools-version:6.1.3/' wasmkit/Package@swift-6.1.swift +%global buildsubdir %{nil} %build export VERBOSE=1 -# Here we go! -swift/utils/build-script --preset=buildbot_linux,no_test skip-early-swiftsyntax=true install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-%{linux_version}.tar.gz +%{builddir}/swift/utils/build-script --preset=buildbot_linux,no_test \ + skip-early-swiftsyntax=true \ + install_destdir=%{_builddir} \ + installable_package=%{_builddir}/swift-%{version}-f%{fedora}.tar.gz %install -mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version} -cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version} +mkdir -p %{buildroot}%{_libexecdir}/swift/%{version} +cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{version} mkdir -p %{buildroot}%{_bindir} -ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift -ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc -ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift-build %{buildroot}%{_bindir}/swift-build -ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift-run %{buildroot}%{_bindir}/swift-run -ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp +ln -fs %{_libexecdir}/swift/%{version}/bin/swift %{buildroot}%{_bindir}/swift +ln -fs %{_libexecdir}/swift/%{version}/bin/swiftc %{buildroot}%{_bindir}/swiftc +ln -fs %{_libexecdir}/swift/%{version}/bin/swift-build %{buildroot}%{_bindir}/swift-build +ln -fs %{_libexecdir}/swift/%{version}/bin/swift-run %{buildroot}%{_bindir}/swift-run +ln -fs %{_libexecdir}/swift/%{version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 mkdir -p %{buildroot}/usr/lib ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift mkdir -p %{buildroot}%{_libdir} -ln -fs %{_libexecdir}/swift/%{package_version}/lib/libIndexStore.so %{buildroot}%{_libdir}/ -ln -fs %{_libexecdir}/swift/%{package_version}/lib/libIndexStore.so.17 %{buildroot}%{_libdir}/ -ln -fs %{_libexecdir}/swift/%{package_version}/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/ -ln -fs %{_libexecdir}/swift/%{package_version}/lib/libswiftDemangle.so %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so.17 %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{version}/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{version}/lib/libswiftDemangle.so %{buildroot}%{_libdir}/ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ -install -m 0644 %{SOURCE44} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf +install -m 0644 %{SOURCE99} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf # This is to fix an issue with check-rpaths complaining about diff --git a/swift.patch b/swift.patch new file mode 100644 index 0000000..c63647d --- /dev/null +++ b/swift.patch @@ -0,0 +1,51 @@ +diff --git swift.orig/lib/Sema/CodeSynthesisDistributedActor.cpp swift/lib/Sema/CodeSynthesisDistributedActor.cpp +index ba143935192..3e4686eff93 100644 +--- swift.orig/lib/Sema/CodeSynthesisDistributedActor.cpp ++++ swift/lib/Sema/CodeSynthesisDistributedActor.cpp +@@ -859,7 +859,7 @@ void swift::assertRequiredSynthesizedPropertyOrder(ASTContext &Context, + } + if (idIdx + actorSystemIdx + unownedExecutorIdx >= 0 + 1 + 2) { + // we have found all the necessary fields, let's assert their order +- assert(idIdx < actorSystemIdx < unownedExecutorIdx && ++ assert(idIdx < actorSystemIdx && actorSystemIdx < unownedExecutorIdx && + "order of fields MUST be exact."); + } + } +diff --git swift.orig/stdlib/include/llvm/ADT/SmallVector.h swift/stdlib/include/llvm/ADT/SmallVector.h +index 56b9e606302..ca651fc8845 100644 +--- swift.orig/stdlib/include/llvm/ADT/SmallVector.h ++++ swift/stdlib/include/llvm/ADT/SmallVector.h +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git swift.orig/utils/build-presets.ini swift/utils/build-presets.ini +index 14b9a7006d2..511def20a6f 100644 +--- swift.orig/utils/build-presets.ini ++++ swift/utils/build-presets.ini +@@ -876,7 +876,7 @@ build-wasm-stdlib + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out + +-test-installable-package ++# test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks +diff --git swift.orig/utils/build-script-impl swift/utils/build-script-impl +index 581c68b9685..4f6a69bb484 100755 +--- swift.orig/utils/build-script-impl ++++ swift/utils/build-script-impl +@@ -2242,7 +2242,7 @@ for host in "${ALL_HOSTS[@]}"; do + -DLLDB_ENABLE_CURSES=ON + -DLLDB_ENABLE_LIBEDIT=ON + -DLLDB_ENABLE_PYTHON=ON +- -DLLDB_ENABLE_LZMA=OFF ++ -DLLDB_ENABLE_LZMA=ON + -DLLDB_ENABLE_LUA=OFF + -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" + -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" diff --git a/swiftpm.patch b/swiftpm.patch new file mode 100644 index 0000000..d3ac51a --- /dev/null +++ b/swiftpm.patch @@ -0,0 +1,13 @@ +diff --git swiftpm.orig/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift swiftpm/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift +index 3aadda6b5..61c1c3532 100644 +--- swiftpm.orig/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift ++++ swiftpm/Sources/Build/BuildDescription/ClangModuleBuildDescription.swift +@@ -440,7 +440,7 @@ public final class ClangModuleBuildDescription { + case .debug: + return ["-O0"] + case .release: +- return ["-O2"] ++ return ["-O1"] + } + } + From a467f34810d0d4a22237a7200f2c270f7c3e0a59 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Sat, 20 Sep 2025 07:52:50 -0400 Subject: [PATCH 144/152] Add update-swift-version.sh script This script retrieves the 'update-checkout-config.json' file from the correct version of the swift repository and updates the versions of the additional sources to the versions specified in the JSON. It is designed to be run manually by a package maintainer to update the forty-something source packages that make up this project. [skip changelog] --- README.md | 34 ++++++++++++++++ swift-lang.spec | 3 ++ update-swift-version.sh | 88 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 README.md create mode 100755 update-swift-version.sh diff --git a/README.md b/README.md new file mode 100644 index 0000000..1cfec91 --- /dev/null +++ b/README.md @@ -0,0 +1,34 @@ +# Swift Language Fedora Package + +## update-swift-version.sh + +A script to update the Swift language package to a new version by automatically downloading the official Swift configuration and updating the RPM spec file. + +### Usage + +```bash +./update-swift-version.sh +``` + +### Example + +```bash +./update-swift-version.sh 6.1.3 +``` + +### What it does + +1. Downloads the Swift release configuration from the official Swift repository +2. Parses the repository versions for all Swift components +3. Updates the `swift-lang.spec` file with new source URLs and version information +4. Removes old forge sources and adds new ones based on the Swift release configuration + +### Requirements + +- `curl` - for downloading configuration files +- `jq` - for parsing JSON configuration +- `sed` - for updating the spec file + +### After running + +Review the changes to `swift-lang.spec` and remove any patches that are no longer needed for the new version. diff --git a/swift-lang.spec b/swift-lang.spec index f59df5f..90f759b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -14,6 +14,7 @@ Version: 6.1.3 %global tag0 swift-%{version0}-RELEASE %global subdir0 swift +# Begin forge sources %global forgeurl1 https://github.com/swiftlang/llvm-project %global tag1 swift-%{version0}-RELEASE %global subdir1 llvm-project @@ -206,6 +207,8 @@ Version: 6.1.3 %global tag48 v1.3.1 %global subdir48 zlib +# End forge sources + Name: swift-lang Release: %autorelease %forgemeta -a diff --git a/update-swift-version.sh b/update-swift-version.sh new file mode 100755 index 0000000..5fe95d8 --- /dev/null +++ b/update-swift-version.sh @@ -0,0 +1,88 @@ +#!/bin/bash + +set -e + +SWIFT_VERSION="${1:-}" +# Only shorten the version if it contains two dots. +if [[ "${SWIFT_VERSION}" =~ \.\. ]]; then + SHORT_SWIFT_VERSION="${SWIFT_VERSION%.*}" +else + SHORT_SWIFT_VERSION="${SWIFT_VERSION}" +fi + +if [[ -z "$SWIFT_VERSION" ]]; then + echo "Usage: $0 " + echo "Example: $0 6.1.3" + exit 1 +fi + +SPEC_FILE="swift-lang.spec" +TAG="swift-${SWIFT_VERSION}-RELEASE" +CONFIG_URL="https://raw.githubusercontent.com/swiftlang/swift/${TAG}/utils/update_checkout/update-checkout-config.json" +TEMP_CONFIG=$(mktemp) + +echo "Downloading Swift $SWIFT_VERSION configuration..." +if ! curl -sSL "$CONFIG_URL" -o "$TEMP_CONFIG"; then + echo "Error: Failed to download configuration for Swift $SWIFT_VERSION" + echo "URL: $CONFIG_URL" + rm -f "$TEMP_CONFIG" + exit 1 +fi + +if ! jq . "$TEMP_CONFIG" >/dev/null 2>&1; then + echo "Error: Downloaded file is not valid JSON" + rm -f "$TEMP_CONFIG" + exit 1 +fi + +echo "Parsing repository versions..." + +# Collect all the projects included in the desired branch scheme +PROJECTS=$(jq -r --arg scheme "release/${SHORT_SWIFT_VERSION}" '.["branch-schemes"][$scheme]["repos"]|keys[]' "${TEMP_CONFIG}") + +# Associate each project with the ref used by the desired branch scheme +declare -A PROJECT_REFS +for PROJECT in ${PROJECTS}; do + PROJECT_REF=$(jq -r --arg scheme "release/${SHORT_SWIFT_VERSION}" --arg project "$PROJECT" '.["branch-schemes"][$scheme]["repos"][$project]' "${TEMP_CONFIG}") + PROJECT_REFS["${PROJECT}"]="${PROJECT_REF}" +done + +# Remove all existing sources between the lines "Begin forge sources" and "End forge sources" +sed -i "/Begin forge sources/,/End forge sources/{//!d;}" "${SPEC_FILE}" + +IDX=1 +# Get each project's "ID" (Github repo org/proj URL fragment) +for PROJECT in "${!PROJECT_REFS[@]}"; do + if [ "${PROJECT}" == "swift" ]; then + continue + fi + + PROJECT_REF=${PROJECT_REFS[${PROJECT}]} + PROJECT_ID=$(jq -r --arg project "${PROJECT}" '.["repos"][$project].remote.id' "${TEMP_CONFIG}") + FORGEURL="https://github.com/${PROJECT_ID}" + + PADDING=" " + if [ "${IDX}" -lt 10 ]; then + PADDING=" " + fi + if [ "${IDX}" -ge 100 ]; then + PADDING=" " + fi + + if [[ "${PROJECT_REF}" =~ ^(swift/)?release/.* ]]; then + PROJECT_REF="swift-%{version0}-RELEASE" + fi + + # Add a new source to the spec file between the lines "Begin forge sources" and "End forge sources" + sed -i -e "/End forge sources/i %global forgeurl${IDX} ${FORGEURL}\n%global tag${IDX} ${PADDING}${PROJECT_REF}\n%global subdir${IDX} ${PROJECT}\n" "${SPEC_FILE}" + IDX=$((IDX + 1)) +done + +# Update the version number in the spec file. +echo "Updating version number in the spec file." +sed -i "s|Version: .*|Version: ${SWIFT_VERSION}|" "${SPEC_FILE}" + +rm -f "$TEMP_CONFIG" + +echo "Done! Please review the changes to ensure everything is correct." +echo "Remember to review the patches and remove any that are no longer needed." From 0c46d403f58e4b055908e36fe4a881934708f1fb Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Sat, 20 Sep 2025 07:53:58 -0400 Subject: [PATCH 145/152] Convert the 6.1.3 release to generated sources Convert the existing 6.1.3 sources to use the script-generated macros. [skip changelog] --- swift-lang.spec | 306 ++++++++++++++++++++++++------------------------ 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/swift-lang.spec b/swift-lang.spec index 90f759b..7f17bdb 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -15,197 +15,197 @@ Version: 6.1.3 %global subdir0 swift # Begin forge sources -%global forgeurl1 https://github.com/swiftlang/llvm-project -%global tag1 swift-%{version0}-RELEASE -%global subdir1 llvm-project +%global forgeurl1 https://github.com/apple/swift-atomics +%global tag1 1.2.0 +%global subdir1 swift-atomics -%global forgeurl2 https://github.com/swiftlang/swift-llvm-bindings +%global forgeurl2 https://github.com/swiftlang/sourcekit-lsp %global tag2 swift-%{version0}-RELEASE -%global subdir2 swift-llvm-bindings +%global subdir2 sourcekit-lsp -%global forgeurl3 https://github.com/swiftlang/swift-cmark +%global forgeurl3 https://github.com/swiftlang/swift-corelibs-xctest %global tag3 swift-%{version0}-RELEASE -%global subdir3 cmark +%global subdir3 swift-corelibs-xctest -%global forgeurl4 https://github.com/swiftlang/swift-llbuild -%global tag4 swift-%{version0}-RELEASE -%global subdir4 llbuild +%global forgeurl4 https://github.com/apple/swift-log +%global tag4 1.5.4 +%global subdir4 swift-log -%global forgeurl5 https://github.com/swiftlang/swift-toolchain-sqlite -%global tag5 1.0.1 -%global subdir5 swift-toolchain-sqlite +%global forgeurl5 https://github.com/swiftlang/swift-llbuild +%global tag5 swift-%{version0}-RELEASE +%global subdir5 llbuild -%global forgeurl6 https://github.com/swiftlang/swift-tools-support-core +%global forgeurl6 https://github.com/swiftlang/swift-corelibs-foundation %global tag6 swift-%{version0}-RELEASE -%global subdir6 swift-tools-support-core +%global subdir6 swift-corelibs-foundation %global forgeurl7 https://github.com/swiftlang/swift-package-manager %global tag7 swift-%{version0}-RELEASE %global subdir7 swiftpm -%global forgeurl8 https://github.com/apple/swift-argument-parser -%global tag8 1.4.0 -%global subdir8 swift-argument-parser +%global forgeurl8 https://github.com/swiftlang/swift-lmdb +%global tag8 swift-%{version0}-RELEASE +%global subdir8 swift-lmdb -%global forgeurl9 https://github.com/apple/swift-atomics -%global tag9 1.2.0 -%global subdir9 swift-atomics +%global forgeurl9 https://github.com/KitWare/CMake +%global tag9 v3.30.2 +%global subdir9 cmake -%global forgeurl10 https://github.com/apple/swift-collections -%global tag10 1.1.3 -%global subdir10 swift-collections +%global forgeurl10 https://github.com/apple/swift-collections +%global tag10 1.1.3 +%global subdir10 swift-collections -%global forgeurl11 https://github.com/apple/swift-crypto -%global tag11 3.0.0 -%global subdir11 swift-crypto +%global forgeurl11 https://github.com/swiftlang/swift-driver +%global tag11 swift-%{version0}-RELEASE +%global subdir11 swift-driver -%global forgeurl12 https://github.com/apple/swift-certificates -%global tag12 1.0.1 -%global subdir12 swift-certificates +%global forgeurl12 https://github.com/swiftlang/swift-docc-symbolkit +%global tag12 swift-%{version0}-RELEASE +%global subdir12 swift-docc-symbolkit -%global forgeurl13 https://github.com/apple/swift-asn1 -%global tag13 1.0.0 -%global subdir13 swift-asn1 +%global forgeurl13 https://github.com/swiftlang/swift-foundation +%global tag13 swift-%{version0}-RELEASE +%global subdir13 swift-foundation -%global forgeurl14 https://github.com/apple/swift-async-algorithms -%global tag14 1.0.1 -%global subdir14 swift-async-algorithms +%global forgeurl14 https://github.com/swiftlang/swift-cmark +%global tag14 swift-%{version0}-RELEASE +%global subdir14 cmark -%global forgeurl15 https://github.com/swiftlang/swift-driver -%global tag15 swift-%{version0}-RELEASE -%global subdir15 swift-driver +%global forgeurl15 https://github.com/gnome/libxml2 +%global tag15 v2.11.5 +%global subdir15 libxml2 -%global forgeurl16 https://github.com/apple/swift-log -%global tag16 1.5.4 -%global subdir16 swift-log +%global forgeurl16 https://github.com/swiftlang/swift-toolchain-sqlite +%global tag16 1.0.1 +%global subdir16 swift-toolchain-sqlite -%global forgeurl17 https://github.com/apple/swift-numerics -%global tag17 1.0.2 -%global subdir17 swift-numerics +%global forgeurl17 https://github.com/WebAssembly/wasi-libc +%global tag17 wasi-sdk-22 +%global subdir17 wasi-libc -%global forgeurl18 https://github.com/swiftlang/swift-syntax -%global tag18 swift-%{version0}-RELEASE -%global subdir18 swift-syntax +%global forgeurl18 https://github.com/swiftlang/swift-format +%global tag18 swift-%{version0}-RELEASE +%global subdir18 swift-format -%global forgeurl19 https://github.com/apple/swift-system -%global tag19 1.3.0 -%global subdir19 swift-system +%global forgeurl19 https://github.com/apple/swift-argument-parser +%global tag19 1.4.0 +%global subdir19 swift-argument-parser -%global forgeurl20 https://github.com/swiftlang/swift-stress-tester -%global tag20 swift-%{version0}-RELEASE -%global subdir20 swift-stres-tester +%global forgeurl20 https://github.com/swiftlang/swift-llvm-bindings +%global tag20 swift-%{version0}-RELEASE +%global subdir20 swift-llvm-bindings -%global forgeurl21 https://github.com/swiftlang/swift-testing -%global tag21 swift-%{version0}-RELEASE -%global subdir21 swift-testing +%global forgeurl21 https://github.com/swiftwasm/WasmKit +%global tag21 0.1.2 +%global subdir21 wasmkit -%global forgeurl22 https://github.com/swiftlang/swift-corelibs-xctest -%global tag22 swift-%{version0}-RELEASE -%global subdir22 swift-corelibs-xctest +%global forgeurl22 https://github.com/swiftlang/swift-syntax +%global tag22 swift-%{version0}-RELEASE +%global subdir22 swift-syntax -%global forgeurl23 https://github.com/swiftlang/swift-corelibs-foundation -%global tag23 swift-%{version0}-RELEASE -%global subdir23 swift-corelibs-foundation +%global forgeurl23 https://github.com/ninja-build/ninja +%global tag23 v1.11.1 +%global subdir23 ninja -%global forgeurl24 https://github.com/swiftlang/swift-foundation-icu -%global tag24 swift-%{version0}-RELEASE -%global subdir24 swift-foundation-icu +%global forgeurl24 https://github.com/swiftlang/swift-corelibs-libdispatch +%global tag24 swift-%{version0}-RELEASE +%global subdir24 swift-corelibs-libdispatch -%global forgeurl25 https://github.com/swiftlang/swift-foundation -%global tag25 swift-%{version0}-RELEASE -%global subdir25 swift-foundation +%global forgeurl25 https://github.com/swiftlang/swift-markdown +%global tag25 swift-%{version0}-RELEASE +%global subdir25 swift-markdown -%global forgeurl26 https://github.com/swiftlang/swift-corelibs-libdispatch -%global tag26 swift-%{version0}-RELEASE -%global subdir26 swift-corelibs-libdispatch +%global forgeurl26 https://github.com/swiftlang/swift-foundation-icu +%global tag26 swift-%{version0}-RELEASE +%global subdir26 swift-foundation-icu -%global forgeurl27 https://github.com/swiftlang/swift-integration-tests -%global tag27 swift-%{version0}-RELEASE -%global subdir27 swift-integration-tests +%global forgeurl27 https://github.com/madler/zlib +%global tag27 v1.3.1 +%global subdir27 zlib -%global forgeurl28 https://github.com/apple/swift-xcode-playground-support -%global tag28 swift-%{version0}-RELEASE -%global subdir28 swift-xcode-playground-support +%global forgeurl28 https://github.com/apple/swift-system +%global tag28 1.3.0 +%global subdir28 swift-system -%global forgeurl29 https://github.com/ninja-build/ninja -%global tag29 v1.11.1 -%global subdir29 ninja +%global forgeurl29 https://github.com/apple/swift-asn1 +%global tag29 1.0.0 +%global subdir29 swift-asn1 -%global forgeurl30 https://github.com/jpsim/Yams -%global tag30 5.0.6 -%global subdir30 yams +%global forgeurl30 https://github.com/swiftlang/swift-tools-support-core +%global tag30 swift-%{version0}-RELEASE +%global subdir30 swift-tools-support-core -%global forgeurl31 https://github.com/KitWare/CMake -%global tag31 v3.30.2 -%global subdir31 cmake +%global forgeurl31 https://github.com/swiftlang/swift-stress-tester +%global tag31 swift-%{version0}-RELEASE +%global subdir31 swift-stress-tester -%global forgeurl32 https://github.com/swiftlang/indexstore-db -%global tag32 swift-%{version0}-RELEASE -%global subdir32 indexstore-db +%global forgeurl32 https://github.com/apple/swift-nio +%global tag32 2.65.0 +%global subdir32 swift-nio -%global forgeurl33 https://github.com/swiftlang/sourcekit-lsp -%global tag33 swift-%{version0}-RELEASE -%global subdir33 sourcekit-lsp +%global forgeurl33 https://github.com/swiftlang/indexstore-db +%global tag33 swift-%{version0}-RELEASE +%global subdir33 indexstore-db -%global forgeurl34 https://github.com/swiftlang/swift-format -%global tag34 swift-%{version0}-RELEASE -%global subdir34 swift-format +%global forgeurl34 https://github.com/apple/swift-certificates +%global tag34 1.0.1 +%global subdir34 swift-certificates -%global forgeurl35 https://github.com/swiftlang/swift-installer-scripts -%global tag35 swift-%{version0}-RELEASE -%global subdir35 swift-installer-scripts +%global forgeurl35 https://github.com/swiftlang/swift-installer-scripts +%global tag35 swift-%{version0}-RELEASE +%global subdir35 swift-installer-scripts -%global forgeurl36 https://github.com/swiftlang/swift-docc -%global tag36 swift-%{version0}-RELEASE -%global subdir36 swift-docc +%global forgeurl36 https://github.com/swiftlang/swift-testing +%global tag36 swift-%{version0}-RELEASE +%global subdir36 swift-testing -%global forgeurl37 https://github.com/swiftlang/swift-lmdb -%global tag37 swift-%{version0}-RELEASE -%global subdir37 swift-lmdb - -%global forgeurl38 https://github.com/swiftlang/swift-docc-render-artifact -%global tag38 swift-%{version0}-RELEASE -%global subdir38 swift-docc-render-artifact +%global forgeurl37 https://github.com/swiftlang/swift-docc-render-artifact +%global tag37 swift-%{version0}-RELEASE +%global subdir37 swift-docc-render-artifact -%global forgeurl39 https://github.com/swiftlang/swift-docc-symbolkit -%global tag39 swift-%{version0}-RELEASE -%global subdir39 swift-docc-symbolkit +%global forgeurl38 https://github.com/apple/swift-async-algorithms +%global tag38 1.0.1 +%global subdir38 swift-async-algorithms -%global forgeurl40 https://github.com/swiftlang/swift-markdown -%global tag40 swift-%{version0}-RELEASE -%global subdir40 swift-markdown +%global forgeurl39 https://github.com/swiftlang/swift-integration-tests +%global tag39 swift-%{version0}-RELEASE +%global subdir39 swift-integration-tests -%global forgeurl41 https://github.com/apple/swift-nio -%global tag41 2.65.0 -%global subdir41 swift-nio +%global forgeurl40 https://github.com/apple/swift-crypto +%global tag40 3.0.0 +%global subdir40 swift-crypto -%global forgeurl42 https://github.com/swiftlang/swift-experimental-string-processing -%global tag42 swift-%{version0}-RELEASE -%global subdir42 swift-experimental-string-processing +%global forgeurl41 https://github.com/swiftlang/swift-sdk-generator +%global tag41 swift-%{version0}-RELEASE +%global subdir41 swift-sdk-generator -%global forgeurl43 https://github.com/swiftlang/swift-sdk-generator -%global tag43 swift-%{version0}-RELEASE -%global subdir43 swift-sdk-generator +%global forgeurl42 https://github.com/swiftlang/llvm-project +%global tag42 swift-%{version0}-RELEASE +%global subdir42 llvm-project -%global forgeurl44 https://github.com/WebAssembly/wasi-libc -%global tag44 wasi-sdk-22 -%global subdir44 wasi-libc +%global forgeurl43 https://github.com/jpsim/Yams +%global tag43 5.0.6 +%global subdir43 yams -%global forgeurl45 https://github.com/swiftwasm/WasmKit -%global tag45 0.1.2 -%global subdir45 wasmkit +%global forgeurl44 https://github.com/curl/curl +%global tag44 curl-8_9_1 +%global subdir44 curl -%global forgeurl46 https://github.com/curl/curl -%global tag46 curl-8_9_1 -%global subdir46 curl +%global forgeurl45 https://github.com/apple/swift-xcode-playground-support +%global tag45 swift-%{version0}-RELEASE +%global subdir45 swift-xcode-playground-support -%global forgeurl47 https://github.com/gnome/libxml2 -%global tag47 v2.11.5 -%global subdir47 libxml2 +%global forgeurl46 https://github.com/swiftlang/swift-experimental-string-processing +%global tag46 swift-%{version0}-RELEASE +%global subdir46 swift-experimental-string-processing -%global forgeurl48 https://github.com/madler/zlib -%global tag48 v1.3.1 -%global subdir48 zlib +%global forgeurl47 https://github.com/apple/swift-numerics +%global tag47 1.0.2 +%global subdir47 swift-numerics + +%global forgeurl48 https://github.com/swiftlang/swift-docc +%global tag48 swift-%{version0}-RELEASE +%global subdir48 swift-docc # End forge sources @@ -230,14 +230,14 @@ Source99: swiftlang.conf # NOTE: The patch number corresponds to the source it's packaging. For example, # Patch25 is patching Source25, swift-foundation. Patch0: swift.patch -Patch1: llvm-project.patch -Patch3: cmark.patch -Patch4: llbuild.patch +Patch42: llvm-project.patch +Patch14: cmark.patch +Patch5: llbuild.patch Patch7: swiftpm.patch -Patch25: swift-foundation.patch -Patch26: swift-corelibs-libdispatch.patch -Patch29: ninja.patch -Patch31: cmake.patch +Patch13: swift-foundation.patch +Patch24: swift-corelibs-libdispatch.patch +Patch23: ninja.patch +Patch9: cmake.patch BuildRequires: clang BuildRequires: swig @@ -308,14 +308,14 @@ end } %patch 0 -%patch 1 -%patch 3 -%patch 4 +%patch 42 +%patch 14 +%patch 5 %patch 7 -%patch 25 -%patch 26 -%patch 29 -%patch 31 +%patch 13 +%patch 24 +%patch 23 +%patch 9 # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py From a69f53791623f9ba39ff5e92e090c06df2155e53 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 22 Sep 2025 21:32:18 -0400 Subject: [PATCH 146/152] Update to Swift 6.2-RELEASE --- .gitignore | 33 ++++++++ sources | 65 +++++++------- swift-lang.spec | 220 ++++++++++++++++++++++++------------------------ swift.patch | 33 ++++---- 4 files changed, 194 insertions(+), 157 deletions(-) diff --git a/.gitignore b/.gitignore index 80f7f15..410bde1 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,36 @@ /WasmKit-0.1.2.tar.gz /Yams-5.0.6.tar.gz /zlib-1.3.1.tar.gz +/indexstore-db-swift-6.2-RELEASE.tar.gz +/llvm-project-swift-6.2-RELEASE.tar.gz +/mimalloc-3.0.1.tar.gz +/sourcekit-lsp-swift-6.2-RELEASE.tar.gz +/swift-build-swift-6.2-RELEASE.tar.gz +/swift-cmark-gfm.tar.gz +/swift-corelibs-foundation-swift-6.2-RELEASE.tar.gz +/swift-corelibs-libdispatch-swift-6.2-RELEASE.tar.gz +/swift-corelibs-xctest-swift-6.2-RELEASE.tar.gz +/swift-docc-render-artifact-swift-6.2-RELEASE.tar.gz +/swift-docc-swift-6.2-RELEASE.tar.gz +/swift-docc-symbolkit-swift-6.2-RELEASE.tar.gz +/swift-driver-swift-6.2-RELEASE.tar.gz +/swift-experimental-string-processing-swift-6.2-RELEASE.tar.gz +/swift-format-swift-6.2-RELEASE.tar.gz +/swift-foundation-icu-swift-6.2-RELEASE.tar.gz +/swift-foundation-swift-6.2-RELEASE.tar.gz +/swift-installer-scripts-swift-6.2-RELEASE.tar.gz +/swift-integration-tests-swift-6.2-RELEASE.tar.gz +/swift-llbuild-swift-6.2-RELEASE.tar.gz +/swift-llvm-bindings-swift-6.2-RELEASE.tar.gz +/swift-lmdb-swift-6.2-RELEASE.tar.gz +/swift-markdown-swift-6.2-RELEASE.tar.gz +/swift-package-manager-swift-6.2-RELEASE.tar.gz +/swift-sdk-generator-swift-6.2-RELEASE.tar.gz +/swift-stress-tester-swift-6.2-RELEASE.tar.gz +/swift-swift-6.2-RELEASE.tar.gz +/swift-syntax-swift-6.2-RELEASE.tar.gz +/swift-system-1.5.0.tar.gz +/swift-testing-swift-6.2-RELEASE.tar.gz +/swift-tools-support-core-swift-6.2-RELEASE.tar.gz +/swift-xcode-playground-support-swift-6.2-RELEASE.tar.gz +/wasi-libc-wasi-sdk-24.tar.gz diff --git a/sources b/sources index f372b72..14be3f4 100644 --- a/sources +++ b/sources @@ -1,49 +1,50 @@ SHA512 (CMake-3.30.2.tar.gz) = bd71bbd62a024cc93e97421ea50900072e9ab79ccec3ad0e012b5a9286a3c46a15c1b86a0f8ef2dd8518a4e63d4644d34c80cba869c0e9f9eb419fcc439acfa5 SHA512 (curl-curl-8_9_1.tar.gz) = f5c425c3fbd7bfda13137e8e9bc969ed7dc94c5bfcf0681a2358ab7d3b5d10402781a93385255a80c402c9824aeb97d70213b412f2d208dee4abdba5bbed2ca4 -SHA512 (indexstore-db-swift-6.1.3-RELEASE.tar.gz) = 082a87a20b5da7877fbcbc7c71013582b55a58a6a514a0190c545f6113184de9776202857a956f5b97d1838054d0bd3bdc4d8a741aea7f7443ddee8fdb8e7179 +SHA512 (indexstore-db-swift-6.2-RELEASE.tar.gz) = 03b64a304faeb07c1943c8ce467fbee6b3a83192ec4c356877dd1647fc135c0e6c2e7a327d9c871e728f56bb44f05fb61ab69c18491879798b97d514df83dd0f SHA512 (libxml2-2.11.5.tar.gz) = 303528ead0f020c8e172beca54d00bb1281f4080885c9f44b979158516b585d71bbcb024999a5712a850e48647b19b1f634a1428ea29f39a48e8e6cbf7c71936 -SHA512 (llvm-project-swift-6.1.3-RELEASE.tar.gz) = 9f6ecfd1cb0ef312ef4d01ada40d15abad38958e3d9ae24662aeb5a19cb4a90a3bd6e7bdb1826d4a9f8c7c1c483b92f7423b1ca85c3759ad57dbf610adb338c8 +SHA512 (llvm-project-swift-6.2-RELEASE.tar.gz) = 4b517b77682d013bd5da25b54b80b780591b98e92e8bae3e0824b271a6657b195eb52e3e02000d66495a7f6c1746a3ac34bdb28b47527b7a08c4a494bf287b53 +SHA512 (mimalloc-3.0.1.tar.gz) = ba51cf9af3ef41728c94b72805bf8915e63910b32cb9ab331445ec28404d048c0737646e02c08dc0f0e958c526fe894e275b96326fa041a157e3e88f39f2b673 SHA512 (ninja-1.11.1.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (sourcekit-lsp-swift-6.1.3-RELEASE.tar.gz) = 2656292b378be2e5c6531d9f17a43658ca8be4ed3e443ac25fcd8472e6e5197892db94e3a8319048202ae3bc7e3e3a86e1be6f2fce35e466cbb26b5d6e3d4b2d +SHA512 (sourcekit-lsp-swift-6.2-RELEASE.tar.gz) = d6a8a9a30e31ae16963eaed23b82a55752311ee0800749e5afbf3a2b53035711f111017ec8043bc52ac35f1752bc1871eca447d2723c17a3590f8c6f058d09f1 SHA512 (swift-argument-parser-1.4.0.tar.gz) = 38f0958c63dc01df1a5ac7164b8c76116050819a8747a71ff07c6c2208526e49c0f5411a2431bce4d3968b7100f95e4b00bbc49f69a6df69edfa7f8589a9892c SHA512 (swift-asn1-1.0.0.tar.gz) = f0e3bd7a4369b84a140e46a111d3985b62e74581ca631e4354ef769ae7f9190ffb3ff68ea3917df9c377fc308a8681a69b8dea4158a05daf798960be229a48c2 SHA512 (swift-async-algorithms-1.0.1.tar.gz) = a5687ddce9d051a671fc34d88cc77e2d30a60b99d7f4381956cee05d41d5afcc8fb34469155984f5b7dbedcc3f7f839a236fa528c3e0f660f4d6d409d39cf2f7 SHA512 (swift-atomics-1.2.0.tar.gz) = efd9a6e6b016fb0ad2de5d98fb219b893e271378a8c8d23d01215e855830fc6f1728eaec74ba33983ab9e8aece5ed65e310bbae84c289b43e458941080293351 +SHA512 (swift-build-swift-6.2-RELEASE.tar.gz) = c884f5a2f2f488834c45661ca60c857d241b3ad88d21a19b1f800fe8e424f3814e1c442b1f4517679eda3e5f40297eda8b2bbb24544beef58578e8b653628836 SHA512 (swift-certificates-1.0.1.tar.gz) = ea645425fffdb377efe1de9b897a7a6e42dc6668ce93068bbe6de69d42ab6e9801b6d9ff817b728d58eb9e2f66c4932869c281864bc432bd9fb9acb829311c41 -SHA512 (swift-cmark-swift-6.1.3-RELEASE.tar.gz) = 1cd9de0ff41c62a611a54490e919702114c9d059ee6b8018e291eecda8f610a1712ac6d650c5a19178d38f7b8fde174d8538e893c8f0c022cb55464fd7d4ba36 +SHA512 (swift-cmark-gfm.tar.gz) = 5425963eceb537007989715cb66b9d713354ffe2e1a6d97ce9ec350548713271a5ea957072694c63466643b07c1f08436950c243e24927c29a51f29a62ce5f36 SHA512 (swift-collections-1.1.3.tar.gz) = f26586b9c2e13279694a9bbb80b479ce8c34ceb6181dc455a228b52c8f704b88888ed5cdb3f92e913c228ff2aeca4625ee041fba7712086f57ec54ce709f73cd -SHA512 (swift-corelibs-foundation-swift-6.1.3-RELEASE.tar.gz) = 227304937bda2709aaaaa659707bba0baf044354441d28ce67c527c4214bd9306e26087edcee4e368cffbe2f07ad5e4d5c05103ea9eb95bfd9a60e4ccfc56f5c -SHA512 (swift-corelibs-libdispatch-swift-6.1.3-RELEASE.tar.gz) = 632f5910b76569355a12bb7a1666c5fd282d9e00fd7c9240068a48d6d629fbb085d42be0746657878b7a13e535c1cf1f517a652b5d327125a0bb8921b05d2d9c -SHA512 (swift-corelibs-xctest-swift-6.1.3-RELEASE.tar.gz) = 3933f9a1f8c6fb3887c10a231636e497d8c2d010572fb46145b12cd12ccfe013e70c17c731c32662eb554314cd57939068cd3588b12e2fb558c86a4df3196466 +SHA512 (swift-corelibs-foundation-swift-6.2-RELEASE.tar.gz) = a8e5cc5506331a9baa3244240a80654a7bc5e524915b694195d9e26cf7658569cb28034ee045c07b1c32c379dcd40a7b307f414d3a42570cf60d840f249cc3f3 +SHA512 (swift-corelibs-libdispatch-swift-6.2-RELEASE.tar.gz) = f2ddeb9c3d9ccea510eed8dcb02caf1a83dc89bae47be407a79a022e748f84049df96bad027af20c507bb3fb727095536bcc56e2879f79a6a8dd07cc33ca604f +SHA512 (swift-corelibs-xctest-swift-6.2-RELEASE.tar.gz) = 02f47ebe6d292fa8ca044c508bf89a14c105f53ea4de5e05e9e4f961222c2204faeca77907a72166d740facb97f18a5699a9150709de428f1308f06389957119 SHA512 (swift-crypto-3.0.0.tar.gz) = 2d79147d32bfb8449726c73c8b267262cf1ddc7c18637f4168e3fd848ba71c0719b23b5683ca513260cbc537fc439e38488ae16010717303625bceb7d5edd36f -SHA512 (swift-docc-render-artifact-swift-6.1.3-RELEASE.tar.gz) = 4c612389ffb6e57ebd228fed5c65312a2eb1e43976ee1d228ab1f0885036aeea7a4453ccf936fd156b6f0f8134628b7da4778fcee5c758d4bbed6a26536ad9e5 -SHA512 (swift-docc-swift-6.1.3-RELEASE.tar.gz) = 80eec33ce371b68cbe1da8fca975115257a0de64e1af83240cfade792310e97dc8317a27c4ee4e531a5f522881f8cc0e086391ecad6f276562426a7189fdc4cc -SHA512 (swift-docc-symbolkit-swift-6.1.3-RELEASE.tar.gz) = 52021ee5400c48b9c2078062affd3298a1c4e25a56c0ec77404403caacd51daef875dc4152c84d6a93c238b8339096beb18b9b7a92a1e612a25a40a9b6e8a990 -SHA512 (swift-driver-swift-6.1.3-RELEASE.tar.gz) = 96681f3cc23f1b5baaa6e491a52c10cabda376e556155cb3c391334f2b92072b55f9e21bd0be0974f633ac68cb064a853ffa891f51d9b270f3cb8dff3fb4850c -SHA512 (swift-experimental-string-processing-swift-6.1.3-RELEASE.tar.gz) = 4eee590d06930718e7e4ffb505e35c8b7a6b3e2ac50271a39f93776be1f35d7a333bec0903cd81e3362fbc7f03b49f7239df67be11d83938ec0911f24664841e -SHA512 (swift-format-swift-6.1.3-RELEASE.tar.gz) = bbfb899f9527c08fedf433a391c5e9ecae0815d9824952d31ecf2fa3badea745cab1c72ac88b09eec6044ab7e2c62bb34b37574f46959b87e0cb27ec8eebcd97 -SHA512 (swift-foundation-icu-swift-6.1.3-RELEASE.tar.gz) = 35921e588bdb6981006542a2ee5e77273fbd62a1f5c896f258cf911e3818ec5e8b5d13c523725dd27b6d79cb08138a276834f1cd40ba88e9ebc4490c5dfe7c76 -SHA512 (swift-foundation-swift-6.1.3-RELEASE.tar.gz) = 99e59cbe1c97ec79738d061e9d2f2f551e37664cbe7e3ce41ba7b30b2139b59e82ab2f1b956c1f7fe3ba171a57cc54fa0eea727f9b5438dd029931f141a9833b -SHA512 (swift-installer-scripts-swift-6.1.3-RELEASE.tar.gz) = 3ffdc0d5d5ebe2eba27dc2ee81588673f811201da2e3de910f3e58c642821a4f1109bf3682e31eb1a06a2fbc90a1053c47dfdba7514b2e801ab70c60d63f912f -SHA512 (swift-integration-tests-swift-6.1.3-RELEASE.tar.gz) = 87fda82e881ea03c425d02858001fa0024ff2243f2ad20c8d49c239720b900b40bc3e4a1bfea004eb1c40ec7e42391a231abfef972f2f54b51380f82a28e36b4 -SHA512 (swift-llbuild-swift-6.1.3-RELEASE.tar.gz) = 5b195b543e1abe482b9e9eedfe7c884dc19c36d71a62787c3e2b1ab05dd7f05fead34d322312ae0f2635dda5a71027d88ba46cd2e5136d92f5e6e284a330637b -SHA512 (swift-llvm-bindings-swift-6.1.3-RELEASE.tar.gz) = 5ed94bf212ba6386bb99751dcf9885ecf44dd498f789276ea82d259f7d069c0dbbe7ff9bc4a9ddd4afdc1c7d195591b2d3fb8ff1fc128221b37f9ffd89822edf -SHA512 (swift-lmdb-swift-6.1.3-RELEASE.tar.gz) = a5312e5d9844b90bdfacd00ee307b151c665f9335684ac7ccbb0cd99c4fed249742aecc8be957d84130d2cfde248529c32610ba005bcb169a917ccf68ced53dc +SHA512 (swift-docc-render-artifact-swift-6.2-RELEASE.tar.gz) = cf61e95767dc87a221212def3c0f84fab4ee09a3eaacd4a52763737fff4fc7651b30e527f6b798dca61ce604c0030c27af060eb6866d8014764f55a970886869 +SHA512 (swift-docc-swift-6.2-RELEASE.tar.gz) = 06df03a6ff4d7dd246120d19765dda505764dab18e90266076c50d1274beea9267d466d076454466729289f326645bf031e05f72833ee94cf9027438c865f525 +SHA512 (swift-docc-symbolkit-swift-6.2-RELEASE.tar.gz) = a0d034244638c2ae6393a047b9a90fd1545de287d6dec6637218dcb69459819e2334787c73c515cf4fe35a0e5772538fce5977c535e4a802057660a7992a3afb +SHA512 (swift-driver-swift-6.2-RELEASE.tar.gz) = 4370c443a80779838017db932cad0a20eb1a24c6eca02a44655f333a3621ae2dac502bc7f94c13371962c1c5b20814dd9129d9c9e2a0fd0eee33f90ac956fe50 +SHA512 (swift-experimental-string-processing-swift-6.2-RELEASE.tar.gz) = 9e3482abafaf4ee3209a56a9c33e9e9f0b8844975e28bfe6b31ac68e0fb14714952b4bcd5a0d44779664aaa786dd604a8a8dae0fb603e0041e23fb00e385f847 +SHA512 (swift-format-swift-6.2-RELEASE.tar.gz) = 9cdc3c68c01572592d91921fca44b8bc96b65e3d1af6651f545040b32a249021e358e38163f9ccadc04dbced41d07194fd54608a07280eed817c0debc6d9ca10 +SHA512 (swift-foundation-icu-swift-6.2-RELEASE.tar.gz) = e5484a60571a3182a9b2d12ef812c92a3f2d5e6c17c8f76ad763cac66baa5d92f7ee1dcff3a0b34931272f62ac0c7fc1a6e0849536c2e09a285a9bd5de5e3c8c +SHA512 (swift-foundation-swift-6.2-RELEASE.tar.gz) = 39efa81a52c568dc3f7db1b9608dcfd616451cbf6f9ef1b7e0314a0918efa97ff8a08f1b9b727df9a46bd3232759a22d055a22ea2b73b19a76b3efbcc59af6be +SHA512 (swift-installer-scripts-swift-6.2-RELEASE.tar.gz) = fd8eb7eeace3848aafdba4dffb6690f303f48d91b146f7a57449de743d2113dbd18b8eb7f1cab002178e9f42968ee53f7848da5414551fc9fccb7b36ea3f8522 +SHA512 (swift-integration-tests-swift-6.2-RELEASE.tar.gz) = 0c92c4cf44cdcc689bc0a52ef7b0a400c4aa885bd1ff353b4b5a87b0e53c473101be1cbe5bcd2ae3fd280017cae32a60923956ec9e15a332242f1311667b516b +SHA512 (swift-llbuild-swift-6.2-RELEASE.tar.gz) = 662836f819b278a0fc37fa5a12ac23fd478c2a163f12b389ae5f5d2fea0dc718d44d6b2a8834fa2b7134c4f2737ac060a8cb9b532819a2a75982910777a73e71 +SHA512 (swift-llvm-bindings-swift-6.2-RELEASE.tar.gz) = 09b7251143beaf86a593d9934e70b4aed93457dd1d48a7977908886ff54fc20fdc33e21accc2fce5148ee1adf6fb607011066312fced384eb551353369d5bfc2 +SHA512 (swift-lmdb-swift-6.2-RELEASE.tar.gz) = 8532eab40fd5c2368751663ce25f81baf4fb3e2cd09dcd897700a33abac48ba29a7368ed557b1535838e684a4beab5c617c9c9748155f486d20d3f128efa39ea SHA512 (swift-log-1.5.4.tar.gz) = c148f7a20072fba57226bfbc0d9e9f6bb9ebfc952e920d7f4b6a12028fa49a2f61f1f7f13e53c2421b562b83e8160e3d64da51437840b9312c77113b1484c39f -SHA512 (swift-markdown-swift-6.1.3-RELEASE.tar.gz) = d230041f0e7c1bac3c3fbd8dcb9797833c64325429ac3929ca29680a395a32c0ce416443428237207e6d17ad24c974761cb24be879463b2fb2104a75bd429c45 +SHA512 (swift-markdown-swift-6.2-RELEASE.tar.gz) = ef64f7e7e3747e7d44301ddc034d2bd869a3a6dcd6bed8a5e88495304652906bd00c4c104fd40cb73316c0bd2379d3491ba70e225d2a07b19d6232c255028fc3 SHA512 (swift-nio-2.65.0.tar.gz) = 3eb24d634c8937270b88eda8c34b7b70290b28a601228e051cd2b414003902d18d066dc82f8682835b2c788d5d2b27ac0a1f1723e16f902b1d3d321ac7807f6d SHA512 (swift-numerics-1.0.2.tar.gz) = 2d6a2c6aa21a86ece26983cbcaa366bd726e4e0c4341e4801510a0227be8856280102fd04726a91b5b335aaf7eb609b04113d6af824e904ae4c768755dd6707a -SHA512 (swift-package-manager-swift-6.1.3-RELEASE.tar.gz) = d55d0337c47cbcdf7da68eb301810f8851ce4da3eaf535e253149b147d4a36225c13c0af7656b774f498393bef2f96bb03c336611e79209a5716368567eeceeb -SHA512 (swift-sdk-generator-swift-6.1.3-RELEASE.tar.gz) = b77365e9cee9bf8680ef6f11aeda1ab9fddfcb168e0a64fac2d95ef537831483b16796a634a421fe16c770be37e5c402fd760195d2b0fecfe17386e9f1e076d7 -SHA512 (swift-stress-tester-swift-6.1.3-RELEASE.tar.gz) = 66d43e5b98d84fe83cc5c2d587f9586528c4e5ee853844f2395626725104796faccfa8d66083d3bfa9c8fa83e0b2461c67313c417a5fb262604dd8a4dba67285 -SHA512 (swift-swift-6.1.3-RELEASE.tar.gz) = 0a96840ac7390d3ea484b76ebd862a747cb15609371b9010605e1f74f1dcd9d9c3c28233a71f782e670f5b068726f91879c39f7cb801ba7836e0714ca683902d -SHA512 (swift-syntax-swift-6.1.3-RELEASE.tar.gz) = 8a79a9f636e64aa7764b2bbaa24ecbdc65ed2d3298b2af239e5bb39a4204cfef17020326c9a892082dfeaa94acc17488b02c3c10a829f39c25ee7aa58da5ee86 -SHA512 (swift-system-1.3.0.tar.gz) = 64c53b2e43e0b01135f2566e11af0f527557b64d3acb63904cc6e7ed74a4c08118c887670fd2ecc82e3036d96ed1dffd6066f37d9c660b1e65a63a1f5cee7586 -SHA512 (swift-testing-swift-6.1.3-RELEASE.tar.gz) = 0dd155b3e1224781e692e2942be73490ddf6402efb8ad6389fea78ed50b34ea9feb2e0df289c7fa1c17f3b6379b47f60ba2b320277e25a1a385f92c1699bead5 +SHA512 (swift-package-manager-swift-6.2-RELEASE.tar.gz) = 548762907ccafcd8c3def171226d7ab6c4c2356a7bff4a8cecdf6d345297f3fe2840c0801a09077dc96917d27354f23c6d878983d960f577b6c070f9c699a4d9 +SHA512 (swift-sdk-generator-swift-6.2-RELEASE.tar.gz) = 4c4a80b589ba1f54787728ae0f58fa5fc9940c516eb0776da9eaa2019dc74feecc906626ace008d785c27a25aa002067e75bc4adf6fca1f00d68b053395c561b +SHA512 (swift-stress-tester-swift-6.2-RELEASE.tar.gz) = 0c421fe85718240b1559ee53f61c756b2ff9befff94f33b1760746a004e2ed1b80fdc79c04703a5e640c3ec11f6814be5b3df4c1a511701dce629d43b5d80bd0 +SHA512 (swift-swift-6.2-RELEASE.tar.gz) = 45863a270b621200ff2ae527b70403046398667bdc01c961d41215bf8cfc6cb6b00ea5598261263a27ce0d3b69c384b4f6ea0f9ef6222c6c06242ae9f588d976 +SHA512 (swift-syntax-swift-6.2-RELEASE.tar.gz) = 6eab83b1b0c76d111c04c4bf4cc72c043549f78d6ef8cace628806343a63a1921e9521322656451b6bff96ae270610eaab94e87773c7866e1280e1d83505ecc6 +SHA512 (swift-system-1.5.0.tar.gz) = 003f6112e47c2f9c5abc79ea13bd2904cfba6b265c49028b006a8a60f754e86085a87c9ef9eeb79266511a1afcfcd95b471e8a780959b94baaf6fd18e87f25f6 +SHA512 (swift-testing-swift-6.2-RELEASE.tar.gz) = a05c40510c5d01145e47dc85bd94193dbb5f82d1ba7d6d6901bd85b8db44c5d58ba3d0bb96a08b47135b8a5a48164dba6f09addb177d4ee5c361bb32128f91da SHA512 (swift-toolchain-sqlite-1.0.1.tar.gz) = 2b2fe0287c7220505445a3143bdc8de31f4b38907025b42d016151f209ae63edc2a423f0fe9a6b78b6202392c8387e9b88ffa15c71b9c3b0ad9c5106ef16564a -SHA512 (swift-tools-support-core-swift-6.1.3-RELEASE.tar.gz) = 2e40fee992841eefb5f36d870ab9b9be244b9666d8ee6b18fb588a80cfbac1480d28a0857e89b8ec737e157e4d3193788cb1ff5765c77f34225fb64b5c7a711e -SHA512 (swift-xcode-playground-support-swift-6.1.3-RELEASE.tar.gz) = 8ae335712592a1126ddd2d772b3e733b524d539f01ea5d4baf39a7802797bd3aeb659c742f5ac93db7be42eb7662fc6b50a95f9761a713430f642c7ed8f863b4 -SHA512 (wasi-libc-wasi-sdk-22.tar.gz) = 3fcd5d6c0e09d824702165d8f1236e400b1d5e95fad14f1821d40de05340a044f0ec8a587d8478854252cc938a663aa9f854e6a5e683ef8f8349c60dc6c628ed +SHA512 (swift-tools-support-core-swift-6.2-RELEASE.tar.gz) = fe5d16beee31187d652d52cff6cff9d7a167ec738d47c9e3f43144ff6f8d4c7ed6ebce8a6db4d01aeb0892ace4ee8d12be6f9e8c3929768c323df11313771000 +SHA512 (swift-xcode-playground-support-swift-6.2-RELEASE.tar.gz) = 33775028d1335f32bb9cfef46812bfc371a2e6e33864170b1ca203cc2bd478f0c7e14e1e655603b164547aed1a5d74bb9c8e698973f7ebc5eeb1ab1eb826b666 +SHA512 (wasi-libc-wasi-sdk-24.tar.gz) = ab9322dbcd0bb151ba3f5a8b722e04d39ea5d7632d0322257c3b67e4193d0de1b0820dd4db84923e7967f24189d02dd242693ea95ad184a309eec4d27df8ba21 SHA512 (WasmKit-0.1.2.tar.gz) = ad14d710c9846b2258e01c7fb08fe7ac02cce7dc4f9335c13df872ab194d7827c2781e62bbc342cd00f04210c9165851aa4ee899e45a66ac286549e68e877a18 -SHA512 (Yams-5.0.6.tar.gz) = a529f7c3419ec353c360a2b14a9d939e85deebdd534049896347dce74e311cbe99c66565886397193ead24d5914bf266d4531d1be8f6a5a67174aa87f62e1617 SHA512 (zlib-1.3.1.tar.gz) = 8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088 diff --git a/swift-lang.spec b/swift-lang.spec index 7f17bdb..b1f03c1 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,11 +6,11 @@ %global debug_package %{nil} %undefine _auto_set_build_flags -Version: 6.1.3 +Version: 6.2 # Main swift source and version %global forgeurl0 https://github.com/swiftlang/swift -%global version0 6.1.3 +%global version0 %{version} %global tag0 swift-%{version0}-RELEASE %global subdir0 swift @@ -67,145 +67,149 @@ Version: 6.1.3 %global tag13 swift-%{version0}-RELEASE %global subdir13 swift-foundation -%global forgeurl14 https://github.com/swiftlang/swift-cmark -%global tag14 swift-%{version0}-RELEASE -%global subdir14 cmark +%global forgeurl14 https://github.com/microsoft/mimalloc +%global tag14 v3.0.1 +%global subdir14 mimalloc -%global forgeurl15 https://github.com/gnome/libxml2 -%global tag15 v2.11.5 -%global subdir15 libxml2 +%global forgeurl15 https://github.com/swiftlang/swift-cmark +%global tag15 gfm +%global subdir15 cmark -%global forgeurl16 https://github.com/swiftlang/swift-toolchain-sqlite -%global tag16 1.0.1 -%global subdir16 swift-toolchain-sqlite +%global forgeurl16 https://github.com/gnome/libxml2 +%global tag16 v2.11.5 +%global subdir16 libxml2 -%global forgeurl17 https://github.com/WebAssembly/wasi-libc -%global tag17 wasi-sdk-22 -%global subdir17 wasi-libc +%global forgeurl17 https://github.com/swiftlang/swift-toolchain-sqlite +%global tag17 1.0.1 +%global subdir17 swift-toolchain-sqlite -%global forgeurl18 https://github.com/swiftlang/swift-format -%global tag18 swift-%{version0}-RELEASE -%global subdir18 swift-format +%global forgeurl18 https://github.com/WebAssembly/wasi-libc +%global tag18 wasi-sdk-24 +%global subdir18 wasi-libc -%global forgeurl19 https://github.com/apple/swift-argument-parser -%global tag19 1.4.0 -%global subdir19 swift-argument-parser +%global forgeurl19 https://github.com/swiftlang/swift-format +%global tag19 swift-%{version0}-RELEASE +%global subdir19 swift-format -%global forgeurl20 https://github.com/swiftlang/swift-llvm-bindings -%global tag20 swift-%{version0}-RELEASE -%global subdir20 swift-llvm-bindings +%global forgeurl20 https://github.com/apple/swift-argument-parser +%global tag20 1.4.0 +%global subdir20 swift-argument-parser -%global forgeurl21 https://github.com/swiftwasm/WasmKit -%global tag21 0.1.2 -%global subdir21 wasmkit +%global forgeurl21 https://github.com/swiftlang/swift-llvm-bindings +%global tag21 swift-%{version0}-RELEASE +%global subdir21 swift-llvm-bindings -%global forgeurl22 https://github.com/swiftlang/swift-syntax -%global tag22 swift-%{version0}-RELEASE -%global subdir22 swift-syntax +%global forgeurl22 https://github.com/swiftwasm/WasmKit +%global tag22 0.1.2 +%global subdir22 wasmkit -%global forgeurl23 https://github.com/ninja-build/ninja -%global tag23 v1.11.1 -%global subdir23 ninja +%global forgeurl23 https://github.com/swiftlang/swift-syntax +%global tag23 swift-%{version0}-RELEASE +%global subdir23 swift-syntax -%global forgeurl24 https://github.com/swiftlang/swift-corelibs-libdispatch -%global tag24 swift-%{version0}-RELEASE -%global subdir24 swift-corelibs-libdispatch +%global forgeurl24 https://github.com/ninja-build/ninja +%global tag24 v1.11.1 +%global subdir24 ninja -%global forgeurl25 https://github.com/swiftlang/swift-markdown +%global forgeurl25 https://github.com/swiftlang/swift-corelibs-libdispatch %global tag25 swift-%{version0}-RELEASE -%global subdir25 swift-markdown +%global subdir25 swift-corelibs-libdispatch -%global forgeurl26 https://github.com/swiftlang/swift-foundation-icu +%global forgeurl26 https://github.com/swiftlang/swift-markdown %global tag26 swift-%{version0}-RELEASE -%global subdir26 swift-foundation-icu +%global subdir26 swift-markdown -%global forgeurl27 https://github.com/madler/zlib -%global tag27 v1.3.1 -%global subdir27 zlib +%global forgeurl27 https://github.com/swiftlang/swift-foundation-icu +%global tag27 swift-%{version0}-RELEASE +%global subdir27 swift-foundation-icu -%global forgeurl28 https://github.com/apple/swift-system -%global tag28 1.3.0 -%global subdir28 swift-system +%global forgeurl28 https://github.com/madler/zlib +%global tag28 v1.3.1 +%global subdir28 zlib -%global forgeurl29 https://github.com/apple/swift-asn1 -%global tag29 1.0.0 -%global subdir29 swift-asn1 +%global forgeurl29 https://github.com/apple/swift-system +%global tag29 1.5.0 +%global subdir29 swift-system -%global forgeurl30 https://github.com/swiftlang/swift-tools-support-core -%global tag30 swift-%{version0}-RELEASE -%global subdir30 swift-tools-support-core +%global forgeurl30 https://github.com/apple/swift-asn1 +%global tag30 1.0.0 +%global subdir30 swift-asn1 -%global forgeurl31 https://github.com/swiftlang/swift-stress-tester +%global forgeurl31 https://github.com/swiftlang/swift-tools-support-core %global tag31 swift-%{version0}-RELEASE -%global subdir31 swift-stress-tester +%global subdir31 swift-tools-support-core -%global forgeurl32 https://github.com/apple/swift-nio -%global tag32 2.65.0 -%global subdir32 swift-nio +%global forgeurl32 https://github.com/swiftlang/swift-stress-tester +%global tag32 swift-%{version0}-RELEASE +%global subdir32 swift-stress-tester -%global forgeurl33 https://github.com/swiftlang/indexstore-db -%global tag33 swift-%{version0}-RELEASE -%global subdir33 indexstore-db +%global forgeurl33 https://github.com/apple/swift-nio +%global tag33 2.65.0 +%global subdir33 swift-nio -%global forgeurl34 https://github.com/apple/swift-certificates -%global tag34 1.0.1 -%global subdir34 swift-certificates +%global forgeurl34 https://github.com/swiftlang/indexstore-db +%global tag34 swift-%{version0}-RELEASE +%global subdir34 indexstore-db -%global forgeurl35 https://github.com/swiftlang/swift-installer-scripts +%global forgeurl35 https://github.com/swiftlang/swift-build %global tag35 swift-%{version0}-RELEASE -%global subdir35 swift-installer-scripts +%global subdir35 swift-build -%global forgeurl36 https://github.com/swiftlang/swift-testing -%global tag36 swift-%{version0}-RELEASE -%global subdir36 swift-testing +%global forgeurl36 https://github.com/apple/swift-certificates +%global tag36 1.0.1 +%global subdir36 swift-certificates -%global forgeurl37 https://github.com/swiftlang/swift-docc-render-artifact +%global forgeurl37 https://github.com/swiftlang/swift-installer-scripts %global tag37 swift-%{version0}-RELEASE -%global subdir37 swift-docc-render-artifact +%global subdir37 swift-installer-scripts -%global forgeurl38 https://github.com/apple/swift-async-algorithms -%global tag38 1.0.1 -%global subdir38 swift-async-algorithms +%global forgeurl38 https://github.com/swiftlang/swift-testing +%global tag38 swift-%{version0}-RELEASE +%global subdir38 swift-testing -%global forgeurl39 https://github.com/swiftlang/swift-integration-tests +%global forgeurl39 https://github.com/swiftlang/swift-docc-render-artifact %global tag39 swift-%{version0}-RELEASE -%global subdir39 swift-integration-tests +%global subdir39 swift-docc-render-artifact -%global forgeurl40 https://github.com/apple/swift-crypto -%global tag40 3.0.0 -%global subdir40 swift-crypto +%global forgeurl40 https://github.com/apple/swift-async-algorithms +%global tag40 1.0.1 +%global subdir40 swift-async-algorithms -%global forgeurl41 https://github.com/swiftlang/swift-sdk-generator +%global forgeurl41 https://github.com/swiftlang/swift-integration-tests %global tag41 swift-%{version0}-RELEASE -%global subdir41 swift-sdk-generator +%global subdir41 swift-integration-tests -%global forgeurl42 https://github.com/swiftlang/llvm-project -%global tag42 swift-%{version0}-RELEASE -%global subdir42 llvm-project +%global forgeurl42 https://github.com/apple/swift-crypto +%global tag42 3.0.0 +%global subdir42 swift-crypto -%global forgeurl43 https://github.com/jpsim/Yams -%global tag43 5.0.6 -%global subdir43 yams +%global forgeurl43 https://github.com/swiftlang/swift-sdk-generator +%global tag43 swift-%{version0}-RELEASE +%global subdir43 swift-sdk-generator -%global forgeurl44 https://github.com/curl/curl -%global tag44 curl-8_9_1 -%global subdir44 curl +%global forgeurl44 https://github.com/swiftlang/llvm-project +%global tag44 swift-%{version0}-RELEASE +%global subdir44 llvm-project -%global forgeurl45 https://github.com/apple/swift-xcode-playground-support -%global tag45 swift-%{version0}-RELEASE -%global subdir45 swift-xcode-playground-support +%global forgeurl45 https://github.com/curl/curl +%global tag45 curl-8_9_1 +%global subdir45 curl -%global forgeurl46 https://github.com/swiftlang/swift-experimental-string-processing +%global forgeurl46 https://github.com/apple/swift-xcode-playground-support %global tag46 swift-%{version0}-RELEASE -%global subdir46 swift-experimental-string-processing +%global subdir46 swift-xcode-playground-support -%global forgeurl47 https://github.com/apple/swift-numerics -%global tag47 1.0.2 -%global subdir47 swift-numerics +%global forgeurl47 https://github.com/swiftlang/swift-experimental-string-processing +%global tag47 swift-%{version0}-RELEASE +%global subdir47 swift-experimental-string-processing -%global forgeurl48 https://github.com/swiftlang/swift-docc -%global tag48 swift-%{version0}-RELEASE -%global subdir48 swift-docc +%global forgeurl48 https://github.com/apple/swift-numerics +%global tag48 1.0.2 +%global subdir48 swift-numerics + +%global forgeurl49 https://github.com/swiftlang/swift-docc +%global tag49 swift-%{version0}-RELEASE +%global subdir49 swift-docc # End forge sources @@ -218,7 +222,7 @@ License: Apache-2.0 URL: https://www.swift.org %{lua: -for i = 0, 48 do +for i = 0, 49 do local forgesource = rpm.expand("%{?forgesource" .. i .. "}") if forgesource ~= "" then print("Source" .. i .. ": " .. forgesource .. "\n") @@ -230,13 +234,13 @@ Source99: swiftlang.conf # NOTE: The patch number corresponds to the source it's packaging. For example, # Patch25 is patching Source25, swift-foundation. Patch0: swift.patch -Patch42: llvm-project.patch -Patch14: cmark.patch +Patch44: llvm-project.patch +Patch15: cmark.patch Patch5: llbuild.patch Patch7: swiftpm.patch Patch13: swift-foundation.patch -Patch24: swift-corelibs-libdispatch.patch -Patch23: ninja.patch +Patch25: swift-corelibs-libdispatch.patch +Patch24: ninja.patch Patch9: cmake.patch BuildRequires: clang @@ -299,7 +303,7 @@ correct programs easier for the developer. %forgesetup -a cd %{builddir} %{lua: -for i = 0, 48 do +for i = 0, 49 do local subdir = rpm.expand("%{?subdir" .. i .. "}") if subdir ~= "" then print(rpm.expand("mv %{archivename" .. i .. "} " .. subdir .. "\n")) @@ -308,13 +312,13 @@ end } %patch 0 -%patch 42 -%patch 14 +%patch 44 +%patch 15 %patch 5 %patch 7 %patch 13 +%patch 25 %patch 24 -%patch 23 %patch 9 # Fix python to python3 diff --git a/swift.patch b/swift.patch index c63647d..8b08445 100644 --- a/swift.patch +++ b/swift.patch @@ -1,16 +1,15 @@ -diff --git swift.orig/lib/Sema/CodeSynthesisDistributedActor.cpp swift/lib/Sema/CodeSynthesisDistributedActor.cpp -index ba143935192..3e4686eff93 100644 ---- swift.orig/lib/Sema/CodeSynthesisDistributedActor.cpp -+++ swift/lib/Sema/CodeSynthesisDistributedActor.cpp -@@ -859,7 +859,7 @@ void swift::assertRequiredSynthesizedPropertyOrder(ASTContext &Context, - } - if (idIdx + actorSystemIdx + unownedExecutorIdx >= 0 + 1 + 2) { - // we have found all the necessary fields, let's assert their order -- assert(idIdx < actorSystemIdx < unownedExecutorIdx && -+ assert(idIdx < actorSystemIdx && actorSystemIdx < unownedExecutorIdx && - "order of fields MUST be exact."); - } - } +diff --git swift.orig/include/swift/AST/FunctionRefInfo.h swift/include/swift/AST/FunctionRefInfo.h +index a298f08e8c2..75d3f18c222 100644 +--- swift.orig/include/swift/AST/FunctionRefInfo.h ++++ swift/include/swift/AST/FunctionRefInfo.h +@@ -18,6 +18,7 @@ + #ifndef SWIFT_AST_FUNCTION_REF_INFO_H + #define SWIFT_AST_FUNCTION_REF_INFO_H + ++#include + #include "swift/Basic/Debug.h" + #include "swift/Basic/LLVM.h" + diff --git swift.orig/stdlib/include/llvm/ADT/SmallVector.h swift/stdlib/include/llvm/ADT/SmallVector.h index 56b9e606302..ca651fc8845 100644 --- swift.orig/stdlib/include/llvm/ADT/SmallVector.h @@ -24,10 +23,10 @@ index 56b9e606302..ca651fc8845 100644 #include #include diff --git swift.orig/utils/build-presets.ini swift/utils/build-presets.ini -index 14b9a7006d2..511def20a6f 100644 +index 75043cb69a7..25aec6bc29a 100644 --- swift.orig/utils/build-presets.ini +++ swift/utils/build-presets.ini -@@ -876,7 +876,7 @@ build-wasm-stdlib +@@ -886,7 +886,7 @@ build-wasm-stdlib # Executes the lit tests for the installable package that is created # Assumes the swift-integration-tests repo is checked out @@ -37,10 +36,10 @@ index 14b9a7006d2..511def20a6f 100644 # Build the benchmarks against the toolchain. toolchain-benchmarks diff --git swift.orig/utils/build-script-impl swift/utils/build-script-impl -index 581c68b9685..4f6a69bb484 100755 +index 3140c8bb545..32a0b502ae6 100755 --- swift.orig/utils/build-script-impl +++ swift/utils/build-script-impl -@@ -2242,7 +2242,7 @@ for host in "${ALL_HOSTS[@]}"; do +@@ -2179,7 +2179,7 @@ for host in "${ALL_HOSTS[@]}"; do -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON From de7b8463a3c34c4ca48edd7ae9a3eaecc90b44f3 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sat, 27 Sep 2025 17:06:33 +0000 Subject: [PATCH 147/152] Fix libdir symlink installation --- swift-lang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index b1f03c1..c028c1d 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -349,7 +349,7 @@ ln -fs %{_libexecdir}/swift/%{version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 mkdir -p %{buildroot}/usr/lib -ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift +ln -fs %{_libexecdir}/swift/%{version}/lib/swift %{buildroot}/usr/lib/swift mkdir -p %{buildroot}%{_libdir} ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so %{buildroot}%{_libdir}/ ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so.17 %{buildroot}%{_libdir}/ From bd2c738a6db5e30f6f78b65a846ecdc66a407ac4 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sat, 27 Sep 2025 17:07:09 +0000 Subject: [PATCH 148/152] Install standalone SwiftDemangle headers --- swift-lang.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/swift-lang.spec b/swift-lang.spec index c028c1d..66b942a 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -355,6 +355,8 @@ ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so %{buildroot}%{_libdi ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so.17 %{buildroot}%{_libdir}/ ln -fs %{_libexecdir}/swift/%{version}/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/ ln -fs %{_libexecdir}/swift/%{version}/lib/libswiftDemangle.so %{buildroot}%{_libdir}/ +mkdir -p %{buildroot}%{_includedir}/swift +cp -r %{_builddir}/swift/include/swift/SwiftDemangle %{buildroot}%{_includedir}/swift/ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/ install -m 0644 %{SOURCE99} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swiftlang.conf @@ -377,6 +379,7 @@ export QA_SKIP_RPATHS=1 %{_libdir}/libIndexStore.so* %{_libdir}/libsourcekitdInProc.so %{_libdir}/libswiftDemangle.so +%{_includedir}/swift/ %{_sysconfdir}/ld.so.conf.d/swiftlang.conf From 5dad138abada4c9d8ed85bd7661047ea959a60d5 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Thu, 11 Dec 2025 20:07:12 +0000 Subject: [PATCH 149/152] Temporary workaround to bootstrap the compiler with the broken symlink --- swift-lang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swift-lang.spec b/swift-lang.spec index 66b942a..4e2bc66 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -330,6 +330,8 @@ sed -i 's/swift-tools-version:999.0.0/swift-tools-version:6.1.3/' wasmkit/Packag %global buildsubdir %{nil} %build +# Work around broken symlink in BuildRequires swiftlang by ensuring PATH finds the versioned swift +export PATH=%{_libexecdir}/swift/%{version}/bin:$PATH export VERBOSE=1 %{builddir}/swift/utils/build-script --preset=buildbot_linux,no_test \ skip-early-swiftsyntax=true \ From bd48589fa3bcea5afd984c3133481e1aab931629 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Thu, 11 Dec 2025 20:07:12 +0000 Subject: [PATCH 150/152] Refactor build procedure to entirely self-contained, multi-stage bootstrapping (RHBZ#2390031) --- fedora-presets.ini | 64 ++++++++++++++++++++++++++++++++++++++++++++++ swift-lang.spec | 60 +++++++++++++++++++++++++++++++++++++------ swift.patch | 13 ---------- 3 files changed, 116 insertions(+), 21 deletions(-) create mode 100644 fedora-presets.ini diff --git a/fedora-presets.ini b/fedora-presets.ini new file mode 100644 index 0000000..ccde876 --- /dev/null +++ b/fedora-presets.ini @@ -0,0 +1,64 @@ +# Custom preset for Fedora packaging +# This preset builds the final production toolchain including swift-driver +# using the bootstrapped Swift compiler from bootstrap_stage2 + +[preset: fedora_final] +bootstrapping=hosttools + +# Skip all tests (inlined from mixin_buildbot_linux,no_test) +skip-test-cmark +skip-test-lldb +skip-test-swift +skip-test-llbuild +skip-test-swiftpm +skip-test-swift-driver +skip-test-xctest +skip-test-foundation +skip-test-libdispatch +skip-test-playgroundsupport +skip-test-indexstore-db +skip-test-sourcekit-lsp +skip-test-swiftdocc +skip-test-wasm-stdlib +skip-test-swiftformat + +release + +# Build additional components for production toolchain +llbuild +xctest +swift-testing +swift-testing-macros +swiftpm +swift-driver +indexstore-db +sourcekit-lsp +swiftformat + +swift-include-tests=0 +llvm-include-tests=0 + +foundation +libdispatch + +skip-build-benchmarks + +build-subdir=%(build_subdir)s +install-destdir=%(install_destdir)s + +swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools;license +llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;lld + +install-llvm +install-swift +install-foundation +install-libdispatch +install-llbuild +install-swiftpm +install-swift-driver +install-swiftsyntax +install-swift-testing +install-swift-testing-macros +install-xctest +install-sourcekit-lsp +install-swiftformat diff --git a/swift-lang.spec b/swift-lang.spec index 4e2bc66..cdc6227 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -230,6 +230,7 @@ for i = 0, 49 do end } Source99: swiftlang.conf +Source100: fedora-presets.ini # NOTE: The patch number corresponds to the source it's packaging. For example, # Patch25 is patching Source25, swift-foundation. @@ -255,11 +256,11 @@ BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: perl-podlators -BuildRequires: swiftlang BuildRequires: lld +BuildRequires: binutils-gold Requires: glibc-devel -Requires: binutils-gold +Requires: lld Requires: gcc Recommends: libstdc++-devel @@ -315,12 +316,15 @@ end %patch 44 %patch 15 %patch 5 -%patch 7 +%patch 7 %patch 13 %patch 25 %patch 24 %patch 9 +# Install custom Fedora preset +cp %{SOURCE100} swift/utils/fedora-presets.ini + # Fix python to python3 %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize @@ -330,13 +334,53 @@ sed -i 's/swift-tools-version:999.0.0/swift-tools-version:6.1.3/' wasmkit/Packag %global buildsubdir %{nil} %build -# Work around broken symlink in BuildRequires swiftlang by ensuring PATH finds the versioned swift -export PATH=%{_libexecdir}/swift/%{version}/bin:$PATH export VERBOSE=1 -%{builddir}/swift/utils/build-script --preset=buildbot_linux,no_test \ - skip-early-swiftsyntax=true \ + +# Four-stage bootstrap to build Swift from scratch without external Swift compiler +# Stage 0: Build minimal Swift toolchain from C++ using gold linker +# Produces: Swift compiler with C++ legacy driver (no SwiftPM, no swift-driver) +# Stage 0 clang defaults to gold +# Stage 1: Rebuild Swift compiler using Stage 0 with gold linker +# Produces: Swift compiler with macros support + Foundation + Dispatch +# Stage 1 clang is compiled with lld as its default linker +# Stage 2: Build Swift compiler using Stage 1 with lld linker +# Produces: Swift compiler + SwiftPM + basic tools (still no swift-driver) +# Stage 2 clang defaults to lld +# Stage 3: Build final production toolchain using Stage 2 +# Produces: Complete toolchain with swift-driver, sourcekit-lsp, swift-format, etc. +# This matches upstream first-party distributions + +echo "=== Bootstrap Stage 0: Building minimal Swift from C++ ===" +%{builddir}/swift/utils/build-script --preset=bootstrap_stage0 \ + build_subdir=bootstrap_stage0 \ + install_destdir=%{_builddir}/stage0 \ + installable_package=%{_builddir}/swift-%{version}-stage0.tar.gz \ + extra-cmake-options="-DLLVM_USE_LINKER=gold -DCLANG_DEFAULT_LINKER=gold" + +echo "=== Bootstrap Stage 1: Rebuilding Swift with Stage 0 ===" +export PATH=%{_builddir}/stage0/usr/bin:$PATH +%{builddir}/swift/utils/build-script --preset=bootstrap_stage1 \ + build_subdir=bootstrap_stage1 \ + install_destdir=%{_builddir}/stage1 \ + installable_package=%{_builddir}/swift-%{version}-stage1.tar.gz \ + extra-cmake-options="-DLLVM_USE_LINKER=gold -DCLANG_DEFAULT_LINKER=lld" + +echo "=== Bootstrap Stage 2: Building toolchain with SwiftPM ===" +export PATH=%{_builddir}/stage1/usr/bin:%{_builddir}/stage0/usr/bin:$PATH +%{builddir}/swift/utils/build-script --preset=bootstrap_stage2 \ + build_subdir=bootstrap_stage2 \ + install_destdir=%{_builddir}/stage2 \ + installable_package=%{_builddir}/swift-%{version}-stage2.tar.gz \ + extra-cmake-options="-DLLVM_USE_LINKER=lld -DCLANG_DEFAULT_LINKER=lld" + +echo "=== Stage 3: Building final production toolchain with swift-driver ===" +export PATH=%{_builddir}/stage2/usr/bin:%{_builddir}/stage1/usr/bin:%{_builddir}/stage0/usr/bin:$PATH +%{builddir}/swift/utils/build-script --preset=fedora_final \ + --preset-file=%{builddir}/swift/utils/fedora-presets.ini \ + build_subdir=fedora_final \ install_destdir=%{_builddir} \ - installable_package=%{_builddir}/swift-%{version}-f%{fedora}.tar.gz + installable_package=%{_builddir}/swift-%{version}-f%{fedora}.tar.gz \ + extra-cmake-options="-DLLVM_USE_LINKER=lld -DCLANG_DEFAULT_LINKER=lld -DCMAKE_EXE_LINKER_FLAGS=-Wl,-z,relro,-z,now -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,relro,-z,now" %install diff --git a/swift.patch b/swift.patch index 8b08445..32f5786 100644 --- a/swift.patch +++ b/swift.patch @@ -22,19 +22,6 @@ index 56b9e606302..ca651fc8845 100644 #include #include #include -diff --git swift.orig/utils/build-presets.ini swift/utils/build-presets.ini -index 75043cb69a7..25aec6bc29a 100644 ---- swift.orig/utils/build-presets.ini -+++ swift/utils/build-presets.ini -@@ -886,7 +886,7 @@ build-wasm-stdlib - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out - --test-installable-package -+# test-installable-package - - # Build the benchmarks against the toolchain. - toolchain-benchmarks diff --git swift.orig/utils/build-script-impl swift/utils/build-script-impl index 3140c8bb545..32a0b502ae6 100755 --- swift.orig/utils/build-script-impl From d4994e13a0315b4800658efa493f7b9fa8ec6ee8 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Sat, 3 Jan 2026 16:04:15 +0000 Subject: [PATCH 151/152] Install libIndexStore.so --- fedora-presets.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-presets.ini b/fedora-presets.ini index ccde876..9f74408 100644 --- a/fedora-presets.ini +++ b/fedora-presets.ini @@ -47,7 +47,7 @@ build-subdir=%(build_subdir)s install-destdir=%(install_destdir)s swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools;license -llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;lld +llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;lld;IndexStore install-llvm install-swift From f87d8e8579bdd4c97e254b86e0aafa08abe08ad1 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Tue, 6 Jan 2026 13:50:41 +0000 Subject: [PATCH 152/152] Install versioned libIndexStore.so --- swift-lang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift-lang.spec b/swift-lang.spec index cdc6227..3528d77 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -398,7 +398,7 @@ mkdir -p %{buildroot}/usr/lib ln -fs %{_libexecdir}/swift/%{version}/lib/swift %{buildroot}/usr/lib/swift mkdir -p %{buildroot}%{_libdir} ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so %{buildroot}%{_libdir}/ -ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so.17 %{buildroot}%{_libdir}/ +ln -fs %{_libexecdir}/swift/%{version}/lib/libIndexStore.so.17.0 %{buildroot}%{_libdir}/ ln -fs %{_libexecdir}/swift/%{version}/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/ ln -fs %{_libexecdir}/swift/%{version}/lib/libswiftDemangle.so %{buildroot}%{_libdir}/ mkdir -p %{buildroot}%{_includedir}/swift