From 40a13be21a724cbb82b881c7de6932097db1985f Mon Sep 17 00:00:00 2001 From: laokz Date: Sun, 9 Apr 2023 16:35:41 +0800 Subject: [PATCH] Fix building on RISC-V by setting PORTABLE to 1 Signed-off-by: jinjuhan --- rocksdb.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rocksdb.spec b/rocksdb.spec index 0e30fc6..ac795f6 100644 --- a/rocksdb.spec +++ b/rocksdb.spec @@ -1,6 +1,6 @@ Name: rocksdb Version: 6.8.1 -Release: 4 +Release: 5 Summary: A Persistent Key-Value Store for Flash and RAM Storage License: GPLv2 and Apache 2.0 License @@ -60,7 +60,11 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} java/test-libs export CFLAGS="%{optflags}" # librocksdb*.so* has undefined symbols dlopen and so on, “-ldl” needs to be added here export EXTRA_CXXFLAGS=" -std=c++11 %{optflags} -ldl" +%ifnarch riscv64 %make_build shared_lib +%else +PORTABLE=1 %make_build shared_lib +%endif # build rocksdbjni export JAVA_HOME=%{_jvmdir}/java-1.8.0-openjdk export EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -I${JAVA_HOME}/include/ -I${JAVA_HOME}/include/linux" @@ -99,6 +103,9 @@ install -D -m 0644 java/target/%{name}jni-%{version}-linux$(getconf LONG_BIT).ja %{_javadir}/%{name}jni/%{name}jni.jar %changelog +* Mon Apr 10 2023 laokz - 6.8.1-5 +- Fix building on RISC-V by setting PORTABLE to 1 + * Tue Aug 23 2022 wulei - 6.8.1-4 - Fix binary not striped problem