Commit 9e189b2f authored by Georgios Bitzes's avatar Georgios Bitzes
Browse files

Try to install libglog.a in lib, not lib64

parent 4f230a44
Pipeline #1261271 failed with stages
in 32 minutes and 16 seconds
......@@ -102,7 +102,7 @@ popd
#-------------------------------------------------------------------------------
pushd glog-0.4.0
mkdir build && cd build
CXXFLAGS="-fPIC" cmake3 -DCMAKE_INSTALL_PREFIX=/opt/eos-folly ..
CXXFLAGS="-fPIC" cmake3 -DCMAKE_INSTALL_PREFIX=/opt/eos-folly -DCMAKE_INSTALL_LIBDIR=lib ..
make %{?_smp_mflags}
popd
......
......@@ -113,7 +113,7 @@ export LIBTSAN=''
%endif
pushd ${RPM_BUILD_ROOT}/opt/eos-folly/lib
g++ -shared ${CXXFLAGS} -o libfolly.so -Wl,--whole-archive libfolly.a /opt/eos-folly/lib/libdouble-conversion.a /opt/eos-folly/lib64/libglog.a -Wl,-no-whole-archive -Wl,-rpath,/opt/eos-folly/lib -L/opt/eos-folly/lib -lboost_context -lboost_program_options -lssl -levent -lboost_filesystem -lboost_regex -lgflags ${LIBTSAN}
g++ -shared ${CXXFLAGS} -o libfolly.so -Wl,--whole-archive libfolly.a /opt/eos-folly/lib/libdouble-conversion.a /opt/eos-folly/lib/libglog.a -Wl,-no-whole-archive -Wl,-rpath,/opt/eos-folly/lib -L/opt/eos-folly/lib -lboost_context -lboost_program_options -lssl -levent -lboost_filesystem -lboost_regex -lgflags ${LIBTSAN}
popd
%files
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment