aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-03-01 16:09:22 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-03-01 16:09:22 +0300
commit2abfb07de63eed20a0745f07e169c651aceaca0f (patch)
treeab6c16991d44c5251445ad7ed9efc7137c732e65
parentc490b95d8ad6021c9c6b187ac5aa37954c8df722 (diff)
downloadydb-2abfb07de63eed20a0745f07e169c651aceaca0f.tar.gz
intermediate changes
ref:e22436503f0ea511673b99f70c2541509e16c8df
-rw-r--r--contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt9
-rw-r--r--contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make9
-rw-r--r--contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt9
-rw-r--r--contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make9
-rw-r--r--contrib/libs/aws-sdk-cpp/ya.make2
5 files changed, 33 insertions, 5 deletions
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
index 4fc6248ad8..e16ee87246 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
@@ -19,9 +19,16 @@ target_compile_options(libs-aws-sdk-cpp-aws-cpp-sdk-core PRIVATE
-DHAS_PATHCONF
-DHAS_UMASK
-DS2N_ADX
+ -DS2N_BIKE_R3_AVX2
+ -DS2N_BIKE_R3_AVX512
+ -DS2N_BIKE_R3_PCLMUL
+ -DS2N_BIKE_R3_VPCLMUL
-DS2N_CPUID_AVAILABLE
+ -DS2N_FALL_THROUGH_SUPPORTED
-DS2N_HAVE_EXECINFO
- -DS2N_SIKEP434R2_ASM
+ -DS2N_KYBER512R3_AVX2_BMI2
+ -DS2N_SIKE_P434_R3_ASM
+ -DS2N___RESTRICT__SUPPORTED
)
target_include_directories(libs-aws-sdk-cpp-aws-cpp-sdk-core PUBLIC
${CMAKE_SOURCE_DIR}/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make
index d6b0823d45..308c7f5011 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make
@@ -49,9 +49,16 @@ CFLAGS(
-DHAS_PATHCONF
-DHAS_UMASK
-DS2N_ADX
+ -DS2N_BIKE_R3_AVX2
+ -DS2N_BIKE_R3_AVX512
+ -DS2N_BIKE_R3_PCLMUL
+ -DS2N_BIKE_R3_VPCLMUL
-DS2N_CPUID_AVAILABLE
+ -DS2N_FALL_THROUGH_SUPPORTED
-DS2N_HAVE_EXECINFO
- -DS2N_SIKEP434R2_ASM
+ -DS2N_KYBER512R3_AVX2_BMI2
+ -DS2N_SIKE_P434_R3_ASM
+ -DS2N___RESTRICT__SUPPORTED
)
SRCS(
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
index 7801b20e09..9de131b991 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
@@ -14,9 +14,16 @@ target_compile_options(libs-aws-sdk-cpp-aws-cpp-sdk-s3 PRIVATE
-DHAS_PATHCONF
-DHAS_UMASK
-DS2N_ADX
+ -DS2N_BIKE_R3_AVX2
+ -DS2N_BIKE_R3_AVX512
+ -DS2N_BIKE_R3_PCLMUL
+ -DS2N_BIKE_R3_VPCLMUL
-DS2N_CPUID_AVAILABLE
+ -DS2N_FALL_THROUGH_SUPPORTED
-DS2N_HAVE_EXECINFO
- -DS2N_SIKEP434R2_ASM
+ -DS2N_KYBER512R3_AVX2_BMI2
+ -DS2N_SIKE_P434_R3_ASM
+ -DS2N___RESTRICT__SUPPORTED
)
target_include_directories(libs-aws-sdk-cpp-aws-cpp-sdk-s3 PUBLIC
${CMAKE_SOURCE_DIR}/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make
index df8594d6cc..954f698440 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make
@@ -42,9 +42,16 @@ CFLAGS(
-DHAS_PATHCONF
-DHAS_UMASK
-DS2N_ADX
+ -DS2N_BIKE_R3_AVX2
+ -DS2N_BIKE_R3_AVX512
+ -DS2N_BIKE_R3_PCLMUL
+ -DS2N_BIKE_R3_VPCLMUL
-DS2N_CPUID_AVAILABLE
+ -DS2N_FALL_THROUGH_SUPPORTED
-DS2N_HAVE_EXECINFO
- -DS2N_SIKEP434R2_ASM
+ -DS2N_KYBER512R3_AVX2_BMI2
+ -DS2N_SIKE_P434_R3_ASM
+ -DS2N___RESTRICT__SUPPORTED
)
SRCS(
diff --git a/contrib/libs/aws-sdk-cpp/ya.make b/contrib/libs/aws-sdk-cpp/ya.make
index d8fd3f7ffc..504fe8ad68 100644
--- a/contrib/libs/aws-sdk-cpp/ya.make
+++ b/contrib/libs/aws-sdk-cpp/ya.make
@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 980c4c3c2f664ccc5002f7fd6e08059cf1f00e75.
+# Generated by devtools/yamaker from nixpkgs 21.11.
OWNER(orivej shindo g:cpp-contrib)