diff options
| author | Ron Olson <tachoknight@gmail.com> | 2019-03-22 20:23:33 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2019-03-22 20:23:33 -0500 |
| commit | 5b78be18c4b8f01a22b2063db33fe79284db60a8 (patch) | |
| tree | ede64ecc5360cd74b56aa91cecd30ce64d899c04 | |
| parent | a4bb6c5060b2a23dba16fe2af378f82dafc47b95 (diff) | |
| download | swift-lang-5b78be18c4b8f01a22b2063db33fe79284db60a8.tar.gz swift-lang-5b78be18c4b8f01a22b2063db33fe79284db60a8.tar.xz swift-lang-5b78be18c4b8f01a22b2063db33fe79284db60a8.zip | |
Added patch to disable inplace copy via CMake due to bug in CMake 3.14
| -rw-r--r-- | no-inplace-copy.patch | 15 | ||||
| -rw-r--r-- | swift-lang.spec | 10 |
2 files changed, 25 insertions, 0 deletions
diff --git a/no-inplace-copy.patch b/no-inplace-copy.patch new file mode 100644 index 0000000..585293b --- /dev/null +++ b/no-inplace-copy.patch @@ -0,0 +1,15 @@ +--- swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake.orig 2019-03-22 13:10:16.930540857 -0500 ++++ swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake 2019-03-22 15:48:46.960621151 -0500 +@@ -139,12 +139,6 @@ + ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources + COMMAND + ${CMAKE_COMMAND} -E copy ${AST_RESOURCES} ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources) +- else() +- add_custom_command(TARGET +- ${target} +- POST_BUILD +- COMMAND +- ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}) + endif() + endfunction() + diff --git a/swift-lang.spec b/swift-lang.spec index 1ba511e..d906443 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -32,6 +32,7 @@ Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: gettid.patch Patch5: swift-unwrapped.patch +Patch6: no-inplace-copy.patch BuildRequires: clang BuildRequires: cmake @@ -131,6 +132,10 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # in the package mananger %patch5 -p0 +# Patch to handle library being copied to same directory; CMake 3.14 zeros +# out the file +%patch6 -p0 + %build export VERBOSE=1 @@ -232,6 +237,11 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Mar 22 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741 +- The swift-corelibs-xctest library was being zeroed out due to issue with + CMake 3.14 where it was being copied into the same directory. A bug + report has been filed with CMake but until it's resolved, the cmake file + has been patched to not perform the copy. * Fri Mar 15 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741 - Modules did not work properly in the REPL due to additional lib path; fixed with symlinks to the lower directory structures |