This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new b15d57714 fix(docker): fix build failure of rocksdb when PORTABLE=0
(#1607)
b15d57714 is described below
commit b15d5771450cb62d0aa2e332c9bbba287cc24fe6
Author: Yingchun Lai <[email protected]>
AuthorDate: Thu Sep 14 16:03:28 2023 +0800
fix(docker): fix build failure of rocksdb when PORTABLE=0 (#1607)
https://github.com/apache/incubator-pegasus/issues/1604
Explicit set PORTABLE=native to avoid building failure. The failure looks
like:
```
cc1plus: error: bad value ('OFF') for '-march=' switch
cc1plus: note: valid arguments to '-march=' switch are: nocona core2
nehalem corei7
westmere sandybridge corei7-avx ivybridge core-avx-i haswell core-avx2
broadwell
skylake skylake-avx512 bonnell atom silvermont slm knl x86-64 eden-x2
nano nano-1000
nano-2000 nano-3000 nano-x2 eden-x4 nano-x4 k8 k8-sse3 opteron
opteron-sse3 athlon64
athlon64-sse3 athlon-fx amdfam10 barcelona bdver1 bdver2 bdver3 bdver4
znver1 btver1
btver2
```
---
docker/thirdparties-bin/Dockerfile | 2 +-
docker/thirdparties-src/Dockerfile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docker/thirdparties-bin/Dockerfile
b/docker/thirdparties-bin/Dockerfile
index 27a0d5146..36f75fe9c 100644
--- a/docker/thirdparties-bin/Dockerfile
+++ b/docker/thirdparties-bin/Dockerfile
@@ -26,7 +26,7 @@ COPY --from=builder /root/thirdparties-src.zip
/root/thirdparties-src.zip
ARG GITHUB_BRANCH=master
ARG GITHUB_REPOSITORY_URL=https://github.com/apache/incubator-pegasus.git
-ARG ROCKSDB_PORTABLE=0
+ARG ROCKSDB_PORTABLE=native
ARG USE_JEMALLOC=OFF
ARG HADOOP_BIN_PATH
ARG ZOOKEEPER_BIN_PATH
diff --git a/docker/thirdparties-src/Dockerfile
b/docker/thirdparties-src/Dockerfile
index 48070659e..a11538e2e 100644
--- a/docker/thirdparties-src/Dockerfile
+++ b/docker/thirdparties-src/Dockerfile
@@ -23,9 +23,10 @@ ARG GITHUB_BRANCH=master
ARG GITHUB_REPOSITORY_URL=https://github.com/apache/incubator-pegasus.git
RUN git clone --depth=1 --branch=${GITHUB_BRANCH} ${GITHUB_REPOSITORY_URL}
+ARG ROCKSDB_PORTABLE=native
RUN cd incubator-pegasus/thirdparty \
&& mkdir -p build \
- && cmake -DCMAKE_BUILD_TYPE=Release -B build/ . \
+ && cmake -DCMAKE_BUILD_TYPE=Release -DROCKSDB_PORTABLE=${ROCKSDB_PORTABLE}
-B build/ . \
&& cmake --build build/ -j $(($(nproc)/2+1))
RUN cd incubator-pegasus/thirdparty \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
