You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2018/02/26 19:16:22 UTC
[41/46] incubator-quickstep git commit: Upgraded benchmark third
party library.
Upgraded benchmark third party library.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/5d7aa5f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/5d7aa5f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/5d7aa5f0
Branch: refs/heads/fix-iwyu
Commit: 5d7aa5f0d1a898db37c46b772fca986b29c45eaa
Parents: d634772
Author: Harshad Deshmukh <hb...@apache.org>
Authored: Wed Dec 27 13:35:07 2017 -0600
Committer: Harshad Deshmukh <hb...@apache.org>
Committed: Wed Dec 27 13:35:07 2017 -0600
----------------------------------------------------------------------
third_party/download_and_patch_prerequisites.sh | 7 +++----
third_party/patches/benchmark/CMakeLists.patch | 11 +++++++++++
third_party/patches/benchmark/benchmarkCMake.patch | 11 -----------
.../patches/benchmark/benchmarkSrcCMakeLists.patch | 13 -------------
4 files changed, 14 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5d7aa5f0/third_party/download_and_patch_prerequisites.sh
----------------------------------------------------------------------
diff --git a/third_party/download_and_patch_prerequisites.sh b/third_party/download_and_patch_prerequisites.sh
index 2295525..9d0ff00 100755
--- a/third_party/download_and_patch_prerequisites.sh
+++ b/third_party/download_and_patch_prerequisites.sh
@@ -52,7 +52,7 @@ third_party_dir_names=("benchmark"
"glog"
)
-third_party_lib_urls=("https://github.com/google/benchmark/archive/v1.1.0.tar.gz"
+third_party_lib_urls=("https://github.com/google/benchmark/archive/v1.3.0.tar.gz"
"https://github.com/gflags/gflags/archive/v2.1.2.tar.gz"
"https://github.com/google/googletest/archive/release-1.8.0.tar.gz"
"https://github.com/antirez/linenoise/archive/1.0.tar.gz"
@@ -61,7 +61,7 @@ third_party_lib_urls=("https://github.com/google/benchmark/archive/v1.1.0.tar.gz
"https://github.com/google/glog/archive/v0.3.5.tar.gz"
)
-downloaded_archive_names=("v1.1.0.tar.gz"
+downloaded_archive_names=("v1.3.0.tar.gz"
"v2.1.2.tar.gz"
"release-1.8.0.tar.gz"
"1.0.tar.gz"
@@ -127,8 +127,7 @@ patch ${THIRD_PARTY_SRC_DIR}/gflags/src/gflags_reporting.cc ${PATCH_DIR}/gflags/
patch ${THIRD_PARTY_SRC_DIR}/re2/CMakeLists.txt ${PATCH_DIR}/re2/re2CMake.patch
# Apply benchmark patches.
-patch ${THIRD_PARTY_SRC_DIR}/benchmark/CMakeLists.txt ${PATCH_DIR}/benchmark/benchmarkCMake.patch
-patch ${THIRD_PARTY_SRC_DIR}/benchmark/src/CMakeLists.txt ${PATCH_DIR}/benchmark/benchmarkSrcCMakeLists.patch
+patch ${THIRD_PARTY_SRC_DIR}/benchmark/CMakeLists.txt ${PATCH_DIR}/benchmark/CMakeLists.patch
# Apply glog patches.
patch ${THIRD_PARTY_SRC_DIR}/glog/CMakeLists.txt ${PATCH_DIR}/glog/glogCMakeLists.txt.patch
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5d7aa5f0/third_party/patches/benchmark/CMakeLists.patch
----------------------------------------------------------------------
diff --git a/third_party/patches/benchmark/CMakeLists.patch b/third_party/patches/benchmark/CMakeLists.patch
new file mode 100644
index 0000000..4ef6c9c
--- /dev/null
+++ b/third_party/patches/benchmark/CMakeLists.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt 2017-12-27 13:11:46.000000002 -0600
++++ CMakeLists.txt.new 2017-12-27 13:12:28.000000002 -0600
+@@ -11,7 +11,7 @@
+ endif()
+ endforeach()
+
+-option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON)
++option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." OFF)
+ option(BENCHMARK_ENABLE_EXCEPTIONS "Enable the use of exceptions in the benchmark library." ON)
+ option(BENCHMARK_ENABLE_LTO "Enable link time optimisation of the benchmark library." OFF)
+ option(BENCHMARK_USE_LIBCXX "Build and test using libc++ as the standard library." OFF)
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5d7aa5f0/third_party/patches/benchmark/benchmarkCMake.patch
----------------------------------------------------------------------
diff --git a/third_party/patches/benchmark/benchmarkCMake.patch b/third_party/patches/benchmark/benchmarkCMake.patch
deleted file mode 100644
index 56b54ba..0000000
--- a/third_party/patches/benchmark/benchmarkCMake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt 2016-10-28 16:22:22.000000000 -0500
-+++ CMakeLists.txt.new 2017-01-13 15:46:47.626768358 -0600
-@@ -10,7 +10,7 @@
- endif()
- endforeach()
-
--option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON)
-+option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." OFF)
- option(BENCHMARK_ENABLE_LTO "Enable link time optimisation of the benchmark library." OFF)
- option(BENCHMARK_USE_LIBCXX "Build and test using libc++ as the standard library." OFF)
- # Make sure we can import out CMake functions
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5d7aa5f0/third_party/patches/benchmark/benchmarkSrcCMakeLists.patch
----------------------------------------------------------------------
diff --git a/third_party/patches/benchmark/benchmarkSrcCMakeLists.patch b/third_party/patches/benchmark/benchmarkSrcCMakeLists.patch
deleted file mode 100644
index 6591b51..0000000
--- a/third_party/patches/benchmark/benchmarkSrcCMakeLists.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt 2016-10-28 16:22:22.000000000 -0500
-+++ CMakeLists.txt.new 2017-01-24 16:31:51.045598240 -0600
-@@ -21,6 +21,10 @@
-
- # Link threads.
- target_link_libraries(benchmark ${BENCHMARK_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-+find_library(LIBRT rt)
-+if(LIBRT)
-+ target_link_libraries(benchmark ${LIBRT})
-+endif()
-
- # We need extra libraries on Windows
- if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")