diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-07-25 11:45:10 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-07-25 11:45:10 -0500 |
| commit | d277598d3642280125a3332406d458c9239844a6 (patch) | |
| tree | 30ff1babbdcb1db240c34cfa5e05648150b50873 | |
| parent | ae44f06f48d79306eb74d5372ae352c66543a2fa (diff) | |
| download | swift-lang-d277598d3642280125a3332406d458c9239844a6.tar.gz swift-lang-d277598d3642280125a3332406d458c9239844a6.tar.xz swift-lang-d277598d3642280125a3332406d458c9239844a6.zip | |
Removed lldb patches as the code was pushed to the 4.2 branch
| -rw-r--r-- | lldb-paths-1.patch | 14 | ||||
| -rw-r--r-- | lldb-paths-2.patch | 11 | ||||
| -rw-r--r-- | swift-lang.spec | 8 |
3 files changed, 2 insertions, 31 deletions
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<std::string> &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 1c19810..9307099 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -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 @@ -207,7 +202,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog * Wed Jul 25 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.41.20180724git18650bc -- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a +- 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 <tachoknight@gmail.com> 4.2-0.40.20180723git18650bc - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-23-a * Mon Jul 23 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.39.20180722git18650bc |