From 6ecdff9ad89a28333a8939f121625692461d534b Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Fri, 18 Feb 2022 18:15:07 +1300 Subject: development/swift: Removed (abandoned, ftbfs). Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- development/swift/README | 9 - development/swift/slack-desc | 19 - development/swift/swift-libdir.patch | 2163 ---------------------------------- development/swift/swift.SlackBuild | 197 ---- development/swift/swift.info | 32 - 5 files changed, 2420 deletions(-) delete mode 100644 development/swift/README delete mode 100644 development/swift/slack-desc delete mode 100644 development/swift/swift-libdir.patch delete mode 100644 development/swift/swift.SlackBuild delete mode 100644 development/swift/swift.info diff --git a/development/swift/README b/development/swift/README deleted file mode 100644 index 1f02f990d6..0000000000 --- a/development/swift/README +++ /dev/null @@ -1,9 +0,0 @@ -Swift is a general-purpose programming language built using a modern -approach to safety, performance, and software design patterns. - -It is intended as a replacement for C-based languages (C, C++, and -Objective-C). As such, Swift must be comparable to those languages in -performance for most tasks. Performance must also be predictable and -consistent, not just fast in short bursts that require clean-up later. - -It ships with its own LLDB. diff --git a/development/swift/slack-desc b/development/swift/slack-desc deleted file mode 100644 index e3677e47ff..0000000000 --- a/development/swift/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -swift: swift (the Swift programming language) -swift: -swift: Swift is a general-purpose programming language -swift: built using a modern approach to safety, performance, -swift: and software design patterns. Designed by Apple. -swift: -swift: -swift: Homepage: https://swift.org/ -swift: -swift: -swift: diff --git a/development/swift/swift-libdir.patch b/development/swift/swift-libdir.patch deleted file mode 100644 index 72240064c9..0000000000 --- a/development/swift/swift-libdir.patch +++ /dev/null @@ -1,2163 +0,0 @@ -diff -C 4 -dHrN source/llbuild/CMakeLists.txt patched/llbuild/CMakeLists.txt -*** source/llbuild/CMakeLists.txt 2017-07-11 19:29:15.000000000 -0300 ---- patched/llbuild/CMakeLists.txt 2017-10-16 18:22:34.000000000 -0200 -*************** -*** 65,73 **** - set(LLBUILD_OBJ_DIR ${CMAKE_CURRENT_BINARY_DIR}) - - # Shared output directories for executables and libraries. - set(LLBUILD_EXECUTABLE_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) -! set(LLBUILD_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib) - - ### - # Support Tools - ---- 65,73 ---- - set(LLBUILD_OBJ_DIR ${CMAKE_CURRENT_BINARY_DIR}) - - # Shared output directories for executables and libraries. - set(LLBUILD_EXECUTABLE_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) -! set(LLBUILD_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${SWIFT_LIBDIR_SUFFIX}) - - ### - # Support Tools - -diff -C 4 -dHrN source/lldb/include/lldb/Host/Editline.h patched/lldb/include/lldb/Host/Editline.h -*** source/lldb/include/lldb/Host/Editline.h 2017-08-09 21:37:21.000000000 -0300 ---- patched/lldb/include/lldb/Host/Editline.h 2017-10-08 03:11:28.000000000 -0300 -*************** -*** 42,55 **** - // are available on some platforms. The wchar_t versions of libedit functions - // will only be - // used in cases where this is true. This is a compile time dependecy, for now - // selected per target Platform -! #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) - #define LLDB_EDITLINE_USE_WCHAR 1 - #include -- #else -- #define LLDB_EDITLINE_USE_WCHAR 0 -- #endif - - #include "lldb/Host/ConnectionFileDescriptor.h" - #include "lldb/lldb-private.h" - ---- 42,52 ---- - // are available on some platforms. The wchar_t versions of libedit functions - // will only be - // used in cases where this is true. This is a compile time dependecy, for now - // selected per target Platform -! - #define LLDB_EDITLINE_USE_WCHAR 1 - #include - - #include "lldb/Host/ConnectionFileDescriptor.h" - #include "lldb/lldb-private.h" - -diff -C 4 -dHrN source/lldb/tools/repl/swift/CMakeLists.txt patched/lldb/tools/repl/swift/CMakeLists.txt -*** source/lldb/tools/repl/swift/CMakeLists.txt 2017-08-09 21:37:21.000000000 -0300 ---- patched/lldb/tools/repl/swift/CMakeLists.txt 2017-10-08 03:17:34.000000000 -0300 -*************** -*** 18,26 **** - endif() - endif() - - set(swift_compile_cmd "${LLDB_SWIFTC}" -! -resource-dir "${LLDB_PATH_TO_SWIFT_BUILD}/lib/swift" - -module-cache-path "${module_cache_dir}") - - if(CMAKE_CROSSCOMPILING) - set(swift_compile_cmd ${swift_compile_cmd} -target "${LLVM_HOST_TRIPLE}" -sdk "${CMAKE_SYSROOT}") ---- 18,26 ---- - endif() - endif() - - set(swift_compile_cmd "${LLDB_SWIFTC}" -! -resource-dir "${LLDB_PATH_TO_SWIFT_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/swift" - -module-cache-path "${module_cache_dir}") - - if(CMAKE_CROSSCOMPILING) - set(swift_compile_cmd ${swift_compile_cmd} -target "${LLVM_HOST_TRIPLE}" -sdk "${CMAKE_SYSROOT}") -*************** -*** 29,37 **** - endif() - endif() - - if (CMAKE_SYSTEM_NAME MATCHES "Linux") -! set(swift_compile_cmd ${swift_compile_cmd} -Xlinker -rpath -Xlinker \$ORIGIN/../lib/swift/linux) - endif() - - add_custom_command_target( - unused_var ---- 29,37 ---- - endif() - endif() - - if (CMAKE_SYSTEM_NAME MATCHES "Linux") -! set(swift_compile_cmd ${swift_compile_cmd} -Xlinker -rpath -Xlinker \$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}/swift/linux) - endif() - - add_custom_command_target( - unused_var -diff -C 4 -dHrN source/swift/CMakeLists.txt patched/swift/CMakeLists.txt -*** source/swift/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/CMakeLists.txt 2017-10-06 00:02:40.000000000 -0300 -*************** -*** 473,481 **** - set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include") - set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include") - - set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin") -! set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib") - if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "") - set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${SWIFT_RUNTIME_OUTPUT_INTDIR}") - endif() - ---- 473,481 ---- - set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include") - set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include") - - set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin") -! set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${SWIFT_LIBDIR_SUFFIX}") - if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "") - set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${SWIFT_RUNTIME_OUTPUT_INTDIR}") - endif() - -diff -C 4 -dHrN source/swift/benchmark/CMakeLists.txt patched/swift/benchmark/CMakeLists.txt -*** source/swift/benchmark/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/benchmark/CMakeLists.txt 2017-10-06 00:09:48.000000000 -0300 -*************** -*** 150,158 **** - - if(NOT SWIFT_LIBRARY_PATH) - get_filename_component(tmp_dir "${SWIFT_EXEC}" DIRECTORY) - get_filename_component(tmp_dir "${tmp_dir}" DIRECTORY) -! set(SWIFT_LIBRARY_PATH "${tmp_dir}/lib/swift") - endif() - - # If the CMAKE_C_COMPILER is already clang, don't find it again, - # thus allowing the --host-cc build-script argument to work here. ---- 150,158 ---- - - if(NOT SWIFT_LIBRARY_PATH) - get_filename_component(tmp_dir "${SWIFT_EXEC}" DIRECTORY) - get_filename_component(tmp_dir "${tmp_dir}" DIRECTORY) -! set(SWIFT_LIBRARY_PATH "${tmp_dir}/lib${SWIFT_LIBDIR_SUFFIX}/swift") - endif() - - # If the CMAKE_C_COMPILER is already clang, don't find it again, - # thus allowing the --host-cc build-script argument to work here. -*************** -*** 250,259 **** - set(swift-bin-dir "${CMAKE_BINARY_DIR}/bin") - endif() - - set(benchmark-bin-dir "${CMAKE_CURRENT_BINARY_DIR}/bin") -! set(benchmark-lib-dir "${CMAKE_CURRENT_BINARY_DIR}/lib") -! set(benchmark-lib-swift-dir "${CMAKE_CURRENT_BINARY_DIR}/lib/swift") - - file(MAKE_DIRECTORY "${swift-bin-dir}") - file(MAKE_DIRECTORY "${benchmark-bin-dir}") - file(MAKE_DIRECTORY "${benchmark-lib-dir}") ---- 250,259 ---- - set(swift-bin-dir "${CMAKE_BINARY_DIR}/bin") - endif() - - set(benchmark-bin-dir "${CMAKE_CURRENT_BINARY_DIR}/bin") -! set(benchmark-lib-dir "${CMAKE_CURRENT_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}") -! set(benchmark-lib-swift-dir "${CMAKE_CURRENT_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}/swift") - - file(MAKE_DIRECTORY "${swift-bin-dir}") - file(MAKE_DIRECTORY "${benchmark-bin-dir}") - file(MAKE_DIRECTORY "${benchmark-lib-dir}") -diff -C 4 -dHrN source/swift/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake patched/swift/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake -*** source/swift/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake 2017-10-06 00:12:01.000000000 -0300 -*************** -*** 341,349 **** - "-m${triple_platform}-version-min=${ver}" - "-lobjc" - "-L${SWIFT_LIBRARY_PATH}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}" - "-Xlinker" "-rpath" -! "-Xlinker" "@executable_path/../lib/swift/${BENCH_COMPILE_ARCHOPTS_PLATFORM}" - ${bench_library_objects} - ${SWIFT_BENCH_OBJFILES} - ${objcfile} - "-o" "${OUTPUT_EXEC}" ---- 341,349 ---- - "-m${triple_platform}-version-min=${ver}" - "-lobjc" - "-L${SWIFT_LIBRARY_PATH}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}" - "-Xlinker" "-rpath" -! "-Xlinker" "@executable_path/../lib${SWIFT_LIBDIR_SUFFIX}/swift/${BENCH_COMPILE_ARCHOPTS_PLATFORM}" - ${bench_library_objects} - ${SWIFT_BENCH_OBJFILES} - ${objcfile} - "-o" "${OUTPUT_EXEC}" -diff -C 4 -dHrN source/swift/cmake/modules/AddSwift.cmake patched/swift/cmake/modules/AddSwift.cmake -*** source/swift/cmake/modules/AddSwift.cmake 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/cmake/modules/AddSwift.cmake 2017-10-06 00:20:33.000000000 -0300 -*************** -*** 4,14 **** - # SWIFTLIB_DIR is the directory in the build tree where Swift resource files - # should be placed. Note that $CMAKE_CFG_INTDIR expands to "." for - # single-configuration builds. - set(SWIFTLIB_DIR -! "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift") - set(SWIFTSTATICLIB_DIR -! "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift_static") - - function(add_dependencies_multiple_targets) - cmake_parse_arguments( - ADMT # prefix ---- 4,14 ---- - # SWIFTLIB_DIR is the directory in the build tree where Swift resource files - # should be placed. Note that $CMAKE_CFG_INTDIR expands to "." for - # single-configuration builds. - set(SWIFTLIB_DIR -! "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${SWIFT_LIBDIR_SUFFIX}/swift") - set(SWIFTSTATICLIB_DIR -! "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${SWIFT_LIBDIR_SUFFIX}/swift_static") - - function(add_dependencies_multiple_targets) - cmake_parse_arguments( - ADMT # prefix -*************** -*** 906,914 **** - INSTALL_NAME_DIR "${install_name_dir}") - elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX" AND NOT "${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID") - set_target_properties("${target}" - PROPERTIES -! INSTALL_RPATH "$ORIGIN:/usr/lib/swift/linux") - elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "CYGWIN") - set_target_properties("${target}" - PROPERTIES - INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin") ---- 906,914 ---- - INSTALL_NAME_DIR "${install_name_dir}") - elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX" AND NOT "${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID") - set_target_properties("${target}" - PROPERTIES -! INSTALL_RPATH "$ORIGIN:/usr/lib${SWIFT_LIBDIR_SUFFIX}/swift/linux") - elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "CYGWIN") - set_target_properties("${target}" - PROPERTIES - INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin") -*************** -*** 1045,1054 **** - set(c_compile_flags ${SWIFTLIB_SINGLE_C_COMPILE_FLAGS}) - set(link_flags ${SWIFTLIB_SINGLE_LINK_FLAGS}) - set(library_search_directories - "${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib/swift/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib/swift/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}") - - # Add variant-specific flags. - if(SWIFTLIB_SINGLE_TARGET_LIBRARY) - set(build_type "${SWIFT_STDLIB_BUILD_TYPE}") ---- 1045,1054 ---- - set(c_compile_flags ${SWIFTLIB_SINGLE_C_COMPILE_FLAGS}) - set(link_flags ${SWIFTLIB_SINGLE_LINK_FLAGS}) - set(library_search_directories - "${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib${SWIFT_LIBDIR_SUFFIX}/swift/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib${SWIFT_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}") - - # Add variant-specific flags. - if(SWIFTLIB_SINGLE_TARGET_LIBRARY) - set(build_type "${SWIFT_STDLIB_BUILD_TYPE}") -*************** -*** 1187,1196 **** - set_property(TARGET "${target_static}" APPEND_STRING PROPERTY - COMPILE_FLAGS " ${c_compile_flags}") - set(library_search_directories - "${SWIFTSTATICLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib/swift/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib/swift/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}") - swift_target_link_search_directories("${target_static}" "${library_search_directories}") - target_link_libraries("${target_static}" PRIVATE - ${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES}) - endif() ---- 1187,1196 ---- - set_property(TARGET "${target_static}" APPEND_STRING PROPERTY - COMPILE_FLAGS " ${c_compile_flags}") - set(library_search_directories - "${SWIFTSTATICLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib${SWIFT_LIBDIR_SUFFIX}/swift/${SWIFTLIB_SINGLE_SUBDIR}" -! "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib${SWIFT_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}") - swift_target_link_search_directories("${target_static}" "${library_search_directories}") - target_link_libraries("${target_static}" PRIVATE - ${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES}) - endif() -diff -C 4 -dHrN source/swift/cmake/modules/SwiftSharedCMakeConfig.cmake patched/swift/cmake/modules/SwiftSharedCMakeConfig.cmake -*** source/swift/cmake/modules/SwiftSharedCMakeConfig.cmake 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/cmake/modules/SwiftSharedCMakeConfig.cmake 2017-10-06 00:23:09.000000000 -0300 -*************** -*** 8,16 **** - precondition_translate_flag(${product}_PATH_TO_LLVM_BUILD PATH_TO_LLVM_BUILD) - - set(SWIFT_LLVM_CMAKE_PATHS - "${PATH_TO_LLVM_BUILD}/share/llvm/cmake" -! "${PATH_TO_LLVM_BUILD}/lib/cmake/llvm") - - # Add all LLVM CMake paths to our cmake module path. - foreach(path ${SWIFT_LLVM_CMAKE_PATHS}) - list(APPEND CMAKE_MODULE_PATH ${path}) ---- 8,16 ---- - precondition_translate_flag(${product}_PATH_TO_LLVM_BUILD PATH_TO_LLVM_BUILD) - - set(SWIFT_LLVM_CMAKE_PATHS - "${PATH_TO_LLVM_BUILD}/share/llvm/cmake" -! "${PATH_TO_LLVM_BUILD}/lib${SWIFT_LIBDIR_SUFFIX}/cmake/llvm") - - # Add all LLVM CMake paths to our cmake module path. - foreach(path ${SWIFT_LLVM_CMAKE_PATHS}) - list(APPEND CMAKE_MODULE_PATH ${path}) -*************** -*** 108,117 **** - endif() - set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit") - - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -! set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") -! set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") - - set(LLVM_INCLUDE_TESTS TRUE) - set(LLVM_INCLUDE_DOCS TRUE) - ---- 108,117 ---- - endif() - set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit") - - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -! set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}") -! set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}") - - set(LLVM_INCLUDE_TESTS TRUE) - set(LLVM_INCLUDE_DOCS TRUE) - -*************** -*** 132,140 **** - - # Add all Clang CMake paths to our cmake module path. - set(SWIFT_CLANG_CMAKE_PATHS - "${PATH_TO_CLANG_BUILD}/share/clang/cmake" -! "${PATH_TO_CLANG_BUILD}/lib/cmake/clang") - foreach(path ${SWIFT_CLANG_CMAKE_PATHS}) - list(APPEND CMAKE_MODULE_PATH ${path}) - endforeach() - ---- 132,140 ---- - - # Add all Clang CMake paths to our cmake module path. - set(SWIFT_CLANG_CMAKE_PATHS - "${PATH_TO_CLANG_BUILD}/share/clang/cmake" -! "${PATH_TO_CLANG_BUILD}/lib${SWIFT_LIBDIR_SUFFIX}/cmake/clang") - foreach(path ${SWIFT_CLANG_CMAKE_PATHS}) - list(APPEND CMAKE_MODULE_PATH ${path}) - endforeach() - -*************** -*** 226,234 **** - # part of the unified build. - if(EXISTS "${CMAKE_SOURCE_DIR}/tools/cmark/") - set(${product}_PATH_TO_CMARK_SOURCE "${CMAKE_SOURCE_DIR}/tools/cmark") - set(${product}_PATH_TO_CMARK_BUILD "${CMAKE_BINARY_DIR}/tools/cmark") -! set(${product}_CMARK_LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib") - - get_filename_component(CMARK_MAIN_SRC_DIR "${${product}_PATH_TO_CMARK_SOURCE}" - ABSOLUTE) - get_filename_component(PATH_TO_CMARK_BUILD "${${product}_PATH_TO_CMARK_BUILD}" ---- 226,234 ---- - # part of the unified build. - if(EXISTS "${CMAKE_SOURCE_DIR}/tools/cmark/") - set(${product}_PATH_TO_CMARK_SOURCE "${CMAKE_SOURCE_DIR}/tools/cmark") - set(${product}_PATH_TO_CMARK_BUILD "${CMAKE_BINARY_DIR}/tools/cmark") -! set(${product}_CMARK_LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}") - - get_filename_component(CMARK_MAIN_SRC_DIR "${${product}_PATH_TO_CMARK_SOURCE}" - ABSOLUTE) - get_filename_component(PATH_TO_CMARK_BUILD "${${product}_PATH_TO_CMARK_BUILD}" -diff -C 4 -dHrN source/swift/lib/Driver/CMakeLists.txt patched/swift/lib/Driver/CMakeLists.txt -*** source/swift/lib/Driver/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/lib/Driver/CMakeLists.txt 2017-10-16 20:28:35.000000000 -0200 -*************** -*** 50,58 **** - - list(APPEND static_stdlib_lnk_file_list ${swift_static_stdlib_${sdk}_args}) - swift_install_in_component(stdlib - FILES "${SWIFTSTATICLIB_DIR}/${linkfile}" -! DESTINATION "lib/swift_static/${lowercase_sdk}") - endif() - endforeach() - add_custom_target(swift_static_lnk_args ALL DEPENDS ${static_stdlib_lnk_file_list}) - endif() ---- 50,58 ---- - - list(APPEND static_stdlib_lnk_file_list ${swift_static_stdlib_${sdk}_args}) - swift_install_in_component(stdlib - FILES "${SWIFTSTATICLIB_DIR}/${linkfile}" -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift_static/${lowercase_sdk}") - endif() - endforeach() - add_custom_target(swift_static_lnk_args ALL DEPENDS ${static_stdlib_lnk_file_list}) - endif() -diff -C 4 -dHrN source/swift/lib/Driver/ToolChains.cpp patched/swift/lib/Driver/ToolChains.cpp -*** source/swift/lib/Driver/ToolChains.cpp 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/lib/Driver/ToolChains.cpp 2017-10-08 03:25:52.000000000 -0300 -*************** -*** 986,994 **** ---- 986,998 ---- - auto programPath = TC.getDriver().getSwiftProgramPath(); - runtimeLibPath.append(programPath.begin(), programPath.end()); - llvm::sys::path::remove_filename(runtimeLibPath); // remove /swift - llvm::sys::path::remove_filename(runtimeLibPath); // remove /bin -+ #if defined(__linux__) && defined(__x86_64__) -+ llvm::sys::path::append(runtimeLibPath, "lib64", "swift"); -+ #else - llvm::sys::path::append(runtimeLibPath, "lib", "swift"); -+ #endif - } - llvm::sys::path::append(runtimeLibPath, - getPlatformNameForTriple(TC.getTriple())); - } -*************** -*** 1008,1016 **** ---- 1012,1024 ---- - auto programPath = TC.getDriver().getSwiftProgramPath(); - runtimeLibPath.append(programPath.begin(), programPath.end()); - llvm::sys::path::remove_filename(runtimeLibPath); // remove /swift - llvm::sys::path::remove_filename(runtimeLibPath); // remove /bin -+ #if defined(__linux__) && defined(__x86_64__) -+ llvm::sys::path::append(runtimeLibPath, "lib64", "swift_static"); -+ #else - llvm::sys::path::append(runtimeLibPath, "lib", "swift_static"); -+ #endif - } - llvm::sys::path::append(runtimeLibPath, - getPlatformNameForTriple(TC.getTriple())); - } -diff -C 4 -dHrN source/swift/lib/Frontend/CompilerInvocation.cpp patched/swift/lib/Frontend/CompilerInvocation.cpp -*** source/swift/lib/Frontend/CompilerInvocation.cpp 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/lib/Frontend/CompilerInvocation.cpp 2017-10-08 03:30:45.000000000 -0300 -*************** -*** 40,48 **** ---- 40,52 ---- - void CompilerInvocation::setMainExecutablePath(StringRef Path) { - llvm::SmallString<128> LibPath(Path); - llvm::sys::path::remove_filename(LibPath); // Remove /swift - llvm::sys::path::remove_filename(LibPath); // Remove /bin -+ #if defined(__linux__) && defined(__x86_64__) -+ llvm::sys::path::append(LibPath, "lib64", "swift"); -+ #else - llvm::sys::path::append(LibPath, "lib", "swift"); -+ #endif - setRuntimeResourcePath(LibPath.str()); - } - - static void updateRuntimeLibraryPath(SearchPathOptions &SearchPathOpts, -diff -C 4 -dHrN source/swift/lib/Migrator/CMakeLists.txt patched/swift/lib/Migrator/CMakeLists.txt -*** source/swift/lib/Migrator/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/lib/Migrator/CMakeLists.txt 2017-10-25 22:13:22.227866880 -0200 -*************** -*** 5,13 **** - watchos.json - overlay.json - ) - set(SWIFTLIB_DIR -! "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift") - set(output_dir "${SWIFTLIB_DIR}/migrator") - - add_custom_command( - OUTPUT "${output_dir}" ---- 5,13 ---- - watchos.json - overlay.json - ) - set(SWIFTLIB_DIR -! "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${SWIFT_LIBDIR_SUFFIX}/swift") - set(output_dir "${SWIFTLIB_DIR}/migrator") - - add_custom_command( - OUTPUT "${output_dir}" -*************** -*** 32,40 **** - COMMENT "Symlinking migrator data to ${output_dir}") - - swift_install_in_component(compiler - FILES ${datafiles} -! DESTINATION "lib/swift/migrator") - - add_swift_library(swiftMigrator STATIC - APIDiffMigratorPass.cpp - EditorAdapter.cpp ---- 32,40 ---- - COMMENT "Symlinking migrator data to ${output_dir}") - - swift_install_in_component(compiler - FILES ${datafiles} -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift/migrator") - - add_swift_library(swiftMigrator STATIC - APIDiffMigratorPass.cpp - EditorAdapter.cpp -diff -C 4 -dHrN source/swift/stdlib/public/Platform/CMakeLists.txt patched/swift/stdlib/public/Platform/CMakeLists.txt -*** source/swift/stdlib/public/Platform/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/stdlib/public/Platform/CMakeLists.txt 2017-10-16 20:35:22.000000000 -0200 -*************** -*** 99,107 **** - # This only affects ANDROID right now, but could affect cross-compiled LINUX targets - - swift_install_in_component(sdk-overlay - FILES "${glibc_modulemap_out}" -! DESTINATION "lib/swift/${arch_subdir}") - - endforeach() - endforeach() - add_custom_target(glibc_modulemap DEPENDS ${glibc_modulemap_target_list}) ---- 99,107 ---- - # This only affects ANDROID right now, but could affect cross-compiled LINUX targets - - swift_install_in_component(sdk-overlay - FILES "${glibc_modulemap_out}" -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift/${arch_subdir}") - - endforeach() - endforeach() - add_custom_target(glibc_modulemap DEPENDS ${glibc_modulemap_target_list}) -diff -C 4 -dHrN source/swift/stdlib/public/SwiftShims/CMakeLists.txt patched/swift/stdlib/public/SwiftShims/CMakeLists.txt -*** source/swift/stdlib/public/SwiftShims/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/stdlib/public/SwiftShims/CMakeLists.txt 2017-10-06 00:30:37.000000000 -0300 -*************** -*** 83,92 **** - "${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}" - - # FIXME: if we want to support separate Clang builds and mix different - # build configurations of Clang and Swift, this line should be adjusted. -! "${SWIFT_PATH_TO_CLANG_BUILD}/${CMAKE_CFG_INTDIR}/lib/clang/${CLANG_VERSION}" -! "${SWIFT_PATH_TO_CLANG_BUILD}/${LLVM_BUILD_TYPE}/lib/clang/${CLANG_VERSION}") - - set(clang_headers_location) - foreach(loc ${clang_headers_locations}) - if(EXISTS "${loc}") ---- 83,92 ---- - "${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}" - - # FIXME: if we want to support separate Clang builds and mix different - # build configurations of Clang and Swift, this line should be adjusted. -! "${SWIFT_PATH_TO_CLANG_BUILD}/${CMAKE_CFG_INTDIR}/lib${SWIFT_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}" -! "${SWIFT_PATH_TO_CLANG_BUILD}/${LLVM_BUILD_TYPE}/lib${SWIFT_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}") - - set(clang_headers_location) - foreach(loc ${clang_headers_locations}) - if(EXISTS "${loc}") -*************** -*** 121,145 **** - add_dependencies(copy_shim_headers symlink_clang_headers) - - swift_install_in_component(compiler - FILES ${sources} -! DESTINATION "lib/swift/shims") - - # Install Clang headers under the Swift library so that an installed Swift's - # module importer can find the compiler headers corresponding to its Clang. - swift_install_in_component(clang-builtin-headers - DIRECTORY "${clang_headers_location}/" -! DESTINATION "lib/swift/clang" - PATTERN "*.h") - - swift_install_symlink_component(clang-resource-dir-symlink - LINK_NAME clang - TARGET ../clang/${CLANG_VERSION} -! DESTINATION "lib/swift") - - # Possibly install Clang headers under Clang's resource directory in case we - # need to use a different version of the headers than the installed Clang. This - # should be used in conjunction with clang-resource-dir-symlink. - swift_install_in_component(clang-builtin-headers-in-clang-resource-dir -! DIRECTORY "${SWIFT_PATH_TO_CLANG_BUILD}/lib/clang" - DESTINATION "lib" - PATTERN "*.h") ---- 121,145 ---- - add_dependencies(copy_shim_headers symlink_clang_headers) - - swift_install_in_component(compiler - FILES ${sources} -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift/shims") - - # Install Clang headers under the Swift library so that an installed Swift's - # module importer can find the compiler headers corresponding to its Clang. - swift_install_in_component(clang-builtin-headers - DIRECTORY "${clang_headers_location}/" -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift/clang" - PATTERN "*.h") - - swift_install_symlink_component(clang-resource-dir-symlink - LINK_NAME clang - TARGET ../clang/${CLANG_VERSION} -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift") - - # Possibly install Clang headers under Clang's resource directory in case we - # need to use a different version of the headers than the installed Clang. This - # should be used in conjunction with clang-resource-dir-symlink. - swift_install_in_component(clang-builtin-headers-in-clang-resource-dir -! DIRECTORY "${SWIFT_PATH_TO_CLANG_BUILD}/lib${SWIFT_LIBDIR_SUFFIX}/clang" - DESTINATION "lib" - PATTERN "*.h") -diff -C 4 -dHrN source/swift/stdlib/public/runtime/CMakeLists.txt patched/swift/stdlib/public/runtime/CMakeLists.txt -*** source/swift/stdlib/public/runtime/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/stdlib/public/runtime/CMakeLists.txt 2017-10-26 00:14:19.684445583 -0200 -*************** -*** 109,117 **** - ARCHIVE_OUTPUT_DIRECTORY "${SWIFTSTATICLIB_DIR}/${lowercase_sdk}") - - swift_install_in_component(stdlib - TARGETS swiftImageInspectionStatic swiftImageInspectionShared -! DESTINATION "lib/swift_static/${lowercase_sdk}") - - # Generate the static-executable-args.lnk file used for ELF systems (eg linux) - set(linkfile "${lowercase_sdk}/static-executable-args.lnk") - add_custom_command_target(swift_static_binary_${sdk}_args ---- 109,117 ---- - ARCHIVE_OUTPUT_DIRECTORY "${SWIFTSTATICLIB_DIR}/${lowercase_sdk}") - - swift_install_in_component(stdlib - TARGETS swiftImageInspectionStatic swiftImageInspectionShared -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift_static/${lowercase_sdk}") - - # Generate the static-executable-args.lnk file used for ELF systems (eg linux) - set(linkfile "${lowercase_sdk}/static-executable-args.lnk") - add_custom_command_target(swift_static_binary_${sdk}_args -*************** -*** 126,134 **** - - list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args}) - swift_install_in_component(stdlib - FILES "${SWIFTSTATICLIB_DIR}/${linkfile}" -! DESTINATION "lib/swift_static/${lowercase_sdk}") - add_custom_target(static_binary_magic ALL DEPENDS ${static_binary_lnk_file_list}) - - add_swift_library(swiftImageInspectionShared OBJECT_LIBRARY TARGET_LIBRARY - ImageInspectionELF.cpp ---- 126,134 ---- - - list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args}) - swift_install_in_component(stdlib - FILES "${SWIFTSTATICLIB_DIR}/${linkfile}" -! DESTINATION "lib${SWIFT_LIBDIR_SUFFIX}/swift_static/${lowercase_sdk}") - add_custom_target(static_binary_magic ALL DEPENDS ${static_binary_lnk_file_list}) - - add_swift_library(swiftImageInspectionShared OBJECT_LIBRARY TARGET_LIBRARY - ImageInspectionELF.cpp -*************** -*** 215,223 **** - FILES - "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o" - "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o" - DESTINATION -! "lib/swift/${arch_subdir}") - - if(SWIFT_BUILD_STATIC_STDLIB) - # Static lib versions of swift_begin.o and swift_end.o - add_custom_command_target(static_section_magic_${arch_suffix}_begin_object ---- 215,223 ---- - FILES - "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o" - "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o" - DESTINATION -! "lib${SWIFT_LIBDIR_SUFFIX}/swift/${arch_subdir}") - - if(SWIFT_BUILD_STATIC_STDLIB) - # Static lib versions of swift_begin.o and swift_end.o - add_custom_command_target(static_section_magic_${arch_suffix}_begin_object -*************** -*** 248,256 **** - FILES - "${SWIFTSTATICLIB_DIR}/${arch_subdir}/swift_begin.o" - "${SWIFTSTATICLIB_DIR}/${arch_subdir}/swift_end.o" - DESTINATION -! "lib/swift_static/${arch_subdir}") - endif() - - endforeach() - endforeach() ---- 248,256 ---- - FILES - "${SWIFTSTATICLIB_DIR}/${arch_subdir}/swift_begin.o" - "${SWIFTSTATICLIB_DIR}/${arch_subdir}/swift_end.o" - DESTINATION -! "lib${SWIFT_LIBDIR_SUFFIX}/swift_static/${arch_subdir}") - endif() - - endforeach() - endforeach() -diff -C 4 -dHrN source/swift/test/Driver/environment.swift patched/swift/test/Driver/environment.swift -*** source/swift/test/Driver/environment.swift 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/test/Driver/environment.swift 2017-10-16 20:21:11.000000000 -0200 -*************** -*** 2,7 **** - // Apple's "System Integrity Protection" makes this test fail on OS X. - - // RUN: %swift_driver -target x86_64-unknown-gnu-linux -L/foo/ -driver-use-frontend-path %S/Inputs/print-var.sh %s LD_LIBRARY_PATH | %FileCheck -check-prefix=CHECK${LD_LIBRARY_PATH+_LAX} %s - -! // CHECK: {{^/foo/:[^:]+/lib/swift/linux$}} -! // CHECK_LAX: {{^/foo/:[^:]+/lib/swift/linux}} ---- 2,7 ---- - // Apple's "System Integrity Protection" makes this test fail on OS X. - - // RUN: %swift_driver -target x86_64-unknown-gnu-linux -L/foo/ -driver-use-frontend-path %S/Inputs/print-var.sh %s LD_LIBRARY_PATH | %FileCheck -check-prefix=CHECK${LD_LIBRARY_PATH+_LAX} %s - -! // CHECK: {{^/foo/:[^:]+/swift/linux$}} -! // CHECK_LAX: {{^/foo/:[^:]+/swift/linux}} -diff -C 4 -dHrN source/swift/test/Driver/linker.swift patched/swift/test/Driver/linker.swift -*** source/swift/test/Driver/linker.swift 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/test/Driver/linker.swift 2017-10-23 13:00:57.980363014 -0200 -*************** -*** 54,62 **** - // CHECK: -o [[OBJECTFILE:.*]] - - // CHECK-NEXT: bin/ld{{"? }} - // CHECK-DAG: [[OBJECTFILE]] -! // CHECK-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift/macosx]] - // CHECK-DAG: -rpath [[STDLIB_PATH]] - // CHECK-DAG: -lSystem - // CHECK-DAG: -arch x86_64 - // CHECK: -o {{[^ ]+}} ---- 54,62 ---- - // CHECK: -o [[OBJECTFILE:.*]] - - // CHECK-NEXT: bin/ld{{"? }} - // CHECK-DAG: [[OBJECTFILE]] -! // CHECK-DAG: -L [[STDLIB_PATH:[^ ]+/swift/macosx]] - // CHECK-DAG: -rpath [[STDLIB_PATH]] - // CHECK-DAG: -lSystem - // CHECK-DAG: -arch x86_64 - // CHECK: -o {{[^ ]+}} -*************** -*** 73,81 **** - // IOS_SIMPLE: -o [[OBJECTFILE:.*]] - - // IOS_SIMPLE: bin/ld{{"? }} - // IOS_SIMPLE-DAG: [[OBJECTFILE]] -! // IOS_SIMPLE-DAG: -L {{[^ ]+/lib/swift/iphonesimulator}} - // IOS_SIMPLE-DAG: -lSystem - // IOS_SIMPLE-DAG: -arch x86_64 - // IOS_SIMPLE-DAG: -ios_simulator_version_min 7.1.{{[0-9]+}} - // IOS_SIMPLE: -o linker ---- 73,81 ---- - // IOS_SIMPLE: -o [[OBJECTFILE:.*]] - - // IOS_SIMPLE: bin/ld{{"? }} - // IOS_SIMPLE-DAG: [[OBJECTFILE]] -! // IOS_SIMPLE-DAG: -L {{[^ ]+/swift/iphonesimulator}} - // IOS_SIMPLE-DAG: -lSystem - // IOS_SIMPLE-DAG: -arch x86_64 - // IOS_SIMPLE-DAG: -ios_simulator_version_min 7.1.{{[0-9]+}} - // IOS_SIMPLE: -o linker -*************** -*** 85,93 **** - // tvOS_SIMPLE: -o [[OBJECTFILE:.*]] - - // tvOS_SIMPLE: bin/ld{{"? }} - // tvOS_SIMPLE-DAG: [[OBJECTFILE]] -! // tvOS_SIMPLE-DAG: -L {{[^ ]+/lib/swift/appletvsimulator}} - // tvOS_SIMPLE-DAG: -lSystem - // tvOS_SIMPLE-DAG: -arch x86_64 - // tvOS_SIMPLE-DAG: -tvos_simulator_version_min 9.0.{{[0-9]+}} - // tvOS_SIMPLE: -o linker ---- 85,93 ---- - // tvOS_SIMPLE: -o [[OBJECTFILE:.*]] - - // tvOS_SIMPLE: bin/ld{{"? }} - // tvOS_SIMPLE-DAG: [[OBJECTFILE]] -! // tvOS_SIMPLE-DAG: -L {{[^ ]+/swift/appletvsimulator}} - // tvOS_SIMPLE-DAG: -lSystem - // tvOS_SIMPLE-DAG: -arch x86_64 - // tvOS_SIMPLE-DAG: -tvos_simulator_version_min 9.0.{{[0-9]+}} - // tvOS_SIMPLE: -o linker -*************** -*** 97,105 **** - // watchOS_SIMPLE: -o [[OBJECTFILE:.*]] - - // watchOS_SIMPLE: bin/ld{{"? }} - // watchOS_SIMPLE-DAG: [[OBJECTFILE]] -! // watchOS_SIMPLE-DAG: -L {{[^ ]+/lib/swift/watchsimulator}} - // watchOS_SIMPLE-DAG: -lSystem - // watchOS_SIMPLE-DAG: -arch i386 - // watchOS_SIMPLE-DAG: -watchos_simulator_version_min 2.0.{{[0-9]+}} - // watchOS_SIMPLE: -o linker ---- 97,105 ---- - // watchOS_SIMPLE: -o [[OBJECTFILE:.*]] - - // watchOS_SIMPLE: bin/ld{{"? }} - // watchOS_SIMPLE-DAG: [[OBJECTFILE]] -! // watchOS_SIMPLE-DAG: -L {{[^ ]+/swift/watchsimulator}} - // watchOS_SIMPLE-DAG: -lSystem - // watchOS_SIMPLE-DAG: -arch i386 - // watchOS_SIMPLE-DAG: -watchos_simulator_version_min 2.0.{{[0-9]+}} - // watchOS_SIMPLE: -o linker -*************** -*** 110,118 **** - - // LINUX-x86_64: clang++{{"? }} - // LINUX-x86_64-DAG: [[OBJECTFILE]] - // LINUX-x86_64-DAG: -lswiftCore -! // LINUX-x86_64-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]] - // LINUX-x86_64-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-x86_64-DAG: -F foo -iframework car -F cdr - // LINUX-x86_64-DAG: -framework bar - // LINUX-x86_64-DAG: -L baz ---- 110,118 ---- - - // LINUX-x86_64: clang++{{"? }} - // LINUX-x86_64-DAG: [[OBJECTFILE]] - // LINUX-x86_64-DAG: -lswiftCore -! // LINUX-x86_64-DAG: -L [[STDLIB_PATH:[^ ]+/swift]] - // LINUX-x86_64-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-x86_64-DAG: -F foo -iframework car -F cdr - // LINUX-x86_64-DAG: -framework bar - // LINUX-x86_64-DAG: -L baz -*************** -*** 125,133 **** - - // LINUX-armv6: clang++{{"? }} - // LINUX-armv6-DAG: [[OBJECTFILE]] - // LINUX-armv6-DAG: -lswiftCore -! // LINUX-armv6-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]] - // LINUX-armv6-DAG: -target armv6-unknown-linux-gnueabihf - // LINUX-armv6-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-armv6-DAG: -F foo -iframework car -F cdr - // LINUX-armv6-DAG: -framework bar ---- 125,133 ---- - - // LINUX-armv6: clang++{{"? }} - // LINUX-armv6-DAG: [[OBJECTFILE]] - // LINUX-armv6-DAG: -lswiftCore -! // LINUX-armv6-DAG: -L [[STDLIB_PATH:[^ ]+/swift]] - // LINUX-armv6-DAG: -target armv6-unknown-linux-gnueabihf - // LINUX-armv6-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-armv6-DAG: -F foo -iframework car -F cdr - // LINUX-armv6-DAG: -framework bar -*************** -*** 141,149 **** - - // LINUX-armv7: clang++{{"? }} - // LINUX-armv7-DAG: [[OBJECTFILE]] - // LINUX-armv7-DAG: -lswiftCore -! // LINUX-armv7-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]] - // LINUX-armv7-DAG: -target armv7-unknown-linux-gnueabihf - // LINUX-armv7-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-armv7-DAG: -F foo -iframework car -F cdr - // LINUX-armv7-DAG: -framework bar ---- 141,149 ---- - - // LINUX-armv7: clang++{{"? }} - // LINUX-armv7-DAG: [[OBJECTFILE]] - // LINUX-armv7-DAG: -lswiftCore -! // LINUX-armv7-DAG: -L [[STDLIB_PATH:[^ ]+/swift]] - // LINUX-armv7-DAG: -target armv7-unknown-linux-gnueabihf - // LINUX-armv7-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-armv7-DAG: -F foo -iframework car -F cdr - // LINUX-armv7-DAG: -framework bar -*************** -*** 157,165 **** - - // LINUX-thumbv7: clang++{{"? }} - // LINUX-thumbv7-DAG: [[OBJECTFILE]] - // LINUX-thumbv7-DAG: -lswiftCore -! // LINUX-thumbv7-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]] - // LINUX-thumbv7-DAG: -target thumbv7-unknown-linux-gnueabihf - // LINUX-thumbv7-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-thumbv7-DAG: -F foo -iframework car -F cdr - // LINUX-thumbv7-DAG: -framework bar ---- 157,165 ---- - - // LINUX-thumbv7: clang++{{"? }} - // LINUX-thumbv7-DAG: [[OBJECTFILE]] - // LINUX-thumbv7-DAG: -lswiftCore -! // LINUX-thumbv7-DAG: -L [[STDLIB_PATH:[^ ]+/swift]] - // LINUX-thumbv7-DAG: -target thumbv7-unknown-linux-gnueabihf - // LINUX-thumbv7-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // LINUX-thumbv7-DAG: -F foo -iframework car -F cdr - // LINUX-thumbv7-DAG: -framework bar -*************** -*** 173,181 **** - - // ANDROID-armv7: clang++{{"? }} - // ANDROID-armv7-DAG: [[OBJECTFILE]] - // ANDROID-armv7-DAG: -lswiftCore -! // ANDROID-armv7-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]] - // ANDROID-armv7-DAG: -target armv7-none-linux-androideabi - // ANDROID-armv7-DAG: -F foo -iframework car -F cdr - // ANDROID-armv7-DAG: -framework bar - // ANDROID-armv7-DAG: -L baz ---- 173,181 ---- - - // ANDROID-armv7: clang++{{"? }} - // ANDROID-armv7-DAG: [[OBJECTFILE]] - // ANDROID-armv7-DAG: -lswiftCore -! // ANDROID-armv7-DAG: -L [[STDLIB_PATH:[^ ]+/swift]] - // ANDROID-armv7-DAG: -target armv7-none-linux-androideabi - // ANDROID-armv7-DAG: -F foo -iframework car -F cdr - // ANDROID-armv7-DAG: -framework bar - // ANDROID-armv7-DAG: -L baz -*************** -*** 189,197 **** - - // CYGWIN-x86_64: clang++{{"? }} - // CYGWIN-x86_64-DAG: [[OBJECTFILE]] - // CYGWIN-x86_64-DAG: -lswiftCore -! // CYGWIN-x86_64-DAG: -L [[STDLIB_PATH:[^ ]+/lib/swift]] - // CYGWIN-x86_64-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // CYGWIN-x86_64-DAG: -F foo -iframework car -F cdr - // CYGWIN-x86_64-DAG: -framework bar - // CYGWIN-x86_64-DAG: -L baz ---- 189,197 ---- - - // CYGWIN-x86_64: clang++{{"? }} - // CYGWIN-x86_64-DAG: [[OBJECTFILE]] - // CYGWIN-x86_64-DAG: -lswiftCore -! // CYGWIN-x86_64-DAG: -L [[STDLIB_PATH:[^ ]+/swift]] - // CYGWIN-x86_64-DAG: -Xlinker -rpath -Xlinker [[STDLIB_PATH]] - // CYGWIN-x86_64-DAG: -F foo -iframework car -F cdr - // CYGWIN-x86_64-DAG: -framework bar - // CYGWIN-x86_64-DAG: -L baz -diff -C 4 -dHrN source/swift/test/Driver/options-interpreter.swift patched/swift/test/Driver/options-interpreter.swift -*** source/swift/test/Driver/options-interpreter.swift 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/test/Driver/options-interpreter.swift 2017-10-16 20:25:22.000000000 -0200 -*************** -*** 21,35 **** - // CHECK-RESOURCE-DIR-ONLY-LINUX: # LD_LIBRARY_PATH=/RSRC/linux{{$}} - // CHECK-RESOURCE-DIR-ONLY-LINUX_LAX: # LD_LIBRARY_PATH=/RSRC/linux{{$|:}} - - // RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ %s | %FileCheck -check-prefix=CHECK-L %s -! // CHECK-L: # DYLD_LIBRARY_PATH={{/foo/:[^:]+/lib/swift/macosx$}} - - // RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-L2 %s -! // CHECK-L2: # DYLD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/macosx$}} - - // RUN: env DYLD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-L2-ENV %s -! // CHECK-L2-ENV: # DYLD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/macosx:/abc/$}} - - // RUN: %swift_driver -### -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s - // RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s - // CHECK-NO-FRAMEWORKS-NOT: DYLD_FRAMEWORK_PATH ---- 21,35 ---- - // CHECK-RESOURCE-DIR-ONLY-LINUX: # LD_LIBRARY_PATH=/RSRC/linux{{$}} - // CHECK-RESOURCE-DIR-ONLY-LINUX_LAX: # LD_LIBRARY_PATH=/RSRC/linux{{$|:}} - - // RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ %s | %FileCheck -check-prefix=CHECK-L %s -! // CHECK-L: # DYLD_LIBRARY_PATH={{/foo/:[^:]+/swift/macosx$}} - - // RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-L2 %s -! // CHECK-L2: # DYLD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/swift/macosx$}} - - // RUN: env DYLD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-L2-ENV %s -! // CHECK-L2-ENV: # DYLD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/swift/macosx:/abc/$}} - - // RUN: %swift_driver -### -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s - // RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s - // CHECK-NO-FRAMEWORKS-NOT: DYLD_FRAMEWORK_PATH -*************** -*** 55,67 **** - // CHECK-COMPLEX: -F /foo/ - // CHECK-COMPLEX: -F /bar/ - // CHECK-COMPLEX: # - // CHECK-COMPLEX-DAG: DYLD_FRAMEWORK_PATH=/foo/:/bar/:/abc/{{$| }} -! // CHECK-COMPLEX-DAG: DYLD_LIBRARY_PATH={{/foo2/:/bar2/:[^:]+/lib/swift/macosx($| )}} - - // RUN: %swift_driver -### -target x86_64-unknown-linux-gnu -L/foo/ %s | %FileCheck -check-prefix=CHECK-L-LINUX${LD_LIBRARY_PATH+_LAX} %s -! // CHECK-L-LINUX: # LD_LIBRARY_PATH={{/foo/:[^:]+/lib/swift/linux$}} -! // CHECK-L-LINUX_LAX: # LD_LIBRARY_PATH={{/foo/:[^:]+/lib/swift/linux($|:)}} - - // RUN: env LD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-unknown-linux-gnu -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-LINUX-COMPLEX${LD_LIBRARY_PATH+_LAX} %s -! // CHECK-LINUX-COMPLEX: # LD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/linux:/abc/$}} -! // CHECK-LINUX-COMPLEX_LAX: # LD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/linux:/abc/($|:)}} ---- 55,67 ---- - // CHECK-COMPLEX: -F /foo/ - // CHECK-COMPLEX: -F /bar/ - // CHECK-COMPLEX: # - // CHECK-COMPLEX-DAG: DYLD_FRAMEWORK_PATH=/foo/:/bar/:/abc/{{$| }} -! // CHECK-COMPLEX-DAG: DYLD_LIBRARY_PATH={{/foo2/:/bar2/:[^:]+/swift/macosx($| )}} - - // RUN: %swift_driver -### -target x86_64-unknown-linux-gnu -L/foo/ %s | %FileCheck -check-prefix=CHECK-L-LINUX${LD_LIBRARY_PATH+_LAX} %s -! // CHECK-L-LINUX: # LD_LIBRARY_PATH={{/foo/:[^:]+/swift/linux$}} -! // CHECK-L-LINUX_LAX: # LD_LIBRARY_PATH={{/foo/:[^:]+/swift/linux($|:)}} - - // RUN: env LD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-unknown-linux-gnu -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-LINUX-COMPLEX${LD_LIBRARY_PATH+_LAX} %s -! // CHECK-LINUX-COMPLEX: # LD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/swift/linux:/abc/$}} -! // CHECK-LINUX-COMPLEX_LAX: # LD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/swift/linux:/abc/($|:)}} -diff -C 4 -dHrN source/swift/test/Driver/profiling.swift patched/swift/test/Driver/profiling.swift -*** source/swift/test/Driver/profiling.swift 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/test/Driver/profiling.swift 2017-10-16 20:24:17.000000000 -0200 -*************** -*** 22,48 **** - // CHECK: swift - // CHECK: -profile-generate - - // OSX: bin/ld{{"? }} -! // OSX: lib/swift/clang/lib/darwin/libclang_rt.profile_osx.a - - // IOS: bin/ld{{"? }} -! // IOS: lib/swift/clang/lib/darwin/libclang_rt.profile_ios.a - - // IOSSIM: bin/ld{{"? }} -! // IOSSIM: lib/swift/clang/lib/darwin/libclang_rt.profile_iossim.a - - // tvOS: bin/ld{{"? }} -! // tvOS: lib/swift/clang/lib/darwin/libclang_rt.profile_tvos.a - - // tvOS_SIM: bin/ld{{"? }} -! // tvOS_SIM: lib/swift/clang/lib/darwin/libclang_rt.profile_tvossim.a - - // watchOS: bin/ld{{"? }} -! // watchOS: lib/swift/clang/lib/darwin/libclang_rt.profile_watchos.a - - // watchOS_SIM: bin/ld{{"? }} -! // watchOS_SIM: lib/swift/clang/lib/darwin/libclang_rt.profile_watchossim.a - - // LINUX: clang++{{"? }} -! // LINUX: lib/swift/clang/lib/linux/libclang_rt.profile-x86_64.a - // LINUX: -u__llvm_profile_runtime ---- 22,48 ---- - // CHECK: swift - // CHECK: -profile-generate - - // OSX: bin/ld{{"? }} -! // OSX: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_osx.a}} - - // IOS: bin/ld{{"? }} -! // IOS: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_ios.a}} - - // IOSSIM: bin/ld{{"? }} -! // IOSSIM: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_iossim.a}} - - // tvOS: bin/ld{{"? }} -! // tvOS: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_tvos.a}} - - // tvOS_SIM: bin/ld{{"? }} -! // tvOS_SIM: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_tvossim.a}} - - // watchOS: bin/ld{{"? }} -! // watchOS: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_watchos.a}} - - // watchOS_SIM: bin/ld{{"? }} -! // watchOS_SIM: {{[^:]+/swift/clang/lib/darwin/libclang_rt.profile_watchossim.a}} - - // LINUX: clang++{{"? }} -! // LINUX: {{[^:]+/swift/clang/lib/linux/libclang_rt.profile-x86_64.a}} - // LINUX: -u__llvm_profile_runtime -diff -C 4 -dHrN source/swift/test/Driver/sanitizers.swift patched/swift/test/Driver/sanitizers.swift -*** source/swift/test/Driver/sanitizers.swift 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/test/Driver/sanitizers.swift 2017-10-16 20:22:49.000000000 -0200 -*************** -*** 23,49 **** - - // ASAN: swift - // ASAN: -sanitize=address - -! // ASAN_OSX: lib/swift/clang/lib/darwin/libclang_rt.asan_osx_dynamic.dylib -! // ASAN_IOSSIM: lib/swift/clang/lib/darwin/libclang_rt.asan_iossim_dynamic.dylib -! // ASAN_IOS: lib/swift/clang/lib/darwin/libclang_rt.asan_ios_dynamic.dylib -! // ASAN_tvOS_SIM: lib/swift/clang/lib/darwin/libclang_rt.asan_tvossim_dynamic.dylib -! // ASAN_tvOS: lib/swift/clang/lib/darwin/libclang_rt.asan_tvos_dynamic.dylib -! // ASAN_watchOS_SIM: lib/swift/clang/lib/darwin/libclang_rt.asan_watchossim_dynamic.dylib -! // ASAN_watchOS: lib/swift/clang/lib/darwin/libclang_rt.asan_watchos_dynamic.dylib - // ASAN_LINUX: unsupported option '-sanitize=address' for target 'x86_64-unknown-linux-gnu' - - // ASAN: -rpath @executable_path - - // TSAN: swift - // TSAN: -sanitize=thread - -! // TSAN_OSX: lib/swift/clang/lib/darwin/libclang_rt.tsan_osx_dynamic.dylib - // TSAN_OSX_32: unsupported option '-sanitize=thread' for target 'x86-apple-macosx10.9' -! // TSAN_IOSSIM: lib/swift/clang/lib/darwin/libclang_rt.tsan_iossim_dynamic.dylib - // TSAN_IOS: unsupported option '-sanitize=thread' for target 'arm64-apple-ios7.1' -! // TSAN_tvOS_SIM: lib/swift/clang/lib/darwin/libclang_rt.tsan_tvossim_dynamic.dylib - // TSAN_tvOS: unsupported option '-sanitize=thread' for target 'arm64-apple-tvos9.0' - // TSAN_watchOS_SIM: unsupported option '-sanitize=thread' for target 'i386-apple-watchos2.0' - // TSAN_watchOS: unsupported option '-sanitize=thread' for target 'armv7k-apple-watchos2.0' - // TSAN_LINUX: unsupported option '-sanitize=thread' for target 'x86_64-unknown-linux-gnu' ---- 23,49 ---- - - // ASAN: swift - // ASAN: -sanitize=address - -! // ASAN_OSX: swift/clang/lib/darwin/libclang_rt.asan_osx_dynamic.dylib -! // ASAN_IOSSIM: swift/clang/lib/darwin/libclang_rt.asan_iossim_dynamic.dylib -! // ASAN_IOS: swift/clang/lib/darwin/libclang_rt.asan_ios_dynamic.dylib -! // ASAN_tvOS_SIM: swift/clang/lib/darwin/libclang_rt.asan_tvossim_dynamic.dylib -! // ASAN_tvOS: swift/clang/lib/darwin/libclang_rt.asan_tvos_dynamic.dylib -! // ASAN_watchOS_SIM: swift/clang/lib/darwin/libclang_rt.asan_watchossim_dynamic.dylib -! // ASAN_watchOS: swift/clang/lib/darwin/libclang_rt.asan_watchos_dynamic.dylib - // ASAN_LINUX: unsupported option '-sanitize=address' for target 'x86_64-unknown-linux-gnu' - - // ASAN: -rpath @executable_path - - // TSAN: swift - // TSAN: -sanitize=thread - -! // TSAN_OSX: swift/clang/lib/darwin/libclang_rt.tsan_osx_dynamic.dylib - // TSAN_OSX_32: unsupported option '-sanitize=thread' for target 'x86-apple-macosx10.9' -! // TSAN_IOSSIM: swift/clang/lib/darwin/libclang_rt.tsan_iossim_dynamic.dylib - // TSAN_IOS: unsupported option '-sanitize=thread' for target 'arm64-apple-ios7.1' -! // TSAN_tvOS_SIM: swift/clang/lib/darwin/libclang_rt.tsan_tvossim_dynamic.dylib - // TSAN_tvOS: unsupported option '-sanitize=thread' for target 'arm64-apple-tvos9.0' - // TSAN_watchOS_SIM: unsupported option '-sanitize=thread' for target 'i386-apple-watchos2.0' - // TSAN_watchOS: unsupported option '-sanitize=thread' for target 'armv7k-apple-watchos2.0' - // TSAN_LINUX: unsupported option '-sanitize=thread' for target 'x86_64-unknown-linux-gnu' -diff -C 4 -dHrN source/swift/test/lit.cfg patched/swift/test/lit.cfg -*** source/swift/test/lit.cfg 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/test/lit.cfg 2017-10-16 20:19:23.437234342 -0200 -*************** -*** 298,306 **** - config.gyb = os.path.join(config.swift_utils, 'gyb') - config.rth = os.path.join(config.swift_utils, 'rth') # Resilience test helper - config.scale_test = os.path.join(config.swift_utils, 'scale-test') - config.PathSanitizingFileCheck = os.path.join(config.swift_utils, 'PathSanitizingFileCheck') -! config.swift_lib_dir = os.path.join(os.path.dirname(os.path.dirname(config.swift)), 'lib') - config.round_trip_syntax_test = os.path.join(config.swift_utils, 'round-trip-syntax-test') - - # Find the resource directory. Assume it's near the swift compiler if not set. - test_resource_dir = lit_config.params.get('test_resource_dir') ---- 298,309 ---- - config.gyb = os.path.join(config.swift_utils, 'gyb') - config.rth = os.path.join(config.swift_utils, 'rth') # Resilience test helper - config.scale_test = os.path.join(config.swift_utils, 'scale-test') - config.PathSanitizingFileCheck = os.path.join(config.swift_utils, 'PathSanitizingFileCheck') -! if platform.system() == 'Linux' and platform.machine() == 'x86_64': -! config.swift_lib_dir = os.path.join(os.path.dirname(os.path.dirname(config.swift)), 'lib64') -! else: -! config.swift_lib_dir = os.path.join(os.path.dirname(os.path.dirname(config.swift)), 'lib') - config.round_trip_syntax_test = os.path.join(config.swift_utils, 'round-trip-syntax-test') - - # Find the resource directory. Assume it's near the swift compiler if not set. - test_resource_dir = lit_config.params.get('test_resource_dir') -diff -C 4 -dHrN source/swift/tools/SourceKit/CMakeLists.txt patched/swift/tools/SourceKit/CMakeLists.txt -*** source/swift/tools/SourceKit/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/tools/SourceKit/CMakeLists.txt 2017-10-08 03:05:38.425114059 -0300 -*************** -*** 199,207 **** - - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - if(SOURCEKITLIB_SHARED) - set_target_properties(${name} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -! set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib/swift/linux:/usr/lib/swift/linux") - endif() - endif() - - if("${SOURCEKITLIB_INSTALL_IN_COMPONENT}" STREQUAL "") ---- 199,207 ---- - - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - if(SOURCEKITLIB_SHARED) - set_target_properties(${name} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -! set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib${SWIFT_LIBDIR_SUFFIX}/swift/linux:/usr/lib${SWIFT_LIBDIR_SUFFIX}/swift/linux") - endif() - endif() - - if("${SOURCEKITLIB_INSTALL_IN_COMPONENT}" STREQUAL "") -*************** -*** 537,545 **** - IMPORTED_LOCATION ${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/src/.libs/libdispatch.so) - - add_library(swiftCore SHARED IMPORTED) - set_target_properties(swiftCore PROPERTIES -! IMPORTED_LOCATION ${SOURCEKIT_BINARY_DIR}/lib/swift/linux/libswiftCore.so) - - set(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH TRUE) - endif() - ---- 537,545 ---- - IMPORTED_LOCATION ${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/src/.libs/libdispatch.so) - - add_library(swiftCore SHARED IMPORTED) - set_target_properties(swiftCore PROPERTIES -! IMPORTED_LOCATION ${SOURCEKIT_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}/swift/linux/libswiftCore.so) - - set(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH TRUE) - endif() - -diff -C 4 -dHrN source/swift/tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt patched/swift/tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt -*** source/swift/tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt 2017-10-08 03:07:22.000000000 -0300 -*************** -*** 48,56 **** - - if (SOURCEKIT_BUILT_STANDALONE) - # Create the symlinks necessary to find the swift runtime. - add_custom_command(TARGET sourcekitdInProc PRE_BUILD -! COMMAND ln "-fhs" "${PATH_TO_SWIFT_BUILD}/lib/swift" "${SOURCEKIT_BINARY_DIR}/lib") - endif() - - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - if(SWIFT_COMPILER_VERSION) ---- 48,56 ---- - - if (SOURCEKIT_BUILT_STANDALONE) - # Create the symlinks necessary to find the swift runtime. - add_custom_command(TARGET sourcekitdInProc PRE_BUILD -! COMMAND ln "-fhs" "${PATH_TO_SWIFT_BUILD}/lib${SWIFT_LIBDIR_SUFFIX}/swift" "${SOURCEKIT_BINARY_DIR}/lib${SWIFT_LIBDIR_SUFFIX}") - endif() - - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - if(SWIFT_COMPILER_VERSION) -diff -C 4 -dHrN source/swift/tools/driver/modulewrap_main.cpp patched/swift/tools/driver/modulewrap_main.cpp -*** source/swift/tools/driver/modulewrap_main.cpp 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/tools/driver/modulewrap_main.cpp 2017-10-08 03:27:14.000000000 -0300 -*************** -*** 159,167 **** - // should share its implementation. - SmallString<128> RuntimeResourcePath(MainExecutablePath); - llvm::sys::path::remove_filename(RuntimeResourcePath); // Remove /swift - llvm::sys::path::remove_filename(RuntimeResourcePath); // Remove /bin -! llvm::sys::path::append(RuntimeResourcePath, "lib", "swift"); - SearchPathOpts.RuntimeResourcePath = RuntimeResourcePath.str(); - - SourceManager SrcMgr; - LangOptions LangOpts; ---- 159,171 ---- - // should share its implementation. - SmallString<128> RuntimeResourcePath(MainExecutablePath); - llvm::sys::path::remove_filename(RuntimeResourcePath); // Remove /swift - llvm::sys::path::remove_filename(RuntimeResourcePath); // Remove /bin -! #if defined(__linux__) && defined(__x86_64__) -! llvm::sys::path::append(RuntimeResourcePath, "lib64", "swift"); -! #else -! llvm::sys::path::append(RuntimeResourcePath, "lib", "swift"); -! #endif - SearchPathOpts.RuntimeResourcePath = RuntimeResourcePath.str(); - - SourceManager SrcMgr; - LangOptions LangOpts; -diff -C 4 -dHrN source/swift/utils/build-script-impl patched/swift/utils/build-script-impl -*** source/swift/utils/build-script-impl 2017-09-19 16:16:36.000000000 -0300 ---- patched/swift/utils/build-script-impl 2017-10-08 03:39:17.000000000 -0300 -*************** -*** 1946,1953 **** ---- 1946,1964 ---- - # Add any specific cmake options specified by build-script - product_cmake_options_name=$(to_varname "${product}")_CMAKE_OPTIONS - product_cmake_options=(${!product_cmake_options_name}) # convert to array - cmake_options+=("${product_cmake_options[@]}") -+ -+ LIBDIR_SUFFIX="" -+ -+ if [ "${host}" == "linux-x86_64" ] ; then -+ LIBDIR_SUFFIX="64" -+ cmake_options+=( -+ -DLLVM_LIBDIR_SUFFIX="64" -+ -DCLANG_LIBDIR_SUFFIX="64" -+ -DSWIFT_LIBDIR_SUFFIX="64" -+ ) -+ fi - - case ${product} in - cmark) - cmake_options=( -*************** -*** 2477,2485 **** - libicu) - SWIFT_BUILD_PATH=$(build_directory ${host} swift) - LIBICU_BUILD_DIR=$(build_directory ${host} ${product}) - ICU_TMPINSTALL=$LIBICU_BUILD_DIR/tmp_install -! ICU_TMPLIBDIR="${SWIFT_BUILD_PATH}/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - if [[ "${RECONFIGURE}" || ! -f "${LIBICU_BUILD_DIR}"/config.status ]]; then - echo "Reconfiguring libicu" - if [[ "$LIBICU_BUILD_TYPE" == "Release" ]] ; then - icu_build_variant_arg="--enable-release" ---- 2488,2496 ---- - libicu) - SWIFT_BUILD_PATH=$(build_directory ${host} swift) - LIBICU_BUILD_DIR=$(build_directory ${host} ${product}) - ICU_TMPINSTALL=$LIBICU_BUILD_DIR/tmp_install -! ICU_TMPLIBDIR="${SWIFT_BUILD_PATH}/lib${LIBDIR_SUFFIX}/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - if [[ "${RECONFIGURE}" || ! -f "${LIBICU_BUILD_DIR}"/config.status ]]; then - echo "Reconfiguring libicu" - if [[ "$LIBICU_BUILD_TYPE" == "Release" ]] ; then - icu_build_variant_arg="--enable-release" -*************** -*** 2501,2511 **** - echo "Skipping reconfiguration of libicu" - fi - with_pushd "${LIBICU_BUILD_DIR}" \ - call make install -! ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" -! ICU_LIBDIR_STATIC="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}" -! ICU_LIBDIR_STATIC_ARCH="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - mkdir -p "${ICU_LIBDIR_STATIC_ARCH}" - # Copy the static libs into the swift_static directory - for l in uc i18n data - do ---- 2512,2522 ---- - echo "Skipping reconfiguration of libicu" - fi - with_pushd "${LIBICU_BUILD_DIR}" \ - call make install -! ICU_LIBDIR="$(build_directory ${host} swift)/lib${LIBDIR_SUFFIX}/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" -! ICU_LIBDIR_STATIC="$(build_directory ${host} swift)/lib${LIBDIR_SUFFIX}/swift_static/${SWIFT_HOST_VARIANT}" -! ICU_LIBDIR_STATIC_ARCH="$(build_directory ${host} swift)/lib${LIBDIR_SUFFIX}/swift_static/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - mkdir -p "${ICU_LIBDIR_STATIC_ARCH}" - # Copy the static libs into the swift_static directory - for l in uc i18n data - do -*************** -*** 2756,2764 **** - - call mkdir -p "${results_dir}" - with_pushd "${results_dir}" \ - call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \ -! SWIFTLIBS="${swift_build_dir}/lib/swift" \ - "${LLDB_SOURCE_DIR}"/test/dotest.py \ - --executable "${lldb_executable}" \ - --rerun-all-issues \ - ${LLDB_TEST_SUBDIR_CLAUSE} \ ---- 2767,2775 ---- - - call mkdir -p "${results_dir}" - with_pushd "${results_dir}" \ - call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \ -! SWIFTLIBS="${swift_build_dir}/lib${LIBDIR_SUFFIX}/swift" \ - "${LLDB_SOURCE_DIR}"/test/dotest.py \ - --executable "${lldb_executable}" \ - --rerun-all-issues \ - ${LLDB_TEST_SUBDIR_CLAUSE} \ -*************** -*** 2831,2839 **** - build_dir=$(build_directory ${host} ${product}) - XCTEST_BUILD_DIR=$(build_directory ${host} xctest) - with_pushd "${FOUNDATION_SOURCE_DIR}" \ - call ${NINJA_BIN} TestFoundation -! call env LD_LIBRARY_PATH="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"/lib/swift/:"${build_dir}/Foundation":"${XCTEST_BUILD_DIR}""${LIBDISPATCH_LIB_DIR}":${LD_LIBRARY_PATH} "${build_dir}"/TestFoundation/TestFoundation - echo "--- Finished tests for ${product} ---" - continue - ;; - libdispatch) ---- 2842,2850 ---- - build_dir=$(build_directory ${host} ${product}) - XCTEST_BUILD_DIR=$(build_directory ${host} xctest) - with_pushd "${FOUNDATION_SOURCE_DIR}" \ - call ${NINJA_BIN} TestFoundation -! call env LD_LIBRARY_PATH="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"/lib${LIBDIR_SUFFIX}/swift/:"${build_dir}/Foundation":"${XCTEST_BUILD_DIR}""${LIBDISPATCH_LIB_DIR}":${LD_LIBRARY_PATH} "${build_dir}"/TestFoundation/TestFoundation - echo "--- Finished tests for ${product} ---" - continue - ;; - libdispatch) -*************** -*** 2858,2866 **** - echo "--- Finished tests for ${product} ---" - continue - ;; - playgroundlogger) -! SWIFT_DYLIB_PATH=$(build_directory ${host} swift)/lib/swift/macosx/ - PLAYGROUNDLOGGER_FRAMEWORK_PATH=$(build_directory ${host} ${product}) - set -x - pushd "${PLAYGROUNDLOGGER_FRAMEWORK_PATH}" - DYLD_LIBRARY_PATH=$SWIFT_DYLIB_PATH DYLD_FRAMEWORK_PATH=$PLAYGROUNDLOGGER_FRAMEWORK_PATH ./PlaygroundLogger_TestDriver ---- 2869,2877 ---- - echo "--- Finished tests for ${product} ---" - continue - ;; - playgroundlogger) -! SWIFT_DYLIB_PATH=$(build_directory ${host} swift)/lib${LIBDIR_SUFFIX}/swift/macosx/ - PLAYGROUNDLOGGER_FRAMEWORK_PATH=$(build_directory ${host} ${product}) - set -x - pushd "${PLAYGROUNDLOGGER_FRAMEWORK_PATH}" - DYLD_LIBRARY_PATH=$SWIFT_DYLIB_PATH DYLD_FRAMEWORK_PATH=$PLAYGROUNDLOGGER_FRAMEWORK_PATH ./PlaygroundLogger_TestDriver -*************** -*** 3049,3057 **** - esac - - echo "--- Installing ${product} ---" - XCTEST_BUILD_DIR=$(build_directory ${host} xctest) -! XCTEST_INSTALL_PREFIX="${host_install_destdir}${host_install_prefix}/lib/swift/${LIB_TARGET}" - # Note that installing directly to /usr/lib/swift usually - # requires root permissions. - call "${XCTEST_SOURCE_DIR}"/build_script.py install \ - --library-install-path="${XCTEST_INSTALL_PREFIX}" \ ---- 3060,3068 ---- - esac - - echo "--- Installing ${product} ---" - XCTEST_BUILD_DIR=$(build_directory ${host} xctest) -! XCTEST_INSTALL_PREFIX="${host_install_destdir}${host_install_prefix}/lib${LIBDIR_SUFFIX}/swift/${LIB_TARGET}" - # Note that installing directly to /usr/lib/swift usually - # requires root permissions. - call "${XCTEST_SOURCE_DIR}"/build_script.py install \ - --library-install-path="${XCTEST_INSTALL_PREFIX}" \ -*************** -*** 3107,3117 **** - exit 1 - fi - echo "--- Installing ${product} ---" - LIBICU_BUILD_DIR=$(build_directory ${host} ${product}) -! ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" -! LIBICU_DEST_DIR="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})lib/swift/${SWIFT_HOST_VARIANT}" -! LIBICU_DEST_DIR_STATIC="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})lib/swift_static/${SWIFT_HOST_VARIANT}" - mkdir -p ${LIBICU_DEST_DIR} - mkdir -p ${LIBICU_DEST_DIR_STATIC} - for l in uc i18n data - do ---- 3118,3128 ---- - exit 1 - fi - echo "--- Installing ${product} ---" - LIBICU_BUILD_DIR=$(build_directory ${host} ${product}) -! ICU_LIBDIR="$(build_directory ${host} swift)/lib${LIBDIR_SUFFIX}/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" -! LIBICU_DEST_DIR="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})lib${LIBDIR_SUFFIX}/swift/${SWIFT_HOST_VARIANT}" -! LIBICU_DEST_DIR_STATIC="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})lib${LIBDIR_SUFFIX}/swift_static/${SWIFT_HOST_VARIANT}" - mkdir -p ${LIBICU_DEST_DIR} - mkdir -p ${LIBICU_DEST_DIR_STATIC} - for l in uc i18n data - do -*************** -*** 3140,3148 **** - # requires root permissions. - set -x - case "$(uname -s)" in - Linux) -! PLAYGROUNDLOGGER_INSTALL_DIR="$(get_host_install_destdir ${host})/$(get_host_install_prefix ${host})/lib/swift/linux" - mkdir -p "${PLAYGROUNDLOGGER_INSTALL_DIR}" - cp -R "${PLAYGROUNDLOGGER_BUILD_DIR}"/libPlaygroundLogger.so "${PLAYGROUNDLOGGER_INSTALL_DIR}" - ;; - Darwin) ---- 3151,3159 ---- - # requires root permissions. - set -x - case "$(uname -s)" in - Linux) -! PLAYGROUNDLOGGER_INSTALL_DIR="$(get_host_install_destdir ${host})/$(get_host_install_prefix ${host})/lib${LIBDIR_SUFFIX}/swift/linux" - mkdir -p "${PLAYGROUNDLOGGER_INSTALL_DIR}" - cp -R "${PLAYGROUNDLOGGER_BUILD_DIR}"/libPlaygroundLogger.so "${PLAYGROUNDLOGGER_INSTALL_DIR}" - ;; - Darwin) -diff -C 4 -dHrN source/swift-corelibs-foundation/TestFoundation/TestURLSession.swift patched/swift-corelibs-foundation/TestFoundation/TestURLSession.swift -*** source/swift-corelibs-foundation/TestFoundation/TestURLSession.swift 2017-09-06 08:05:17.000000000 -0300 ---- patched/swift-corelibs-foundation/TestFoundation/TestURLSession.swift 2017-10-28 12:57:02.231796508 -0200 -*************** -*** 29,37 **** - ("test_downloadTaskWithURLAndHandler", test_downloadTaskWithURLAndHandler), - ("test_finishTaskAndInvalidate", test_finishTasksAndInvalidate), - ("test_taskError", test_taskError), - ("test_taskCopy", test_taskCopy), -! ("test_cancelTask", test_cancelTask), - ("test_taskTimeout", test_taskTimeout), - ("test_verifyRequestHeaders", test_verifyRequestHeaders), - ("test_verifyHttpAdditionalHeaders", test_verifyHttpAdditionalHeaders), - ("test_timeoutInterval", test_timeoutInterval), ---- 29,37 ---- - ("test_downloadTaskWithURLAndHandler", test_downloadTaskWithURLAndHandler), - ("test_finishTaskAndInvalidate", test_finishTasksAndInvalidate), - ("test_taskError", test_taskError), - ("test_taskCopy", test_taskCopy), -! // ("test_cancelTask", test_cancelTask), - ("test_taskTimeout", test_taskTimeout), - ("test_verifyRequestHeaders", test_verifyRequestHeaders), - ("test_verifyHttpAdditionalHeaders", test_verifyHttpAdditionalHeaders), - ("test_timeoutInterval", test_timeoutInterval), -diff -C 4 -dHrN source/swift-corelibs-foundation/build.py patched/swift-corelibs-foundation/build.py -*** source/swift-corelibs-foundation/build.py 2017-09-06 08:05:17.000000000 -0300 ---- patched/swift-corelibs-foundation/build.py 2017-10-14 22:27:11.053681743 -0300 -*************** -*** 31,38 **** ---- 31,43 ---- - - if Configuration.current.build_mode == Configuration.Debug: - foundation.LDFLAGS += ' -lswiftSwiftOnoneSupport ' - -+ libdir = 'lib' -+ -+ if Configuration.current.target.sdk == OSType.Linux and Configuration.current.target.arch == ArchType.x86_64: -+ libdir = 'lib64' -+ - foundation.ASFLAGS = " ".join([ - '-DCF_CHARACTERSET_BITMAP=\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\"', - '-DCF_CHARACTERSET_UNICHAR_DB=\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\"', - '-DCF_CHARACTERSET_UNICODE_DATA_B=\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\"', -*************** -*** 40,53 **** - ]) - - # For now, we do not distinguish between public and private headers (they are all private to Foundation) - # These are really part of CF, which should ultimately be a separate target -! foundation.ROOT_HEADERS_FOLDER_PATH = "${PREFIX}/lib/swift" -! foundation.PUBLIC_HEADERS_FOLDER_PATH = "${PREFIX}/lib/swift/CoreFoundation" -! foundation.PRIVATE_HEADERS_FOLDER_PATH = "${PREFIX}/lib/swift/CoreFoundation" -! foundation.PROJECT_HEADERS_FOLDER_PATH = "${PREFIX}/lib/swift/CoreFoundation" - -! foundation.PUBLIC_MODULE_FOLDER_PATH = "${PREFIX}/lib/swift/CoreFoundation" - - foundation.CFLAGS += " ".join([ - '-DU_SHOW_DRAFT_API', - '-DCF_BUILDING_CF', ---- 45,58 ---- - ]) - - # For now, we do not distinguish between public and private headers (they are all private to Foundation) - # These are really part of CF, which should ultimately be a separate target -! foundation.ROOT_HEADERS_FOLDER_PATH = "${PREFIX}/" + libdir + "/swift" -! foundation.PUBLIC_HEADERS_FOLDER_PATH = "${PREFIX}/" + libdir + "/swift/CoreFoundation" -! foundation.PRIVATE_HEADERS_FOLDER_PATH = "${PREFIX}/" + libdir + "/swift/CoreFoundation" -! foundation.PROJECT_HEADERS_FOLDER_PATH = "${PREFIX}/" + libdir + "/swift/CoreFoundation" - -! foundation.PUBLIC_MODULE_FOLDER_PATH = "${PREFIX}/" + libdir + "/swift/CoreFoundation" - - foundation.CFLAGS += " ".join([ - '-DU_SHOW_DRAFT_API', - '-DCF_BUILDING_CF', -*************** -*** 64,72 **** - '-I./', - ]) - - swift_cflags += [ -! '-I${BUILD_DIR}/Foundation/usr/lib/swift', - ] - - if "XCTEST_BUILD_DIR" in Configuration.current.variables: - swift_cflags += [ ---- 69,77 ---- - '-I./', - ]) - - swift_cflags += [ -! '-I${BUILD_DIR}/Foundation/usr/' + libdir + '/swift', - ] - - if "XCTEST_BUILD_DIR" in Configuration.current.variables: - swift_cflags += [ -*************** -*** 538,554 **** - Configuration.current.variables["LIBS_DIRS"] = LIBS_DIRS - - extra_script = """ - rule InstallFoundation -! command = mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $ -! cp "${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $ -! mkdir -p "${DSTROOT}/${PREFIX}/lib/swift_static/${OS}"; $ -! cp "${BUILD_DIR}/Foundation/${STATICLIB_PREFIX}Foundation${STATICLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/lib/swift_static/${OS}"; $ -! mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}"; $ -! cp "${BUILD_DIR}/Foundation/Foundation.swiftmodule" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $ -! cp "${BUILD_DIR}/Foundation/Foundation.swiftdoc" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $ - mkdir -p "${DSTROOT}/${PREFIX}/local/include"; $ -! rsync -a "${BUILD_DIR}/Foundation/${PREFIX}/lib/swift/CoreFoundation" "${DSTROOT}/${PREFIX}/lib/swift/" - - build ${BUILD_DIR}/.install: InstallFoundation ${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX} - - build install: phony | ${BUILD_DIR}/.install ---- 543,559 ---- - Configuration.current.variables["LIBS_DIRS"] = LIBS_DIRS - - extra_script = """ - rule InstallFoundation -! command = mkdir -p "${DSTROOT}/${PREFIX}/""" + libdir + """/swift/${OS}"; $ -! cp "${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/""" + libdir + """/swift/${OS}"; $ -! mkdir -p "${DSTROOT}/${PREFIX}/""" + libdir + """/swift_static/${OS}"; $ -! cp "${BUILD_DIR}/Foundation/${STATICLIB_PREFIX}Foundation${STATICLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/""" + libdir + """/swift_static/${OS}"; $ -! mkdir -p "${DSTROOT}/${PREFIX}/""" + libdir + """/swift/${OS}/${ARCH}"; $ -! cp "${BUILD_DIR}/Foundation/Foundation.swiftmodule" "${DSTROOT}/${PREFIX}/""" + libdir + """/swift/${OS}/${ARCH}/"; $ -! cp "${BUILD_DIR}/Foundation/Foundation.swiftdoc" "${DSTROOT}/${PREFIX}/""" + libdir + """/swift/${OS}/${ARCH}/"; $ - mkdir -p "${DSTROOT}/${PREFIX}/local/include"; $ -! rsync -a "${BUILD_DIR}/Foundation/${PREFIX}/""" + libdir + """/swift/CoreFoundation" "${DSTROOT}/${PREFIX}/""" + libdir + """/swift/" - - build ${BUILD_DIR}/.install: InstallFoundation ${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX} - - build install: phony | ${BUILD_DIR}/.install -diff -C 4 -dHrN source/swift-corelibs-foundation/lib/product.py patched/swift-corelibs-foundation/lib/product.py -*** source/swift-corelibs-foundation/lib/product.py 2017-09-06 08:05:17.000000000 -0300 ---- patched/swift-corelibs-foundation/lib/product.py 2017-10-19 16:41:26.664235099 -0200 -*************** -*** 13,20 **** ---- 13,21 ---- - from .phases import Assemble - from .phases import BuildAction - from .phases import MergeSwiftModule - from .target import OSType -+ from .target import ArchType - from .path import Path - - import os - -*************** -*** 117,125 **** - - def generate(self, objects = []): - self.rule = "Link" - self.product_name = Configuration.current.target.dynamic_library_prefix + self.name + Configuration.current.target.dynamic_library_suffix -! if Configuration.current.target.sdk == OSType.Linux or Configuration.current.target.sdk == OSType.FreeBSD: - self.conformance_begin = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_begin.o' - self.conformance_end = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_end.o' - return Library.generate(self, ["-shared", "-Wl,-soname," + self.product_name, "-Wl,--no-undefined"], objects) - else: ---- 118,130 ---- - - def generate(self, objects = []): - self.rule = "Link" - self.product_name = Configuration.current.target.dynamic_library_prefix + self.name + Configuration.current.target.dynamic_library_suffix -! if Configuration.current.target.sdk == OSType.Linux and Configuration.current.target.arch == ArchType.x86_64: -! self.conformance_begin = '${SDKROOT}/lib64/swift/${OS}/${ARCH}/swift_begin.o' -! self.conformance_end = '${SDKROOT}/lib64/swift/${OS}/${ARCH}/swift_end.o' -! return Library.generate(self, ["-shared", "-Wl,-soname," + self.product_name, "-Wl,--no-undefined"], objects) -! elif Configuration.current.target.sdk == OSType.Linux or Configuration.current.target.sdk == OSType.FreeBSD: - self.conformance_begin = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_begin.o' - self.conformance_end = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_end.o' - return Library.generate(self, ["-shared", "-Wl,-soname," + self.product_name, "-Wl,--no-undefined"], objects) - else: -diff -C 4 -dHrN source/swift-corelibs-foundation/lib/script.py patched/swift-corelibs-foundation/lib/script.py -*** source/swift-corelibs-foundation/lib/script.py 2017-09-06 08:05:17.000000000 -0300 ---- patched/swift-corelibs-foundation/lib/script.py 2017-10-14 22:13:16.000000000 -0300 -*************** -*** 7,14 **** ---- 7,23 ---- - # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors - # - - from .config import Configuration -+ -+ from .target import ArchSubType -+ from .target import ArchType -+ from .target import EnvironmentType -+ from .target import ObjectFormat -+ from .target import OSType -+ from .target import Target -+ from .target import Vendor -+ - import os - - class Script: - products = [] -*************** -*** 102,111 **** - c_flags += """ -I${BOOTSTRAP_DIR}/usr/include -I${BOOTSTRAP_DIR}/usr/local/include """ - c_flags += """ -I${TARGET_BOOTSTRAP_DIR}/usr/include -I${TARGET_BOOTSTRAP_DIR}/usr/local/include """ - - c_flags += Configuration.current.extra_c_flags - -! swift_flags = "\nTARGET_SWIFTCFLAGS = -I${SDKROOT}/lib/swift/" + Configuration.current.target.swift_sdk_name + " -Xcc -fblocks -resource-dir ${SDKROOT}/lib/swift " - if swift_triple is not None: - swift_flags += "-target ${SWIFT_TARGET} " - if Configuration.current.system_root is not None: - swift_flags += "-sdk ${SYSROOT} " ---- 111,125 ---- - c_flags += """ -I${BOOTSTRAP_DIR}/usr/include -I${BOOTSTRAP_DIR}/usr/local/include """ - c_flags += """ -I${TARGET_BOOTSTRAP_DIR}/usr/include -I${TARGET_BOOTSTRAP_DIR}/usr/local/include """ - - c_flags += Configuration.current.extra_c_flags -+ -+ libdir = 'lib' - -! if Configuration.current.target.sdk == OSType.Linux and Configuration.current.target.arch == ArchType.x86_64: -! libdir = 'lib64' -! -! swift_flags = "\nTARGET_SWIFTCFLAGS = -I${SDKROOT}/" + libdir + "/swift/" + Configuration.current.target.swift_sdk_name + " -Xcc -fblocks -resource-dir ${SDKROOT}/" + libdir + "/swift " - if swift_triple is not None: - swift_flags += "-target ${SWIFT_TARGET} " - if Configuration.current.system_root is not None: - swift_flags += "-sdk ${SYSROOT} " -*************** -*** 121,129 **** - - swift_flags += Configuration.current.extra_swift_flags - - swift_flags += """ -! TARGET_SWIFTEXE_FLAGS = -I${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """ - if Configuration.current.build_mode == Configuration.Debug: - swift_flags += "-g -Onone -enable-testing " - elif Configuration.current.build_mode == Configuration.Release: - swift_flags += " " ---- 135,143 ---- - - swift_flags += Configuration.current.extra_swift_flags - - swift_flags += """ -! TARGET_SWIFTEXE_FLAGS = -I${SDKROOT}/""" + libdir + """/swift/""" + Configuration.current.target.swift_sdk_name + """ -L${SDKROOT}/""" + libdir + """/swift/""" + Configuration.current.target.swift_sdk_name + """ """ - if Configuration.current.build_mode == Configuration.Debug: - swift_flags += "-g -Onone -enable-testing " - elif Configuration.current.build_mode == Configuration.Release: - swift_flags += " " -*************** -*** 134,142 **** - ld_flags = """ - EXTRA_LD_FLAGS = """ + Configuration.current.extra_ld_flags - - ld_flags += """ -! TARGET_LDFLAGS = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """ - if Configuration.current.system_root is not None: - ld_flags += "--sysroot=${SYSROOT}" - - if Configuration.current.bootstrap_directory is not None: ---- 148,156 ---- - ld_flags = """ - EXTRA_LD_FLAGS = """ + Configuration.current.extra_ld_flags - - ld_flags += """ -! TARGET_LDFLAGS = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/""" + libdir + """/swift/""" + Configuration.current.target.swift_sdk_name + """ """ - if Configuration.current.system_root is not None: - ld_flags += "--sysroot=${SYSROOT}" - - if Configuration.current.bootstrap_directory is not None: -diff -C 4 -dHrN source/swift-corelibs-libdispatch/configure.ac patched/swift-corelibs-libdispatch/configure.ac -*** source/swift-corelibs-libdispatch/configure.ac 2017-09-18 17:56:07.000000000 -0300 ---- patched/swift-corelibs-libdispatch/configure.ac 2017-10-08 03:21:12.000000000 -0300 -*************** -*** 199,211 **** - *) - os_string=$target_os - ;; - esac -! SWIFT_LIBDIR="$swift_toolchain_path/lib/swift/$os_string/$target_cpu" - have_swift=true], - [have_swift=false] - ) - AM_CONDITIONAL(HAVE_SWIFT, $have_swift) - AC_SUBST([SWIFTC]) - AC_SUBST([SWIFTC_FLAGS]) - AC_SUBST([SWIFT_LIBDIR]) - AC_SUBST([OS_STRING], ["$os_string"]) ---- 199,217 ---- - *) - os_string=$target_os - ;; - esac -! AS_IF([test "$os_string" = "linux"], [ -! AS_IF([test "$target_cpu" = "x86_64"], -! [libdir_suffix="64"],[libdir_suffix=""])], -! [AC_MSG_NOTICE([Using lib instead of lib64])]) -! SWIFT_LIBDIR="$swift_toolchain_path/lib$libdir_suffix/swift/$os_string/$target_cpu" -! AC_MSG_NOTICE([The Swift libdir is: $SWIFT_LIBDIR]) - have_swift=true], - [have_swift=false] - ) - AM_CONDITIONAL(HAVE_SWIFT, $have_swift) -+ AM_CONDITIONAL(HAVE_X64, [test "$libdir_suffix" = "64"]) - AC_SUBST([SWIFTC]) - AC_SUBST([SWIFTC_FLAGS]) - AC_SUBST([SWIFT_LIBDIR]) - AC_SUBST([OS_STRING], ["$os_string"]) -diff -C 4 -dHrN source/swift-corelibs-libdispatch/dispatch/Makefile.am patched/swift-corelibs-libdispatch/dispatch/Makefile.am -*** source/swift-corelibs-libdispatch/dispatch/Makefile.am 2017-09-18 17:56:07.000000000 -0300 ---- patched/swift-corelibs-libdispatch/dispatch/Makefile.am 2017-10-16 20:26:47.000000000 -0200 -*************** -*** 1,12 **** - # - # - # - -! if HAVE_SWIFT -! dispatchdir=${prefix}/lib/swift/dispatch -! else - dispatchdir=$(includedir)/dispatch - endif - - dispatch_HEADERS= \ - base.h \ ---- 1,16 ---- - # - # - # - -! if !HAVE_SWIFT - dispatchdir=$(includedir)/dispatch -+ else -+ if HAVE_X64 -+ dispatchdir=${prefix}/lib64/swift/dispatch -+ else -+ dispatchdir=${prefix}/lib/swift/dispatch -+ endif - endif - - dispatch_HEADERS= \ - base.h \ -diff -C 4 -dHrN source/swift-corelibs-libdispatch/os/Makefile.am patched/swift-corelibs-libdispatch/os/Makefile.am -*** source/swift-corelibs-libdispatch/os/Makefile.am 2017-09-18 17:56:07.000000000 -0300 ---- patched/swift-corelibs-libdispatch/os/Makefile.am 2017-10-16 20:38:04.000000000 -0200 -*************** -*** 1,13 **** - # - # - # - -! if HAVE_SWIFT -! osdir=${prefix}/lib/swift/os -! else - osdir=$(includedir)/os - endif - - os_HEADERS= \ - object.h \ - linux_base.h ---- 1,18 ---- - # - # - # - -! if !HAVE_SWIFT - osdir=$(includedir)/os -+ else -+ if HAVE_X64 -+ osdir=${prefix}/lib64/swift/os -+ else -+ osdir=${prefix}/lib/swift/os - endif -+ endif -+ - - os_HEADERS= \ - object.h \ - linux_base.h -diff -C 4 -dHrN source/swift-corelibs-libdispatch/src/Makefile.am patched/swift-corelibs-libdispatch/src/Makefile.am -*** source/swift-corelibs-libdispatch/src/Makefile.am 2017-09-18 17:56:07.000000000 -0300 ---- patched/swift-corelibs-libdispatch/src/Makefile.am 2017-10-16 20:45:40.410569816 -0200 -*************** -*** 1,13 **** - # - # - # - -! if HAVE_SWIFT -! swiftlibdir=${prefix}/lib/swift/${OS_STRING} - swiftlib_LTLIBRARIES=libdispatch.la - else -! lib_LTLIBRARIES=libdispatch.la - endif - - if DISPATCH_USE_INTERNAL_WORKQUEUE - INTERNAL_WORKQUEUE_SOURCES= \ ---- 1,18 ---- - # - # - # - -! if !HAVE_SWIFT -! lib_LTLIBRARIES=libdispatch.la -! else -! if HAVE_X64 -! swiftlibdir=${prefix}/lib64/swift/${OS_STRING} - swiftlib_LTLIBRARIES=libdispatch.la - else -! swiftlibdir=${prefix}/lib/swift/${OS_STRING} -! swiftlib_LTLIBRARIES=libdispatch.la -! endif - endif - - if DISPATCH_USE_INTERNAL_WORKQUEUE - INTERNAL_WORKQUEUE_SOURCES= \ -*************** -*** 186,195 **** - SWIFT_GEN_FILES= \ - $(abs_builddir)/swift/Dispatch.swiftmodule \ - $(abs_builddir)/swift/Dispatch.swiftdoc \ - $(SWIFT_OBJ_FILES) - -- swiftmoddir=${prefix}/lib/swift/${OS_STRING}/${target_cpu} - swiftmod_HEADERS=\ - $(abs_builddir)/swift/Dispatch.swiftmodule \ - $(abs_builddir)/swift/Dispatch.swiftdoc - endif ---- 191,205 ---- - SWIFT_GEN_FILES= \ - $(abs_builddir)/swift/Dispatch.swiftmodule \ - $(abs_builddir)/swift/Dispatch.swiftdoc \ - $(SWIFT_OBJ_FILES) -+ -+ if HAVE_X64 -+ swiftmoddir=${prefix}/lib64/swift/${OS_STRING}/${host_cpu} -+ else -+ swiftmoddir=${prefix}/lib/swift/${OS_STRING}/${host_cpu} -+ endif - - swiftmod_HEADERS=\ - $(abs_builddir)/swift/Dispatch.swiftmodule \ - $(abs_builddir)/swift/Dispatch.swiftdoc - endif -diff -C 4 -dHrN source/swift-corelibs-xctest/build_script.py patched/swift-corelibs-xctest/build_script.py -*** source/swift-corelibs-xctest/build_script.py 2017-07-29 13:13:08.000000000 -0300 ---- patched/swift-corelibs-xctest/build_script.py 2017-10-14 22:34:14.780348984 -0300 -*************** -*** 340,349 **** - are placed in 'usr/lib/swift'. Note that it's technically not necessary to - include this extra path when linking the installed Swift's - 'usr/lib/swift/linux/libFoundation.so'. - """ -! return os.path.join(foundation_build_dir, -! foundation_install_prefix.strip("/"), 'lib', 'swift') - - @staticmethod - def static_lib_build_dir(build_dir): - """ ---- 340,353 ---- - are placed in 'usr/lib/swift'. Note that it's technically not necessary to - include this extra path when linking the installed Swift's - 'usr/lib/swift/linux/libFoundation.so'. - """ -! if platform.system() == 'Linux' and platform.machine() == 'x86_64': -! return os.path.join(foundation_build_dir, -! foundation_install_prefix.strip("/"), 'lib64', 'swift') -! else: -! return os.path.join(foundation_build_dir, -! foundation_install_prefix.strip("/"), 'lib', 'swift') - - @staticmethod - def static_lib_build_dir(build_dir): - """ -diff -C 4 -dHrN source/swiftpm/Sources/Commands/UserToolchain.swift patched/swiftpm/Sources/Commands/UserToolchain.swift -*** source/swiftpm/Sources/Commands/UserToolchain.swift 2017-08-01 02:34:31.000000000 -0300 ---- patched/swiftpm/Sources/Commands/UserToolchain.swift 2017-10-19 15:40:46.617563492 -0200 -*************** -*** 119,129 **** ---- 119,137 ---- - "-target", destination.target, - "--sysroot", destination.sdk.asString - ] + destination.extraCCFlags - -+ #if os(Linux) && arch(x86_64) -+ manifestResources = UserManifestResources( -+ swiftCompiler: swiftCompiler, -+ libDir: binDir.parentDirectory.appending(components: "lib64", "swift", "pm"), -+ sdkRoot: self.destination.sdk -+ ) -+ #else - manifestResources = UserManifestResources( - swiftCompiler: swiftCompiler, - libDir: binDir.parentDirectory.appending(components: "lib", "swift", "pm"), - sdkRoot: self.destination.sdk - ) -+ #endif - } - } -diff -C 4 -dHrN source/swiftpm/Tests/PackageLoadingTests/PkgConfigTests.swift patched/swiftpm/Tests/PackageLoadingTests/PkgConfigTests.swift -*** source/swiftpm/Tests/PackageLoadingTests/PkgConfigTests.swift 2017-08-01 02:34:31.000000000 -0300 ---- patched/swiftpm/Tests/PackageLoadingTests/PkgConfigTests.swift 2017-10-26 00:59:25.467746121 -0200 -*************** -*** 55,63 **** - XCTAssertEqual(names, ["libFoo"]) - case .aptItem(let names)?: - XCTAssertEqual(names, ["libFoo-dev"]) - case nil: -! XCTFail("Expected a provider here") - } - XCTAssertTrue(result.couldNotFindConfigFile) - switch result.error { - case PkgConfigError.couldNotFindConfigFile?: break ---- 55,63 ---- - XCTAssertEqual(names, ["libFoo"]) - case .aptItem(let names)?: - XCTAssertEqual(names, ["libFoo-dev"]) - case nil: -! XCTAssertEqual("0", "0") - } - XCTAssertTrue(result.couldNotFindConfigFile) - switch result.error { - case PkgConfigError.couldNotFindConfigFile?: break -diff -C 4 -dHrN source/swiftpm/Utilities/bootstrap patched/swiftpm/Utilities/bootstrap -*** source/swiftpm/Utilities/bootstrap 2017-08-01 02:34:31.000000000 -0300 ---- patched/swiftpm/Utilities/bootstrap 2017-10-19 20:57:40.007589305 -0200 -*************** -*** 123,132 **** ---- 123,135 ---- - g_default_sysroot = subprocess.check_output( - ["xcrun", "--sdk", "macosx", "--show-sdk-path"], - universal_newlines=True).strip() - -+ g_libdir = "lib" - if platform.system() == 'Linux': - g_shared_lib_ext = ".so" -+ if platform.machine() == "x86_64": -+ g_libdir = "lib64" - else: - g_shared_lib_ext = ".dylib" - - -*************** -*** 248,258 **** - - if args.foundation_path: - import_paths.append(args.foundation_path) - import_paths.append(os.path.join(args.foundation_path, -! "usr/lib/swift/CoreFoundation")) - import_paths.append(os.path.join(args.foundation_path, -! "usr/lib/swift")) - if args.libdispatch_build_dir: - import_paths.append(os.path.join(args.libdispatch_build_dir, - "src")) - import_paths.append(os.path.join(args.libdispatch_build_dir, ---- 251,261 ---- - - if args.foundation_path: - import_paths.append(args.foundation_path) - import_paths.append(os.path.join(args.foundation_path, -! "usr/" + g_libdir + "/swift/CoreFoundation")) - import_paths.append(os.path.join(args.foundation_path, -! "usr/"+ g_libdir + "/swift")) - if args.libdispatch_build_dir: - import_paths.append(os.path.join(args.libdispatch_build_dir, - "src")) - import_paths.append(os.path.join(args.libdispatch_build_dir, -*************** -*** 453,461 **** - - # Compute output directories paths. - self.output_file = os.path.join(sandbox_path, "build.yaml") - self.inc_dir = os.path.join(sandbox_path, "inc") -! self.lib_dir = os.path.join(sandbox_path, "lib") - self.bin_dir = os.path.join(sandbox_path, "bin") - self.module_dir = os.path.join(sandbox_path, "modules") - self.targets = targets - self.target_map = dict((t.name, t) for t in targets) ---- 456,464 ---- - - # Compute output directories paths. - self.output_file = os.path.join(sandbox_path, "build.yaml") - self.inc_dir = os.path.join(sandbox_path, "inc") -! self.lib_dir = os.path.join(sandbox_path, g_libdir) - self.bin_dir = os.path.join(sandbox_path, "bin") - self.module_dir = os.path.join(sandbox_path, "modules") - self.targets = targets - self.target_map = dict((t.name, t) for t in targets) -*************** -*** 568,576 **** - for lib in target.extra_libs: - link_command.extend(["-Xlinker", "-l%s" % (lib,)]) - if platform.system() == 'Linux': - link_command.extend( -! ["-Xlinker", "-rpath=$ORIGIN/../lib/swift/linux"]) - if self.args.foundation_path: - link_command.extend(["-L", self.args.foundation_path]) - if self.args.libdispatch_build_dir: - link_command.extend(["-L", os.path.join(self.args.libdispatch_build_dir, "src", ".libs")]) ---- 571,579 ---- - for lib in target.extra_libs: - link_command.extend(["-Xlinker", "-l%s" % (lib,)]) - if platform.system() == 'Linux': - link_command.extend( -! ["-Xlinker", "-rpath=$ORIGIN/../" + g_libdir + "/swift/linux"]) - if self.args.foundation_path: - link_command.extend(["-L", self.args.foundation_path]) - if self.args.libdispatch_build_dir: - link_command.extend(["-L", os.path.join(self.args.libdispatch_build_dir, "src", ".libs")]) -*************** -*** 925,940 **** - - processed_runtimes = {} - for version, build in built_runtimes.items(): - # Path where runtime library will be copied from sandbox. -! lib_path = os.path.join(sandbox_path, "lib", "swift", "pm", version) - - # Stage the stage1 runtime library. - processed_runtimes[version] = process_runtime_libraries( - build, args, lib_path) - - -! libdir = os.path.join(target_path, "lib") - bindir = os.path.join(target_path, conf) - mkdir_p(bindir) - bootstrapped_product = os.path.join(bindir, "swift-build-stage1") - ---- 928,943 ---- - - processed_runtimes = {} - for version, build in built_runtimes.items(): - # Path where runtime library will be copied from sandbox. -! lib_path = os.path.join(sandbox_path, g_libdir, "swift", "pm", version) - - # Stage the stage1 runtime library. - processed_runtimes[version] = process_runtime_libraries( - build, args, lib_path) - - -! libdir = os.path.join(target_path, g_libdir) - bindir = os.path.join(target_path, conf) - mkdir_p(bindir) - bootstrapped_product = os.path.join(bindir, "swift-build-stage1") - -*************** -*** 948,959 **** - bootstrapped_product) - if os.path.isdir(libdir) and not os.path.islink(libdir): - # TODO remove, here to prevent revlock incremental CI build failures - shutil.rmtree(libdir) -! symlink_force(os.path.join(sandbox_path, "lib"), target_path) - - if args.foundation_path: -! libswiftdir = os.path.join(sandbox_path, "lib", "swift", "linux") - mkdir_p(libswiftdir) - symlink_force(os.path.join(args.foundation_path, 'libFoundation.so'), - libswiftdir) - if args.libdispatch_build_dir: ---- 951,963 ---- - bootstrapped_product) - if os.path.isdir(libdir) and not os.path.islink(libdir): - # TODO remove, here to prevent revlock incremental CI build failures - shutil.rmtree(libdir) -! -! symlink_force(os.path.join(sandbox_path, g_libdir), target_path) - - if args.foundation_path: -! libswiftdir = os.path.join(sandbox_path, g_libdir, "swift", "linux") - mkdir_p(libswiftdir) - symlink_force(os.path.join(args.foundation_path, 'libFoundation.so'), - libswiftdir) - if args.libdispatch_build_dir: -*************** -*** 972,980 **** - - # We need to embed an RPATH so swift-{build,test} can find the core - # libraries. - if platform.system() == 'Linux': -! embed_rpath = "$ORIGIN/../lib/swift/linux" - else: - embed_rpath = "@executable_path/../lib/swift/macosx" - build_flags.extend(["-Xlinker", "-rpath", "-Xlinker", embed_rpath]) - if args.verbose: ---- 976,984 ---- - - # We need to embed an RPATH so swift-{build,test} can find the core - # libraries. - if platform.system() == 'Linux': -! embed_rpath = "$ORIGIN/../" + g_libdir + "/swift/linux" - else: - embed_rpath = "@executable_path/../lib/swift/macosx" - build_flags.extend(["-Xlinker", "-rpath", "-Xlinker", embed_rpath]) - if args.verbose: -*************** -*** 994,1002 **** - build_flags.extend(["-Xswiftc", "-DHasCustomVersionString"]) - - if args.foundation_path: - core_foundation_path = os.path.join( -! args.foundation_path, "usr", "lib", "swift") - # Tell the linker where to look for XCTest, but autolinking - # knows to pass -lXCTest. - build_flags.extend(["-Xlinker", "-L", "-Xlinker", args.foundation_path]) - # Add an RPATH, so that the tests can be run directly. ---- 998,1006 ---- - build_flags.extend(["-Xswiftc", "-DHasCustomVersionString"]) - - if args.foundation_path: - core_foundation_path = os.path.join( -! args.foundation_path, "usr", g_libdir, "swift") - # Tell the linker where to look for XCTest, but autolinking - # knows to pass -lXCTest. - build_flags.extend(["-Xlinker", "-L", "-Xlinker", args.foundation_path]) - # Add an RPATH, so that the tests can be run directly. -*************** -*** 1071,1079 **** - for install_prefix in args.install_prefixes: - bin_install_path = os.path.join(g_project_root, install_prefix, - "bin") - lib_install_path = os.path.join(g_project_root, install_prefix, -! "lib", "swift", "pm") - libexec_install_path = os.path.join(g_project_root, install_prefix, - "libexec", "swift", "pm") - mkdir_p(bin_install_path) - mkdir_p(lib_install_path) ---- 1075,1083 ---- - for install_prefix in args.install_prefixes: - bin_install_path = os.path.join(g_project_root, install_prefix, - "bin") - lib_install_path = os.path.join(g_project_root, install_prefix, -! g_libdir, "swift", "pm") - libexec_install_path = os.path.join(g_project_root, install_prefix, - "libexec", "swift", "pm") - mkdir_p(bin_install_path) - mkdir_p(lib_install_path) diff --git a/development/swift/swift.SlackBuild b/development/swift/swift.SlackBuild deleted file mode 100644 index 494c9dd1ce..0000000000 --- a/development/swift/swift.SlackBuild +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/bash - -# Slackware build script for swift programming language suite - -# Copyright 2017 Felipe Bugno -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=swift -VERSION=${VERSION:-4.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCVER=swift-${VERSION}-RELEASE - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION - -tar xvf $CWD/swift-$SRCVER.tar.gz -mv swift-$SRCVER swift -tar xvf $CWD/swift-corelibs-foundation-$SRCVER.tar.gz -mv swift-corelibs-foundation-$SRCVER swift-corelibs-foundation -tar xvf $CWD/swift-corelibs-libdispatch-$SRCVER.tar.gz -mv swift-corelibs-libdispatch-$SRCVER swift-corelibs-libdispatch -tar xvf $CWD/swift-corelibs-xctest-$SRCVER.tar.gz -mv swift-corelibs-xctest-$SRCVER swift-corelibs-xctest -tar xvf $CWD/swift-llvm-$SRCVER.tar.gz -mv swift-llvm-$SRCVER llvm -tar xvf $CWD/swift-clang-$SRCVER.tar.gz -mv swift-clang-$SRCVER clang -tar xvf $CWD/swift-lldb-$SRCVER.tar.gz -mv swift-lldb-$SRCVER lldb -tar xvf $CWD/swift-cmark-$SRCVER.tar.gz -mv swift-cmark-$SRCVER cmark -tar xvf $CWD/swift-package-manager-$SRCVER.tar.gz -mv swift-package-manager-$SRCVER swiftpm -tar xvf $CWD/swift-llbuild-$SRCVER.tar.gz -mv swift-llbuild-$SRCVER llbuild -tar xvf $CWD/swift-compiler-rt-$SRCVER.tar.gz -mv swift-compiler-rt-$SRCVER compiler-rt -tar xvf $CWD/swift-integration-tests-$SRCVER.tar.gz -mv swift-integration-tests-$SRCVER swift-integration-tests - -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Currently, we have two problems with swift on non-Ubuntu distros: -# -# 1 - need to fix for /usr/lib64 -# -# 2 - Swift Package Manager on Linux has some Debian/Ubuntu specific stuff. -# The installation script does tests on the package manager using XCTest, -# and of course, it will fail in Slackware because it does not recognize the -# running platform, so they can't determine if we use one of the two providers -# hard coded (APT and Brew). We must override this rule on its XCTest source. -# All other tests should pass. -# -# As a note: it is a useless feature anyway. Swiftpm never install system -# packages by itself neither on Debian or OS X. This feature is only to -# hint to the user about needed system packages, printing in the console -# the brew or apt-get command that he needs to type in order to install a -# system package needed by a swift package. -# -patch -p1 < $CWD/swift-libdir.patch - -cd swift - -utils/build-script \ - -R -l -b -p \ - --xctest \ - --foundation \ - -i \ - --tvos 1 \ - --watchos 1 \ - --no-swift-stdlib-assertions \ - --build-swift-static-stdlib \ - --build-swift-static-sdk-overlay \ - --build-swift-stdlib-unittest-extra \ - --skip-test-lldb \ - --install-destdir=$PKG \ - --install-prefix=usr \ - --install-swift \ - --install-lldb \ - --install-foundation \ - --install-llbuild \ - --install-swiftpm \ - --install-xctest \ - --install-libdispatch \ - --swift-install-components='autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc' \ - --reconfigure - -# Stripping debug symbols from repl_swift and its libraries would defeat its -# purpose as a debuggable interactive shell. If you strip it, when you call lldb --repl -# you will be met with a error message due to repl_swift's lack of breakpoints. -# The important part was compiled as a cmake "Release" and lacks debug symbols. - -# Rename /usr/bin/lldb* to lldb-swift* -for old in $PKG/usr/bin/lldb*; do - new=$(echo "$old" | sed 's/lldb/lldb-swift/') - if [ -L "$old" ]; then - newtarget=$(readlink "$old" | sed 's/lldb/lldb-swift/') - rm "$old" - ln -sf "$newtarget" "$new" - else - mv "$old" "$new" - fi -done - -# Python: fix the symlink we broke above, remove modules that clash with existing packages -for sitepython in $PKG/usr/lib$LIBDIRSUFFIX/python*/site-packages; do - if [ -d "$sitepython"/lldb ]; then - ln -sf ../../../../bin/lldb-swift-argdumper "$sitepython"/lldb/lldb-argdumper - fi - rm -f "$sitepython"/six.py - rm -f "$sitepython"/readline.so -done - -mv $PKG/usr/share/man $PKG/usr/man -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Remove junk directories -rm -rf $PKG/usr/local $PKG/usr/share - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CODE_OWNERS.TXT LICENSE.txt README.md CONTRIBUTING.md CHANGELOG.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/swift/swift.info b/development/swift/swift.info deleted file mode 100644 index 210916acc4..0000000000 --- a/development/swift/swift.info +++ /dev/null @@ -1,32 +0,0 @@ -PRGNAM="swift" -VERSION="4.0" -HOMEPAGE="https://swift.org/" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://github.com/apple/swift/archive/swift-4.0-RELEASE/swift-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-corelibs-foundation/archive/swift-4.0-RELEASE/swift-corelibs-foundation-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-corelibs-libdispatch/archive/swift-4.0-RELEASE/swift-corelibs-libdispatch-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-corelibs-xctest/archive/swift-4.0-RELEASE/swift-corelibs-xctest-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-llvm/archive/swift-4.0-RELEASE/swift-llvm-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-clang/archive/swift-4.0-RELEASE/swift-clang-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-lldb/archive/swift-4.0-RELEASE/swift-lldb-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-cmark/archive/swift-4.0-RELEASE/swift-cmark-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-package-manager/archive/swift-4.0-RELEASE/swift-package-manager-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-llbuild/archive/swift-4.0-RELEASE/swift-llbuild-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-compiler-rt/archive/swift-4.0-RELEASE/swift-compiler-rt-swift-4.0-RELEASE.tar.gz \ - https://github.com/apple/swift-integration-tests/archive/swift-4.0-RELEASE/swift-integration-tests-swift-4.0-RELEASE.tar.gz" -MD5SUM_x86_64="edb657fc04e5780b2f9cf9304f84118c \ - cd1f91b951d91a6a666dcc8624a918be \ - 73cbb1c41142e341ea141720ab412f3e \ - 69099f33b69f5ea6016b9b23b7c10344 \ - c2c70c0946580a2fc9be26903a93c16f \ - 6d3dea7975d9b944b040ba8a9e4722ea \ - 4d058b078664d3faec9ee47de411bef8 \ - d2b5a2bd4624910328e16bb8095c1138 \ - 4f690a79effbeeb71050f90a2d1272c4 \ - d8211c2a409b2ca5cfeb06e513fd9cc5 \ - 437047c4222b165149162dd8ebaa6c5e \ - 0550d7acd22642475eb75184d6785836" -REQUIRES="libbsd libkqueue systemtap blocksruntime" -MAINTAINER="Felipe Bugno" -EMAIL="capent@yahoo.com" -- cgit v1.2.3