From 0631fbe1b183b9e48cfcafab95a1751a9a519c41 Mon Sep 17 00:00:00 2001 From: Olga Vrousgou Date: Wed, 16 Feb 2022 09:27:33 -0500 Subject: [PATCH 1/2] pin benchmarks version --- .scripts/linux/install-benchmarks.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.scripts/linux/install-benchmarks.sh b/.scripts/linux/install-benchmarks.sh index d9d3d933b..3eff9312c 100755 --- a/.scripts/linux/install-benchmarks.sh +++ b/.scripts/linux/install-benchmarks.sh @@ -10,15 +10,10 @@ cd $REPO_DIR # Check out the library. git clone https://github.com/google/benchmark.git -# Benchmark requires Google Test as a dependency. Add the source tree as a subdirectory. -git clone https://github.com/google/googletest.git benchmark/googletest -cd benchmark/googletest -git checkout release-1.11.0 -# Go to the library root directory -cd .. -# Make a build directory to place the build output. -cmake -E make_directory "build" +cd benchmark +git checkout v1.6.1 + # Generate build system files with cmake. -cmake -E chdir "build" cmake -DCMAKE_BUILD_TYPE=Release ../ +cmake -S . -B build -G Ninja -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_BUILD_TYPE=Release ../ # Install globally sudo cmake --build "build" --config Release --target install From 49055bde98af946f0b2cd782055eb0528c5db877 Mon Sep 17 00:00:00 2001 From: Olga Vrousgou Date: Wed, 16 Feb 2022 09:50:45 -0500 Subject: [PATCH 2/2] move def to avoid redefinition --- rlclientlib/utility/eventhub_http_authorization.cc | 1 - rlclientlib/utility/eventhub_http_authorization.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rlclientlib/utility/eventhub_http_authorization.cc b/rlclientlib/utility/eventhub_http_authorization.cc index 18cdafe40..ced21c622 100644 --- a/rlclientlib/utility/eventhub_http_authorization.cc +++ b/rlclientlib/utility/eventhub_http_authorization.cc @@ -1,4 +1,3 @@ -#define OPENSSL_API_COMPAT 0x0908 #include "error_callback_fn.h" #include "err_constants.h" #include "eventhub_http_authorization.h" diff --git a/rlclientlib/utility/eventhub_http_authorization.h b/rlclientlib/utility/eventhub_http_authorization.h index 8b050f5fb..81bfc7eb5 100644 --- a/rlclientlib/utility/eventhub_http_authorization.h +++ b/rlclientlib/utility/eventhub_http_authorization.h @@ -1,5 +1,6 @@ #pragma once +#define OPENSSL_API_COMPAT 0x0908 #include "api_status.h" #include "configuration.h" #include "internal_constants.h"