The package rpms/swift-lang.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/swift-lang.git/commit/?id=5e271f76c9... https://src.fedoraproject.org/cgit/rpms/swift-lang.git/commit/?id=14e5d690d4....

Change: -%ifarch aarch64 +%ifarch aarch64

Thanks.

Full change: ============

commit 2810d0238fbb2736f6c067014fac76eacd1a866f Author: Ron Olson tachoknight@gmail.com Date: Sat Jun 29 08:18:10 2024 -0500

Added LZMA

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 tachoknight@gmail.com - 5.10.1-3 +- Enable LZMA * Mon Jun 24 2024 Python Maint python-maint@redhat.com - 5.10.1-2.1 - Rebuilt for Python 3.13 - * Sat Jun 22 2024 Ron Olson tachoknight@gmail.com - 5.10.1-2 - Changes for Fedora >= 41 and Python 3.13 * Thu Jun 06 2024 Ron Olson tachoknight@gmail.com - 5.10.1-1

commit ea5d20dd8e00ea0ecb889b50278491dcb38f0aae Author: Python Maint python-maint@redhat.com Date: Mon Jun 24 17:31:59 2024 +0200

Rebuilt for Python 3.13

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 python-maint@redhat.com - 5.10.1-2.1 +- Rebuilt for Python 3.13 + * Sat Jun 22 2024 Ron Olson tachoknight@gmail.com - 5.10.1-2 - Changes for Fedora >= 41 and Python 3.13 * Thu Jun 06 2024 Ron Olson tachoknight@gmail.com - 5.10.1-1

commit 5e271f76c9e53c9934f9daea548808ce547a241f Author: Ron Olson tachoknight@gmail.com Date: Mon Jun 24 07:21:05 2024 -0500

Added patches to allow Swift to build with >= 41 and Python 3.13

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-%%7Bswift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%%7Bswift_ve... Source13: https://github.com/apple/swift-argument-parser/archive/%%7Bswift_argument_pa... Source14: https://github.com/apple/swift-driver/archive/swift-%%7Bswift_version%7D.tar... -Source15: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz... -Source16: https://github.com/apple/swift-syntax/archive/swift-%%7Bswift_version%7D.zip... -Source17: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.tar.gz#/yams.tar.g... -Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%%7Bswift_crypto_ver... -Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%%7Bninja_version%7D... -Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%%7Bcmake_version%7D.tar... -Source21: https://github.com/apple/swift-atomics/archive/%%7Bswift_atomics_version%7D.... -Source22: https://github.com/apple/swift-stress-tester/archive/swift-%%7Bswift_version... -Source23: https://github.com/apple/swift-docc/archive/swift-%%7Bswift_version%7D.tar.g... -Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%%7Bswift_... -Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%%7Bswift_versio... -Source26: https://github.com/apple/swift-collections/archive/%%7Bswift_collections_ver... -Source27: https://github.com/apple/swift-numerics/archive/%%7Bswift_numerics_version%7... -Source28: https://github.com/apple/swift-system/archive/%%7Bswift_system_version%7D.ta... -Source29: https://github.com/apple/swift-nio/archive/%%7Bswift_nio_version%7D.tar.gz#/... -Source30: https://github.com/apple/swift-nio-ssl/archive/%%7Bswift_nio_ssl_version%7D.... -%dnl Source31: https://github.com/apple/swift-format/archive/swift-%%7Bswift_version%7D.tar... -Source31: https://github.com/apple/swift-format/archive/refs/tags/%%7Bswift_format_ver... -Source32: https://github.com/apple/swift-lmdb/archive/swift-%%7Bswift_version%7D.tar.g... -Source33: https://github.com/apple/swift-markdown/archive/swift-%%7Bswift_version%7D.t... -Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-... +Source15: https://github.com/apple/swift-syntax/archive/swift-%%7Bswift_version%7D.zip... +Source16: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.tar.gz#/yams.tar.g... +Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%%7Bswift_crypto_ver... +Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%%7Bninja_version%7D... +Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%%7Bcmake_version%7D.tar... +Source20: https://github.com/apple/swift-atomics/archive/%%7Bswift_atomics_version%7D.... +Source21: https://github.com/apple/swift-stress-tester/archive/swift-%%7Bswift_version... +Source22: https://github.com/apple/swift-docc/archive/swift-%%7Bswift_version%7D.tar.g... +Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%%7Bswift_... +Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%%7Bswift_versio... +Source25: https://github.com/apple/swift-collections/archive/%%7Bswift_collections_ver... +Source26: https://github.com/apple/swift-numerics/archive/%%7Bswift_numerics_version%7... +Source27: https://github.com/apple/swift-system/archive/%%7Bswift_system_version%7D.ta... +Source28: https://github.com/apple/swift-nio/archive/%%7Bswift_nio_version%7D.tar.gz#/... +Source29: https://github.com/apple/swift-nio-ssl/archive/%%7Bswift_nio_ssl_version%7D.... +%dnl Source30: https://github.com/apple/swift-format/archive/swift-%%7Bswift_version%7D.tar... +Source30: https://github.com/apple/swift-format/archive/refs/tags/%%7Bswift_format_ver... +Source31: https://github.com/apple/swift-lmdb/archive/swift-%%7Bswift_version%7D.tar.g... +Source32: https://github.com/apple/swift-markdown/archive/swift-%%7Bswift_version%7D.t... +Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-... %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%%7Bswift_version... +Source34: https://github.com/apple/swift-certificates/archive/%%7Bswift_certificates_v... +Source35: https://github.com/apple/swift-asn1/archive/%%7Bswift_asn1_version%7D.tar.gz... +Source36: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz... +Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%%7Bwasmkit_version%7... +Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%%7Bwasi... +

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 tachoknight@gmail.com 5.8.1-5 -- Added another patch -* Thu Jun 20 2024 Ron Olson tachoknight@gmail.com 5.8.1-4 -- Added patch to build without pipes on Rawhide and Fedora 41 -* Fri Feb 16 2024 Ron Olson tachoknight@gmail.com 5.8.1-3 -- Added symlink for future versions of Swift -* Tue Aug 22 2023 Ron Olson tachoknight@gmail.com 5.8.1-2 -- Added patch to work with glibc 2.38 - Resolves: rhbz#2226476 - -* Sat Jul 22 2023 Fedora Release Engineering releng@fedoraproject.org - 5.8.1-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint python-maint@redhat.com - 5.8.1-1.1 -- Rebuilt for Python 3.12 - -* Fri Jun 02 2023 Ron Olson tachoknight@gmail.com - 5.8.1-1 -- Updated to Swift 5.8.1-RELEASE - Resolves: rhbz#2211845 -* Fri Mar 31 2023 Ron Olson tachoknight@gmail.com - 5.8-1 -- Updated to Swift 5.8-RELEASE - Resolves: rhbz#2183429 +* Sat Jun 22 2024 Ron Olson tachoknight@gmail.com - 5.10.1-2 +- Changes for Fedora >= 41 and Python 3.13 +* Thu Jun 06 2024 Ron Olson tachoknight@gmail.com - 5.10.1-1 +- Updated to Swift 5.10.1-RELEASE + Resolves: rhbz#2239543 +* Tue Apr 23 2024 Ron Olson tachoknight@gmail.com - 6.0-1 +- First attempt at getting 6.0 working +* Mon Sep 18 2023 Ron Olson tachoknight@gmail.com - 5.9-1 +- Updated to Swift 5.9-RELEASE + Resolves: rhbz#2239543 +* Fri Sep 15 2023 Ron Olson tachoknight@gmail.com - 5.10-1 +- First working version of Swift 5.10 +* Wed Mar 29 2023 Ron Olson tachoknight@gmail.com - 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 releng@fedoraproject.org - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson tachoknight@gmail.com - 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,

commit 0bcf790b6933cc60a4a623d47f609d982129397d Author: Ron Olson tachoknight@gmail.com Date: Fri Jun 21 21:18:39 2024 -0500

Additional fix for Python 3.13

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 tachoknight@gmail.com 5.8.1-5 +- Added another patch * Thu Jun 20 2024 Ron Olson tachoknight@gmail.com 5.8.1-4 - Added patch to build without pipes on Rawhide and Fedora 41 * Fri Feb 16 2024 Ron Olson tachoknight@gmail.com 5.8.1-3

commit f5f35a0448111b2765b32c5d88c2ebcd4c2621de Author: Ron Olson tachoknight@gmail.com Date: Thu Jun 20 14:28:49 2024 -0500

Updated build version

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 tachoknight@gmail.com 5.8.1-4 +- Added patch to build without pipes on Rawhide and Fedora 41 * Fri Feb 16 2024 Ron Olson tachoknight@gmail.com 5.8.1-3 - Added symlink for future versions of Swift * Tue Aug 22 2023 Ron Olson tachoknight@gmail.com 5.8.1-2

commit 14e5d690d4d42b56378e0130496d0c9fb320cf08 Author: Ron Olson tachoknight@gmail.com Date: Thu Jun 20 14:13:18 2024 -0500

