!24 使用内部gtest构建解决编译失败
From: @wk333 Reviewed-by: @caodongxia, @wu-leilei Signed-off-by: @caodongxia, @wu-leilei
This commit is contained in:
commit
11beaadd84
@ -1,12 +1,12 @@
|
|||||||
Name: rocksdb
|
Name: rocksdb
|
||||||
Version: 6.8.1
|
Version: 6.8.1
|
||||||
Release: 6
|
Release: 7
|
||||||
Summary: A Persistent Key-Value Store for Flash and RAM Storage
|
Summary: A Persistent Key-Value Store for Flash and RAM Storage
|
||||||
|
|
||||||
License: GPLv2 and Apache 2.0 License
|
License: GPLv2 and Apache 2.0 License
|
||||||
URL: https://github.com/facebook/rocksdb.git
|
URL: https://github.com/facebook/rocksdb.git
|
||||||
|
|
||||||
BuildRequires: gcc make rpm-build gcc-c++ gtest-devel maven java-1.8.0-openjdk-devel
|
BuildRequires: gcc make rpm-build gcc-c++ maven java-1.8.0-openjdk-devel
|
||||||
|
|
||||||
# enable debuginfo pacakges by default, then we need gdb package
|
# enable debuginfo pacakges by default, then we need gdb package
|
||||||
BuildRequires: gdb
|
BuildRequires: gdb
|
||||||
@ -50,7 +50,6 @@ embeddable persistent key-value store for fast storage.
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
rm -rf third-party/gtest-1.8.1
|
|
||||||
rm java/benchmark/src/main/java/org/rocksdb/benchmark/DbBenchmark.java
|
rm java/benchmark/src/main/java/org/rocksdb/benchmark/DbBenchmark.java
|
||||||
rm build_tools/gnu_parallel
|
rm build_tools/gnu_parallel
|
||||||
mkdir -p java/test-libs
|
mkdir -p java/test-libs
|
||||||
@ -104,6 +103,9 @@ install -D -m 0644 java/target/%{name}jni-%{version}-linux$(getconf LONG_BIT).ja
|
|||||||
%{_javadir}/%{name}jni/%{name}jni.jar
|
%{_javadir}/%{name}jni/%{name}jni.jar
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 27 2023 wangkai <13474090681@163.com> - 6.8.1-7
|
||||||
|
- Resolving build error using internal gtest build
|
||||||
|
|
||||||
* Fri Aug 4 2023 liyanan <thistleslyn@163.com> - 6.8.1-6
|
* Fri Aug 4 2023 liyanan <thistleslyn@163.com> - 6.8.1-6
|
||||||
- Fix build error for gcc 12
|
- Fix build error for gcc 12
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user