Skip to content

Commit

Permalink
Merge pull request #12 from vespa-engine/toregge/set-boost-libdir-to-…
Browse files Browse the repository at this point in the history
…lib64

Boost libraries goes to /opt/vespa-deps/lib64
  • Loading branch information
aressem committed Mar 25, 2019
2 parents fea4340 + 932c76e commit ac6321e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions boost/vespa-boost.spec.tmpl
Expand Up @@ -73,14 +73,14 @@ Contains develompemnt headers and static libraries for vespa-boost.
source /opt/rh/devtoolset-7/enable || true
export BOOST_LIBS="iostreams,filesystem,signals,program_options,regex,serialization,system,test,thread,timer,chrono"
export CXXFLAGS="-std=c++14 -DNOT_BOOST_SPIRIT_THREADSAFE=1 -DNOT_PHOENIX_THREADSAFE=1 -DBOOST_NO_AUTO_PTR=1"
./bootstrap.sh --with-libraries=$BOOST_LIBS --prefix=%{buildroot}/%{_prefix}
./bjam -d+2 %{_smp_mflags} variant=release debug-symbols=on threading=multi link=shared runtime-link=shared dll-path=%{_prefix}/lib64 cxxflags=%{_cxxflags} --layout=versioned --prefix=%{buildroot}/%{_prefix}
./bootstrap.sh --with-libraries=$BOOST_LIBS --prefix=%{buildroot}/%{_prefix} --libdir=%{buildroot}/%{_prefix}/lib64
./bjam -d+2 %{_smp_mflags} variant=release debug-symbols=on threading=multi link=shared runtime-link=shared dll-path=%{_prefix}/lib64 cxxflags=%{_cxxflags} --layout=versioned --prefix=%{buildroot}/%{_prefix} --libdir=%{buildroot}/%{_prefix}/lib64

%install

rm -rf $RPM_BUILD_ROOT
source /opt/rh/devtoolset-7/enable || true
./bjam -d+2 %{_smp_mflags} variant=release debug-symbols=on threading=multi link=shared runtime-link=shared dll-path=%{_prefix}/lib64 cxxflags=%{_cxxflags} install --layout=versioned --prefix=%{buildroot}/%{_prefix}
./bjam -d+2 %{_smp_mflags} variant=release debug-symbols=on threading=multi link=shared runtime-link=shared dll-path=%{_prefix}/lib64 cxxflags=%{_cxxflags} install --layout=versioned --prefix=%{buildroot}/%{_prefix} --libdir=%{buildroot}/%{_prefix}/lib64

cd %{buildroot}/%{_includedir}
mv boost-%{ver_major}_%{ver_minor}/boost .
Expand Down

0 comments on commit ac6321e

Please sign in to comment.