diff options
author | somov <somov@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
commit | 7489e4682331202b9c7d863c0898eb83d7b12c2b (patch) | |
tree | 9142afc54d335ea52910662635b898e79e192e49 /build/platform | |
parent | a5950576e397b1909261050b8c7da16db58f10b1 (diff) | |
download | ydb-7489e4682331202b9c7d863c0898eb83d7b12c2b.tar.gz |
Restoring authorship annotation for <somov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/platform')
23 files changed, 410 insertions, 410 deletions
diff --git a/build/platform/bfd/ya.make b/build/platform/bfd/ya.make index d40b45b936..67501f665f 100644 --- a/build/platform/bfd/ya.make +++ b/build/platform/bfd/ya.make @@ -1,9 +1,9 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - +RESOURCES_LIBRARY() + +OWNER(somov) + INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource) - + LDFLAGS(-fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.bfd) - -END() + +END() diff --git a/build/platform/binutils/ya.make b/build/platform/binutils/ya.make index 1d22602e8e..aedcb12f23 100644 --- a/build/platform/binutils/ya.make +++ b/build/platform/binutils/ya.make @@ -1,8 +1,8 @@ -RESOURCES_LIBRARY() - +RESOURCES_LIBRARY() + OWNER(g:contrib somov) - + INCLUDE(binutils.resource) - -END() - + +END() + diff --git a/build/platform/cctools/ya.make b/build/platform/cctools/ya.make index cb9632425b..c17a6abc67 100644 --- a/build/platform/cctools/ya.make +++ b/build/platform/cctools/ya.make @@ -1,12 +1,12 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - +RESOURCES_LIBRARY() + +OWNER(somov) + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( CCTOOLS_ROOT sbr:2135298496 FOR LINUX sbr:2135992724 FOR DARWIN sbr:2135992724 FOR DARWIN-ARM64 ) - -END() + +END() diff --git a/build/platform/cuda/cuda_runtime_include.h b/build/platform/cuda/cuda_runtime_include.h index 0acd501894..e60aacc4fb 100644 --- a/build/platform/cuda/cuda_runtime_include.h +++ b/build/platform/cuda/cuda_runtime_include.h @@ -1,13 +1,13 @@ -#pragma once - -// Компилятор nvcc из CUDA Toolkit при компиляции файла включает неявную зависимость -// $CUDA_ROOT/include/cuda_runtime.h, которая в свою очередь включает другие файлы -// из $CUDA_ROOT, а так же из стандартной библиотеки C++. Файлы из внешних ресурсов -// не доступны на этапе конфигурирования сборки, и зависимости из них не учитываются. -// Это, в частности, приводит к поломке сборки с использованием nvcc в режиме sandboxing-а. - -// Здесь перечислены такие зависимости. Этот файл добавляется в качестве дополнительной -// зависимости к каждой компиляции nvcc. - -#include <cmath> -#include <new> +#pragma once + +// Компилятор nvcc из CUDA Toolkit при компиляции файла включает неявную зависимость +// $CUDA_ROOT/include/cuda_runtime.h, которая в свою очередь включает другие файлы +// из $CUDA_ROOT, а так же из стандартной библиотеки C++. Файлы из внешних ресурсов +// не доступны на этапе конфигурирования сборки, и зависимости из них не учитываются. +// Это, в частности, приводит к поломке сборки с использованием nvcc в режиме sandboxing-а. + +// Здесь перечислены такие зависимости. Этот файл добавляется в качестве дополнительной +// зависимости к каждой компиляции nvcc. + +#include <cmath> +#include <new> diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make index 5f3c896c47..3615f682cd 100644 --- a/build/platform/cuda/ya.make +++ b/build/platform/cuda/ya.make @@ -1,16 +1,16 @@ -RESOURCES_LIBRARY() - -# https://wiki.yandex-team.ru/devtools/cuda/ - -OWNER(g:contrib somov) - -IF (NOT HAVE_CUDA) - MESSAGE(FATAL_ERROR "No CUDA Toolkit for your build") -ENDIF() - -IF (USE_ARCADIA_CUDA) - IF (HOST_OS_LINUX AND HOST_ARCH_X86_64) - IF (OS_LINUX AND ARCH_X86_64) +RESOURCES_LIBRARY() + +# https://wiki.yandex-team.ru/devtools/cuda/ + +OWNER(g:contrib somov) + +IF (NOT HAVE_CUDA) + MESSAGE(FATAL_ERROR "No CUDA Toolkit for your build") +ENDIF() + +IF (USE_ARCADIA_CUDA) + IF (HOST_OS_LINUX AND HOST_ARCH_X86_64) + IF (OS_LINUX AND ARCH_X86_64) IF (CUDA_VERSION == "11.4") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2410761119) # CUDA Toolkit 11.4.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.3") @@ -20,12 +20,12 @@ IF (USE_ARCADIA_CUDA) ELSEIF (CUDA_VERSION == "11.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1882836946) # CUDA Toolkit 11.1.1 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.0") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1647896014) # CUDA Toolkit 11.0.2 for Linux x86-64 + DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1647896014) # CUDA Toolkit 11.0.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64 - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() ELSEIF(OS_LINUX AND ARCH_AARCH64) IF (CUDA_VERSION == "11.3") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2227720086) # CUDA Toolkit 11.3.20210513 (11.3.1) for Linux x86-64 with linux-aarch64 support @@ -34,10 +34,10 @@ IF (USE_ARCADIA_CUDA) ELSE() ENABLE(CUDA_NOT_FOUND) ENDIF() - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() - + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() + ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE) IF (OS_LINUX AND ARCH_PPC64LE) IF (CUDA_VERSION == "10.1") @@ -50,51 +50,51 @@ IF (USE_ARCADIA_CUDA) ENABLE(CUDA_NOT_FOUND) ENDIF() - ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) - IF (OS_DARWIN AND ARCH_X86_64) + ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) + IF (OS_DARWIN AND ARCH_X86_64) IF (CUDA_VERSION == "10.1") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978727023) # CUDA Toolkit 10.1.168 for macOS x86-64 - ENDIF() - - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() - - ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) - IF (OS_WINDOWS AND ARCH_X86_64) + DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978727023) # CUDA Toolkit 10.1.168 for macOS x86-64 + ENDIF() + + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() + + ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) + IF (OS_WINDOWS AND ARCH_X86_64) IF (CUDA_VERSION == "11.3") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2215101513) # CUDA Toolkit 11.3.1 for Windows x86-64 ELSEIF (CUDA_VERSION == "11.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1896564605) # CUDA Toolkit 11.1.1 for Windows x86-64 ELSEIF (CUDA_VERSION == "10.1") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978734165) # CUDA Toolkit 10.1.168 for Windows x86-64 - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() - - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() - - ELSE() - ENABLE(CUDA_NOT_FOUND) - ENDIF() -ENDIF() - -IF (USE_ARCADIA_CUDA_HOST_COMPILER) - IF (HOST_OS_LINUX AND HOST_ARCH_X86_64) - IF (OS_LINUX AND ARCH_X86_64) + DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978734165) # CUDA Toolkit 10.1.168 for Windows x86-64 + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() + + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() + + ELSE() + ENABLE(CUDA_NOT_FOUND) + ENDIF() +ENDIF() + +IF (USE_ARCADIA_CUDA_HOST_COMPILER) + IF (HOST_OS_LINUX AND HOST_ARCH_X86_64) + IF (OS_LINUX AND ARCH_X86_64) DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 IF (CUDA_VERSION VERSION_LT "11.2") # Equivalent to nvcc -allow-unsupported-compiler (present since 11.0). CFLAGS(GLOBAL "-D__NV_NO_HOST_COMPILER_CHECK") - ENDIF() + ENDIF() ELSEIF(OS_LINUX AND ARCH_AARCH64) DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 - ELSE() - ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) - ENDIF() - + ELSE() + ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) + ENDIF() + ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE) IF (OS_LINUX AND ARCH_PPC64LE) IF (CUDA_VERSION == "10.1") @@ -107,51 +107,51 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER) ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) ENDIF() - ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) - IF (OS_DARWIN AND ARCH_X86_64) + ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) + IF (OS_DARWIN AND ARCH_X86_64) SET(__XCODE_RESOURCE_NAME CUDA_HOST_TOOLCHAIN) IF (CUDA_VERSION == "10.1") - SET(__XCODE_TOOLCHAIN_VERSION "9.2") # (not latest) + SET(__XCODE_TOOLCHAIN_VERSION "9.2") # (not latest) ELSE() SET(__XCODE_TOOLCHAIN_VERSION "") ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) - ENDIF() + ENDIF() IF (__XCODE_TOOLCHAIN_VERSION) INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) ENDIF() - ELSE() - ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) - ENDIF() - - ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) - IF (OS_WINDOWS AND ARCH_X86_64) + ELSE() + ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) + ENDIF() + + ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) + IF (OS_WINDOWS AND ARCH_X86_64) # To create this toolchain, install MSVS on Windows and run: # devtools/tools_build/pack_sdk.py msvc out.tar # Note: it will contain patched "VC/Auxiliary/Build/vcvarsall.bat" # to prevent "nvcc fatal : Host compiler targets unsupported OS." IF (CUDA_HOST_MSVC_VERSION == "14.28.29910") DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:2153212401) - ELSE() - MESSAGE(FATAL_ERROR "Unexpected or unspecified Microsoft Visual C++ CUDA host compiler version") - ENDIF() - - ELSE() - ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) - ENDIF() - - ELSE() - ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) - ENDIF() -ENDIF() - -IF (CUDA_NOT_FOUND) - MESSAGE(FATAL_ERROR "No CUDA Toolkit for the selected platform") -ENDIF() - -IF (CUDA_HOST_COMPILER_NOT_FOUND) - MESSAGE(FATAL_ERROR "No CUDA host compiler for the selected platform and CUDA Toolkit version ${CUDA_VERSION}") -ENDIF() - + ELSE() + MESSAGE(FATAL_ERROR "Unexpected or unspecified Microsoft Visual C++ CUDA host compiler version") + ENDIF() + + ELSE() + ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) + ENDIF() + + ELSE() + ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) + ENDIF() +ENDIF() + +IF (CUDA_NOT_FOUND) + MESSAGE(FATAL_ERROR "No CUDA Toolkit for the selected platform") +ENDIF() + +IF (CUDA_HOST_COMPILER_NOT_FOUND) + MESSAGE(FATAL_ERROR "No CUDA host compiler for the selected platform and CUDA Toolkit version ${CUDA_VERSION}") +ENDIF() + # Use thrust and cub from Arcadia, not from HPC SDK # NB: # it would be better to use PEERDIR instead, @@ -161,22 +161,22 @@ ADDINCL( GLOBAL contrib/libs/nvidia/cub ) -IF (HOST_OS_WINDOWS) - SET_APPEND_WITH_GLOBAL(USER_CFLAGS GLOBAL "\"-I${CUDA_ROOT}/include\"") -ELSE() - CFLAGS(GLOBAL "-I${CUDA_ROOT}/include") -ENDIF() - -IF (HOST_OS_WINDOWS) - SET_APPEND(LDFLAGS_GLOBAL "\"/LIBPATH:${CUDA_ROOT}/lib/x64\"") +IF (HOST_OS_WINDOWS) + SET_APPEND_WITH_GLOBAL(USER_CFLAGS GLOBAL "\"-I${CUDA_ROOT}/include\"") +ELSE() + CFLAGS(GLOBAL "-I${CUDA_ROOT}/include") +ENDIF() + +IF (HOST_OS_WINDOWS) + SET_APPEND(LDFLAGS_GLOBAL "\"/LIBPATH:${CUDA_ROOT}/lib/x64\"") ELSEIF(HOST_OS_LINUX AND OS_LINUX AND ARCH_AARCH64) LDFLAGS("-L${CUDA_ROOT}/targets/sbsa-linux/lib") -ELSEIF(HOST_OS_LINUX) - LDFLAGS("-L${CUDA_ROOT}/lib64") -ELSE() - LDFLAGS("-L${CUDA_ROOT}/lib") -ENDIF() - +ELSEIF(HOST_OS_LINUX) + LDFLAGS("-L${CUDA_ROOT}/lib64") +ELSE() + LDFLAGS("-L${CUDA_ROOT}/lib") +ENDIF() + IF (CUDA_REQUIRED) IF(HOST_OS_LINUX) LDFLAGS("-L${CUDA_ROOT}/lib64/stubs") @@ -186,10 +186,10 @@ IF (CUDA_REQUIRED) ENDIF() ENDIF() -IF (HOST_OS_WINDOWS) +IF (HOST_OS_WINDOWS) LDFLAGS(cudadevrt.lib cudart_static.lib) -ELSE() +ELSE() EXTRALIBS(-lcudadevrt -lcudart_static -lculibos) -ENDIF() - -END() +ENDIF() + +END() diff --git a/build/platform/gold/ya.make b/build/platform/gold/ya.make index 4e49b9df24..91f01602f7 100644 --- a/build/platform/gold/ya.make +++ b/build/platform/gold/ya.make @@ -1,12 +1,12 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - +RESOURCES_LIBRARY() + +OWNER(somov) + INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource) - + LDFLAGS( -fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.gold -Wl,-z,noexecstack ) - -END() + +END() diff --git a/build/platform/intel_fpga_sdk/ya.make b/build/platform/intel_fpga_sdk/ya.make index d01ab1bb1f..5cefb02250 100644 --- a/build/platform/intel_fpga_sdk/ya.make +++ b/build/platform/intel_fpga_sdk/ya.make @@ -1,9 +1,9 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -DECLARE_EXTERNAL_RESOURCE(INTEL_FPGA_SDK sbr:606576548) - -LDFLAGS(-L$INTEL_FPGA_SDK_RESOURCE_GLOBAL/lib) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +DECLARE_EXTERNAL_RESOURCE(INTEL_FPGA_SDK sbr:606576548) + +LDFLAGS(-L$INTEL_FPGA_SDK_RESOURCE_GLOBAL/lib) + +END() diff --git a/build/platform/ios_sdk/ya.make b/build/platform/ios_sdk/ya.make index 87bef6b17e..b1246a70b9 100644 --- a/build/platform/ios_sdk/ya.make +++ b/build/platform/ios_sdk/ya.make @@ -1,17 +1,17 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(NEED_PLATFORM_PEERDIRS no) - +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(NEED_PLATFORM_PEERDIRS no) + IF (OS_IOS AND NOT OS_IOSSIM) # iOS 14.5 SDK / Xcode 12.5.1 (12E507) DECLARE_EXTERNAL_RESOURCE(IOS_SDK_ROOT sbr:2661782168) ELSEIF (OS_IOSSIM) # iOS Simulator 14.5 SDK / Xcode 12.5.1 (12E507) DECLARE_EXTERNAL_RESOURCE(IOS_SDK_ROOT sbr:2661786760) -ELSE() - MESSAGE(FATAL_ERROR "There is no iOS SDK for the selected target platform") -ENDIF() - -END() +ELSE() + MESSAGE(FATAL_ERROR "There is no iOS SDK for the selected target platform") +ENDIF() + +END() diff --git a/build/platform/linux_sdk/README.md b/build/platform/linux_sdk/README.md index 7bf9d7eb90..ff846cefbf 100644 --- a/build/platform/linux_sdk/README.md +++ b/build/platform/linux_sdk/README.md @@ -1,7 +1,7 @@ -### Правки в Ubuntu 14.04 SDK -* `lib/x86_64-linux-gnu/libc-2.19.so` — удалены dynamic версии символов - * `__cxa_thread_atexit_impl` - * `getauxval` - * `__getauxval` -* `usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.19` — удалены dynamic версии символов - * `__cxa_thread_atexit_impl` +### Правки в Ubuntu 14.04 SDK +* `lib/x86_64-linux-gnu/libc-2.19.so` — удалены dynamic версии символов + * `__cxa_thread_atexit_impl` + * `getauxval` + * `__getauxval` +* `usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.19` — удалены dynamic версии символов + * `__cxa_thread_atexit_impl` diff --git a/build/platform/linux_sdk/ya.make b/build/platform/linux_sdk/ya.make index 641d78d050..add74eee9e 100644 --- a/build/platform/linux_sdk/ya.make +++ b/build/platform/linux_sdk/ya.make @@ -1,45 +1,45 @@ -RESOURCES_LIBRARY() - -OWNER(g:contrib somov) - -NO_PLATFORM_RESOURCES() - -SET(NEED_PLATFORM_PEERDIRS no) - +RESOURCES_LIBRARY() + +OWNER(g:contrib somov) + +NO_PLATFORM_RESOURCES() + +SET(NEED_PLATFORM_PEERDIRS no) + IF (OS_SDK == "local") - # Implementation is in $S/build/ymake.core.conf -ELSEIF (ARCH_X86_64) + # Implementation is in $S/build/ymake.core.conf +ELSEIF (ARCH_X86_64) IF (OS_SDK == "ubuntu-10") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:244388930) + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:244388930) ELSEIF (OS_SDK == "ubuntu-12") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:244387436) + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:244387436) ELSEIF (OS_SDK == "ubuntu-14") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1966560555) + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1966560555) ELSEIF (OS_SDK == "ubuntu-16") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:243881345) + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:243881345) ELSEIF (OS_SDK == "ubuntu-18") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:617908641) + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:617908641) ELSEIF (OS_SDK == "ubuntu-20") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:2635714620) - ELSE() - MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for x86-64") - ENDIF() -ELSEIF (ARCH_AARCH64) + ELSE() + MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for x86-64") + ENDIF() +ELSEIF (ARCH_AARCH64) IF (OS_SDK == "ubuntu-16") - DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:309054781) - ELSE() + DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:309054781) + ELSE() MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for AArch64/ARMv8 64 bit") - ENDIF() -ELSEIF (ARCH_PPC64LE) + ENDIF() +ELSEIF (ARCH_PPC64LE) IF (OS_SDK == "ubuntu-14") IF (HOST_ARCH_PPC64LE) DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1570528338) ELSE() DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:233217651) ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for PPC64LE") - ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for PPC64LE") + ENDIF() ELSEIF (ARCH_ARM7) IF (ARM7_FLOAT_ABI == "hard" AND OS_SDK == "ubuntu-16") DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692) @@ -48,8 +48,8 @@ ELSEIF (ARCH_ARM7) ELSE() MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for ARMv7 32 bit (float ABI: ${ARM7_FLOAT_ABI})") ENDIF() -ELSE() - MESSAGE(FATAL_ERROR "Unexpected OS_SDK value: ${OS_SDK}") -ENDIF() - -END() +ELSE() + MESSAGE(FATAL_ERROR "Unexpected OS_SDK value: ${OS_SDK}") +ENDIF() + +END() diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make index 4d7b41c957..c046e89098 100644 --- a/build/platform/lld/ya.make +++ b/build/platform/lld/ya.make @@ -1,9 +1,9 @@ RESOURCES_LIBRARY() - + LICENSE(Service-Prebuilt-Tool) -OWNER(somov) - +OWNER(somov) + IF (USE_LTO OR USE_THINLTO) IF (CLANG7 OR CLANG8) # Use LLD 8 for old Clang because its IR code fails LLD 11 validation. @@ -58,5 +58,5 @@ ELSE() LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") ENDIF() - -END() + +END() diff --git a/build/platform/macos_sdk/ya.make b/build/platform/macos_sdk/ya.make index 8f9266f4bd..6fb8dc54c0 100644 --- a/build/platform/macos_sdk/ya.make +++ b/build/platform/macos_sdk/ya.make @@ -1,10 +1,10 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - +RESOURCES_LIBRARY() + +OWNER(somov) + # macOS 11.1 Big Sur SDK / Xcode 12.4 (12D4e) DECLARE_EXTERNAL_RESOURCE(MACOS_SDK sbr:2088833948) - + IF (USE_STL_SYSTEM) SET(__XCODE_RESOURCE_NAME CPP_XCODE_TOOLCHAIN_ROOT) SET(__XCODE_TOOLCHAIN_VERSION ${CPP_XCODE_TOOLCHAIN_VERSION}) @@ -17,4 +17,4 @@ IF (USE_STL_SYSTEM) ) ENDIF() -END() +END() diff --git a/build/platform/mapkit/ya.make b/build/platform/mapkit/ya.make index dfc20f0c0a..513dff5bcf 100644 --- a/build/platform/mapkit/ya.make +++ b/build/platform/mapkit/ya.make @@ -1,32 +1,32 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -NO_PLATFORM() - -IF (OS_ANDROID) +RESOURCES_LIBRARY() + +OWNER(somov) + +NO_PLATFORM() + +IF (OS_ANDROID) IF (MAPS_MOBILE_EXPORT_CPP_API) # Sandbox Resource ID duplicates # arcadia/sandbox/projects/maps/mobile/MapsMobileMakeArtifacts/__init__.py DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_HEADERS sbr:2527848662) CFLAGS(GLOBAL -nostdinc++ GLOBAL -cxx-isystem GLOBAL $MAPKIT_ANDROID_LIBCXX_HEADERS_RESOURCE_GLOBAL) ENDIF() - + DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_LIBRARIES sbr:2527853263) - - IF (ARCH_ARM7) - SET(ARCH_NAME arm) - ELSEIF (ARCH_ARM64) - SET(ARCH_NAME arm64) - ELSEIF (ARCH_I686) - SET(ARCH_NAME x86) - ELSEIF (ARCH_X86_64) - SET(ARCH_NAME x86-64) - ENDIF() - - SET(LIBS $MAPKIT_ANDROID_LIBCXX_LIBRARIES_RESOURCE_GLOBAL/$ARCH_NAME) - - LDFLAGS(-L$LIBS) -ENDIF() - -END() + + IF (ARCH_ARM7) + SET(ARCH_NAME arm) + ELSEIF (ARCH_ARM64) + SET(ARCH_NAME arm64) + ELSEIF (ARCH_I686) + SET(ARCH_NAME x86) + ELSEIF (ARCH_X86_64) + SET(ARCH_NAME x86-64) + ENDIF() + + SET(LIBS $MAPKIT_ANDROID_LIBCXX_LIBRARIES_RESOURCE_GLOBAL/$ARCH_NAME) + + LDFLAGS(-L$LIBS) +ENDIF() + +END() diff --git a/build/platform/msvc/ya.make b/build/platform/msvc/ya.make index 9de4244bda..ccb602c280 100644 --- a/build/platform/msvc/ya.make +++ b/build/platform/msvc/ya.make @@ -1,19 +1,19 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - +RESOURCES_LIBRARY() + +OWNER(somov) + IF (WINDOWS_KITS_VERSION == "10.0.10586.0") - DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:544779014) + DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:544779014) ELSEIF (WINDOWS_KITS_VERSION == "10.0.16299.0") - DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:1379398385) + DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:1379398385) ELSEIF (WINDOWS_KITS_VERSION == "10.0.18362.0") DECLARE_EXTERNAL_RESOURCE(WINDOWS_KITS sbr:1939557911) -ELSE() - MESSAGE(FATAL_ERROR "We have no Windows Kits version ${WINDOWS_KITS_VERSION}") -ENDIF() - -IF (CLANG_CL) +ELSE() + MESSAGE(FATAL_ERROR "We have no Windows Kits version ${WINDOWS_KITS_VERSION}") +ENDIF() + +IF (CLANG_CL) DECLARE_EXTERNAL_RESOURCE(MSVC_FOR_CLANG sbr:1383387533) # Microsoft Visual C++ 2017 14.16.27023 (15.9.5) -ENDIF() - -END() +ENDIF() + +END() diff --git a/build/platform/perl/5.14/ya.make b/build/platform/perl/5.14/ya.make index 28a1734640..3db5747945 100644 --- a/build/platform/perl/5.14/ya.make +++ b/build/platform/perl/5.14/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-12) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-12) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.18/ya.make b/build/platform/perl/5.18/ya.make index ae293b04d3..1d17311066 100644 --- a/build/platform/perl/5.18/ya.make +++ b/build/platform/perl/5.18/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-14) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-14) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.22/ya.make b/build/platform/perl/5.22/ya.make index 0a1ce79d9e..658bcc2552 100644 --- a/build/platform/perl/5.22/ya.make +++ b/build/platform/perl/5.22/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-16) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-16) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.26/ya.make b/build/platform/perl/5.26/ya.make index c481dce711..c510f6091a 100644 --- a/build/platform/perl/5.26/ya.make +++ b/build/platform/perl/5.26/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-18) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-18) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.30/ya.make b/build/platform/perl/5.30/ya.make index 199464caa4..ba0132c6ba 100644 --- a/build/platform/perl/5.30/ya.make +++ b/build/platform/perl/5.30/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-20) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-20) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/perl.inc b/build/platform/perl/perl.inc index 840a19989b..139e65bb33 100644 --- a/build/platform/perl/perl.inc +++ b/build/platform/perl/perl.inc @@ -1,33 +1,33 @@ -PROVIDES(system_perl) - -IF (PERL_SDK == "ubuntu-12") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_514 sbr:337748278) -ELSEIF (PERL_SDK == "ubuntu-14") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_518 sbr:1655582861) -ELSEIF (PERL_SDK == "ubuntu-16") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_522 sbr:323251590) -ELSEIF (PERL_SDK == "ubuntu-18") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_526 sbr:616700320) -ELSEIF (PERL_SDK == "ubuntu-20") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_530 sbr:2001114055) -ELSE() - MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") -ENDIF() - -IF (PERL_INCLUDE) - CFLAGS(GLOBAL $PERL_INCLUDE) -ENDIF() - -CFLAGS(GLOBAL -I$PERL_ARCHLIB/CORE) - -IF (PERL_LIBS) - LDFLAGS(-L${PERL_LIBS}) -ENDIF() - -IF (NOT OS_WINDOWS) - LDFLAGS(-lperl) -ELSE() - LDFLAGS(perl.lib) -ENDIF() - -CFLAGS(GLOBAL -DUSE_PERL) +PROVIDES(system_perl) + +IF (PERL_SDK == "ubuntu-12") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_514 sbr:337748278) +ELSEIF (PERL_SDK == "ubuntu-14") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_518 sbr:1655582861) +ELSEIF (PERL_SDK == "ubuntu-16") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_522 sbr:323251590) +ELSEIF (PERL_SDK == "ubuntu-18") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_526 sbr:616700320) +ELSEIF (PERL_SDK == "ubuntu-20") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_530 sbr:2001114055) +ELSE() + MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") +ENDIF() + +IF (PERL_INCLUDE) + CFLAGS(GLOBAL $PERL_INCLUDE) +ENDIF() + +CFLAGS(GLOBAL -I$PERL_ARCHLIB/CORE) + +IF (PERL_LIBS) + LDFLAGS(-L${PERL_LIBS}) +ENDIF() + +IF (NOT OS_WINDOWS) + LDFLAGS(-lperl) +ELSE() + LDFLAGS(perl.lib) +ENDIF() + +CFLAGS(GLOBAL -DUSE_PERL) diff --git a/build/platform/perl/perl_5.18.patch b/build/platform/perl/perl_5.18.patch index ba350db058..840227eb54 100644 --- a/build/platform/perl/perl_5.18.patch +++ b/build/platform/perl/perl_5.18.patch @@ -1,51 +1,51 @@ -diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/pad.h b/perl5.18/lib/perl/5.18/CORE/pad.h ---- a/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 09:58:43.970483379 +0300 -+++ b/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 10:00:56.850097798 +0300 -@@ -320,7 +320,7 @@ - PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ - PL_curpad = AvARRAY(PL_comppad); \ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ -- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ -+ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ - PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); - - -@@ -338,7 +338,7 @@ - PL_comppad = (npad); \ - PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ -- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ -+ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ - PTR2UV(PL_comppad), PTR2UV(PL_curpad))); - - #define PAD_RESTORE_LOCAL(opad) \ -@@ -346,7 +346,7 @@ - PL_comppad = opad; \ - PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ -- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ -+ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ - PTR2UV(PL_comppad), PTR2UV(PL_curpad))); - - -diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/perl.h b/perl5.18/lib/perl/5.18/CORE/perl.h ---- a/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 09:58:43.966483390 +0300 -+++ b/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 10:01:44.649957846 +0300 -@@ -4254,7 +4254,7 @@ - EXTCONST char PL_warn_uninit[] - INIT("Use of uninitialized value%s%s%s"); - EXTCONST char PL_warn_uninit_sv[] -- INIT("Use of uninitialized value%"SVf"%s%s"); -+ INIT("Use of uninitialized value%" SVf "%s%s"); - EXTCONST char PL_warn_nosemi[] - INIT("Semicolon seems to be missing"); - EXTCONST char PL_warn_reserved[] -@@ -4274,7 +4274,7 @@ - EXTCONST char PL_no_aelem[] - INIT("Modification of non-creatable array value attempted, subscript %d"); - EXTCONST char PL_no_helem_sv[] -- INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\""); -+ INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\""); - EXTCONST char PL_no_modify[] - INIT("Modification of a read-only value attempted"); - EXTCONST char PL_no_mem[sizeof("Out of memory!\n")] +diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/pad.h b/perl5.18/lib/perl/5.18/CORE/pad.h +--- a/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 09:58:43.970483379 +0300 ++++ b/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 10:00:56.850097798 +0300 +@@ -320,7 +320,7 @@ + PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ + PL_curpad = AvARRAY(PL_comppad); \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); + + +@@ -338,7 +338,7 @@ + PL_comppad = (npad); \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + #define PAD_RESTORE_LOCAL(opad) \ +@@ -346,7 +346,7 @@ + PL_comppad = opad; \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + +diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/perl.h b/perl5.18/lib/perl/5.18/CORE/perl.h +--- a/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 09:58:43.966483390 +0300 ++++ b/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 10:01:44.649957846 +0300 +@@ -4254,7 +4254,7 @@ + EXTCONST char PL_warn_uninit[] + INIT("Use of uninitialized value%s%s%s"); + EXTCONST char PL_warn_uninit_sv[] +- INIT("Use of uninitialized value%"SVf"%s%s"); ++ INIT("Use of uninitialized value%" SVf "%s%s"); + EXTCONST char PL_warn_nosemi[] + INIT("Semicolon seems to be missing"); + EXTCONST char PL_warn_reserved[] +@@ -4274,7 +4274,7 @@ + EXTCONST char PL_no_aelem[] + INIT("Modification of non-creatable array value attempted, subscript %d"); + EXTCONST char PL_no_helem_sv[] +- INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\""); ++ INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\""); + EXTCONST char PL_no_modify[] + INIT("Modification of a read-only value attempted"); + EXTCONST char PL_no_mem[sizeof("Out of memory!\n")] diff --git a/build/platform/perl/ya.make b/build/platform/perl/ya.make index cb7a4ee075..cc50c05c26 100644 --- a/build/platform/perl/ya.make +++ b/build/platform/perl/ya.make @@ -1,24 +1,24 @@ -LIBRARY() +LIBRARY() OWNER(somov) -NO_PLATFORM() - +NO_PLATFORM() + IF (USE_PERL_SYSTEM) - IF (PERL_SDK == "ubuntu-12") - PEERDIR(build/platform/perl/5.14) - ELSEIF (PERL_SDK == "ubuntu-14") - PEERDIR(build/platform/perl/5.18) - ELSEIF (PERL_SDK == "ubuntu-16") - PEERDIR(build/platform/perl/5.22) - ELSEIF (PERL_SDK == "ubuntu-18") - PEERDIR(build/platform/perl/5.26) - ELSEIF (PERL_SDK == "ubuntu-20") - PEERDIR(build/platform/perl/5.30) + IF (PERL_SDK == "ubuntu-12") + PEERDIR(build/platform/perl/5.14) + ELSEIF (PERL_SDK == "ubuntu-14") + PEERDIR(build/platform/perl/5.18) + ELSEIF (PERL_SDK == "ubuntu-16") + PEERDIR(build/platform/perl/5.22) + ELSEIF (PERL_SDK == "ubuntu-18") + PEERDIR(build/platform/perl/5.26) + ELSEIF (PERL_SDK == "ubuntu-20") + PEERDIR(build/platform/perl/5.30) ELSE() - MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") - ENDIF() - + MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") + ENDIF() + ELSE() MESSAGE(FATAL_ERROR "There is no perl ready for static linkage. Try using the system one.") diff --git a/build/platform/python/ya.make b/build/platform/python/ya.make index d08982144d..247e65f4c9 100644 --- a/build/platform/python/ya.make +++ b/build/platform/python/ya.make @@ -7,7 +7,7 @@ OWNER( INCLUDE(resources.inc) -IF (USE_SYSTEM_PYTHON) +IF (USE_SYSTEM_PYTHON) IF (OS_LINUX) IF (ARCH_ARM64 OR ARCH_AARCH64) IF (_SYSTEM_PYTHON27) @@ -41,7 +41,7 @@ IF (USE_SYSTEM_PYTHON) CFLAGS( GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include" GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include/python${PY_VERSION}" - ) + ) ELSEIF (OS_DARWIN) IF (PYTHON_DISTR == "macos-brew") IF (ARCH_X86_64) @@ -117,13 +117,13 @@ IF (USE_SYSTEM_PYTHON) ENDIF() CFLAGS(GLOBAL "/I$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include") LDFLAGS("/LIBPATH:$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/libs") - ENDIF() + ENDIF() IF (PYTHON_NOT_FOUND) MESSAGE(FATAL_ERROR "No system Python ${USE_SYSTEM_PYTHON} for the selected platform") ENDIF() ELSEIF (NOT USE_ARCADIA_PYTHON) - CFLAGS(GLOBAL $PYTHON_FLAGS) + CFLAGS(GLOBAL $PYTHON_FLAGS) IF (OS_WINDOWS) LDFLAGS($PYTHON_LDFLAGS $PYTHON_LIBRARIES) ENDIF() |