Updated Swift 5.8 to build on Rawhide (no pipes support in python)

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-%%7Bswift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%%7Bswift_ve... Source13: https://github.com/apple/swift-argument-parser/archive/%%7Bswift_argument_pa... Source14: https://github.com/apple/swift-driver/archive/swift-%%7Bswift_version%7D.tar... -Source15: https://github.com/apple/swift-syntax/archive/swift-%%7Bswift_version%7D.zip... -Source16: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.tar.gz#/yams.tar.g... -Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%%7Bswift_crypto_ver... -Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%%7Bninja_version%7D... -Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%%7Bcmake_version%7D.tar... -Source20: https://github.com/apple/swift-atomics/archive/%%7Bswift_atomics_version%7D.... -Source21: https://github.com/apple/swift-stress-tester/archive/swift-%%7Bswift_version... -Source22: https://github.com/apple/swift-docc/archive/swift-%%7Bswift_version%7D.tar.g... -Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%%7Bswift_... -Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%%7Bswift_versio... -Source25: https://github.com/apple/swift-collections/archive/%%7Bswift_collections_ver... -Source26: https://github.com/apple/swift-numerics/archive/%%7Bswift_numerics_version%7... -Source27: https://github.com/apple/swift-system/archive/%%7Bswift_system_version%7D.ta... -Source28: https://github.com/apple/swift-nio/archive/%%7Bswift_nio_version%7D.tar.gz#/... -Source29: https://github.com/apple/swift-nio-ssl/archive/%%7Bswift_nio_ssl_version%7D.... -%dnl Source30: https://github.com/apple/swift-format/archive/swift-%%7Bswift_version%7D.tar... -Source30: https://github.com/apple/swift-format/archive/refs/tags/%%7Bswift_format_ver... -Source31: https://github.com/apple/swift-lmdb/archive/swift-%%7Bswift_version%7D.tar.g... -Source32: https://github.com/apple/swift-markdown/archive/swift-%%7Bswift_version%7D.t... -Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-... +Source15: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz... +Source16: https://github.com/apple/swift-syntax/archive/swift-%%7Bswift_version%7D.zip... +Source17: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.tar.gz#/yams.tar.g... +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%%7Bswift_crypto_ver... +Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%%7Bninja_version%7D... +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%%7Bcmake_version%7D.tar... +Source21: https://github.com/apple/swift-atomics/archive/%%7Bswift_atomics_version%7D.... +Source22: https://github.com/apple/swift-stress-tester/archive/swift-%%7Bswift_version... +Source23: https://github.com/apple/swift-docc/archive/swift-%%7Bswift_version%7D.tar.g... +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%%7Bswift_... +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%%7Bswift_versio... +Source26: https://github.com/apple/swift-collections/archive/%%7Bswift_collections_ver... +Source27: https://github.com/apple/swift-numerics/archive/%%7Bswift_numerics_version%7... +Source28: https://github.com/apple/swift-system/archive/%%7Bswift_system_version%7D.ta... +Source29: https://github.com/apple/swift-nio/archive/%%7Bswift_nio_version%7D.tar.gz#/... +Source30: https://github.com/apple/swift-nio-ssl/archive/%%7Bswift_nio_ssl_version%7D.... +%dnl Source31: https://github.com/apple/swift-format/archive/swift-%%7Bswift_version%7D.tar... +Source31: https://github.com/apple/swift-format/archive/refs/tags/%%7Bswift_format_ver... +Source32: https://github.com/apple/swift-lmdb/archive/swift-%%7Bswift_version%7D.tar.g... +Source33: https://github.com/apple/swift-markdown/archive/swift-%%7Bswift_version%7D.t... +Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-... %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%%7Bswift_version... -Source34: https://github.com/apple/swift-certificates/archive/%%7Bswift_certificates_v... -Source35: https://github.com/apple/swift-asn1/archive/%%7Bswift_asn1_version%7D.tar.gz... -Source36: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz... -Source37: https://github.com/swiftwasm/WasmKit/archive/refs/tags/%%7Bwasmkit_version%7... -Source38: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%%7Bwasi... - - -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

+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 + + +%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 tachoknight@gmail.com - 5.10.1-1 -- Updated to Swift 5.10.1-RELEASE - Resolves: rhbz#2239543 -* Tue Apr 23 2024 Ron Olson tachoknight@gmail.com - 6.0-1 -- First attempt at getting 6.0 working -* Mon Sep 18 2023 Ron Olson tachoknight@gmail.com - 5.9-1 -- Updated to Swift 5.9-RELEASE - Resolves: rhbz#2239543 -* Fri Sep 15 2023 Ron Olson tachoknight@gmail.com - 5.10-1 -- First working version of Swift 5.10 -* Wed Mar 29 2023 Ron Olson tachoknight@gmail.com - 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 tachoknight@gmail.com 5.8.1-3 +- Added symlink for future versions of Swift +* Tue Aug 22 2023 Ron Olson tachoknight@gmail.com 5.8.1-2 +- Added patch to work with glibc 2.38 + Resolves: rhbz#2226476 + +* Sat Jul 22 2023 Fedora Release Engineering releng@fedoraproject.org - 5.8.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint python-maint@redhat.com - 5.8.1-1.1 +- Rebuilt for Python 3.12 + +* Fri Jun 02 2023 Ron Olson tachoknight@gmail.com - 5.8.1-1 +- Updated to Swift 5.8.1-RELEASE + Resolves: rhbz#2211845 +* Fri Mar 31 2023 Ron Olson tachoknight@gmail.com - 5.8-1 +- Updated to Swift 5.8-RELEASE + Resolves: rhbz#2183429 * Sat Jan 21 2023 Fedora Release Engineering releng@fedoraproject.org - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson tachoknight@gmail.com - 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,