Commit 8779f8ab authored by Georgios Bitzes's avatar Georgios Bitzes
Browse files

Compile gflags the same way as glog, upgrade version to 2.2.2

parent 9e189b2f
Pipeline #1261412 failed with stages
in 22 minutes and 17 seconds
......@@ -20,7 +20,7 @@ License: Apache
URL: https://github.com/boostorg/boost
Source0: https://dl.bintray.com/boostorg/release/%{boost_ver_dots}/source/boost_%{boost_ver}.tar.gz
Source1: https://github.com/google/glog/archive/v0.4.0.tar.gz
Source2: https://github.com/gflags/gflags/archive/v2.2.1.tar.gz
Source2: https://github.com/gflags/gflags/archive/v2.2.2.tar.gz
Source3: https://github.com/google/double-conversion/archive/v1.1.6.tar.gz
Source4: SConstruct.double-conversion
......@@ -91,10 +91,10 @@ popd
#-------------------------------------------------------------------------------
# Compile gflags
#-------------------------------------------------------------------------------
pushd gflags-2.2.1
pushd gflags-2.2.2
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${TEMP_ROOT} -DCMAKE_CXX_FLAGS='-fPIC' ..
make install %{?_smp_mflags}
CXXFLAGS="-fPIC" cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/opt/eos-folly -DCMAKE_INSTALL_LIBDIR=lib ..
make %{?_smp_mflags}
popd
#-------------------------------------------------------------------------------
......@@ -102,7 +102,7 @@ popd
#-------------------------------------------------------------------------------
pushd glog-0.4.0
mkdir build && cd build
CXXFLAGS="-fPIC" cmake3 -DCMAKE_INSTALL_PREFIX=/opt/eos-folly -DCMAKE_INSTALL_LIBDIR=lib ..
CXXFLAGS="-fPIC" cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/opt/eos-folly -DCMAKE_INSTALL_LIBDIR=lib ..
make %{?_smp_mflags}
popd
......@@ -152,13 +152,9 @@ popd
#-------------------------------------------------------------------------------
# Install gflags
#-------------------------------------------------------------------------------
pushd gflags-2.2.1/build
%{__install} -D -m 755 ./lib/libgflags.a ${RPM_BUILD_ROOT}/opt/eos-folly/lib/libgflags.a
%{__install} -D -m 755 ./include/gflags/config.h ${RPM_BUILD_ROOT}/opt/eos-folly/include/gflags/config.h
%{__install} -D -m 755 ./include/gflags/gflags_completions.h ${RPM_BUILD_ROOT}/opt/eos-folly/include/gflags/gflags_completions.h
%{__install} -D -m 755 ./include/gflags/gflags_declare.h ${RPM_BUILD_ROOT}/opt/eos-folly/include/gflags/gflags_declare.h
%{__install} -D -m 755 ./include/gflags/gflags_gflags.h ${RPM_BUILD_ROOT}/opt/eos-folly/include/gflags/gflags_gflags.h
%{__install} -D -m 755 ./include/gflags/gflags.h ${RPM_BUILD_ROOT}/opt/eos-folly/include/gflags/gflags.h
pushd gflags-2.2.2
cd build
make DESTDIR=%{buildroot} install %{?_smp_mflags}
popd
#-------------------------------------------------------------------------------
......
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