diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-27 20:21:05 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-27 20:38:23 +0000 |
| commit | c1536b0c49c83011e89b7f1303323197576f32f6 (patch) | |
| tree | 01efac552e9d4d5a9796fb9a3c377860d8de9d26 | |
| parent | 14f2bda51b20abb1112d627621db46e282a4b34c (diff) | |
Require fresh xxhash.
| -rw-r--r-- | build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 6e9b5b73abf..2edf48103cf 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -60,7 +60,7 @@ else() endif() # C and C++ compiler flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} ${EXTRA_C_FLAGS}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DXXH_INLINE_ALL -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} ${EXTRA_C_FLAGS}") # AddressSanitizer/ThreadSanitizer work for both GCC and Clang if (VESPA_USE_SANITIZER) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${VESPA_USE_SANITIZER}") diff --git a/dist/vespa.spec b/dist/vespa.spec index 8363aec068f..1fff4f2f09d 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -104,7 +104,7 @@ BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %endif -BuildRequires: xxhash-devel >= 0.6.5 +BuildRequires: xxhash-devel >= 0.7.3 BuildRequires: openblas-devel BuildRequires: lz4-devel BuildRequires: libzstd-devel @@ -144,7 +144,7 @@ Requires: perl-URI Requires: valgrind Requires: Judy Requires: xxhash -Requires: xxhash-libs >= 0.6.5 +Requires: xxhash-libs >= 0.7.3 %if 0%{?el8} Requires: openblas %else @@ -242,7 +242,7 @@ Vespa - The open big data serving engine - base Summary: Vespa - The open big data serving engine - base C++ libs -Requires: xxhash-libs >= 0.6.5 +Requires: xxhash-libs >= 0.7.3 Requires: lz4 Requires: libzstd %if 0%{?el7} |