summaryrefslogtreecommitdiffstats
path: root/dist/vespa.spec
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-09-28 11:03:57 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-09-28 11:03:57 +0000
commitb705e915675233c0139756ddd4591f71fde06362 (patch)
tree722c46ff306993e2a4f55470efaef456c0078376 /dist/vespa.spec
parent85e3ec191db3d843bfe0d8d58d3c0bbd7b082514 (diff)
Do not require any specific cpu architecture.
Let default c++ abi follow compiler/system default.
Diffstat (limited to 'dist/vespa.spec')
-rw-r--r--dist/vespa.spec2
1 files changed, 0 insertions, 2 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index eae6a0b3817..a3e0ec4711f 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -90,7 +90,6 @@ Requires: zookeeper >= 3.4.9
%define _extra_link_directory /opt/vespa-libtorrent/lib;/opt/vespa-cppunit/lib
%define _extra_include_directory /opt/vespa-libtorrent/include;/opt/vespa-cppunit/include
%define _vespa_boost_lib_suffix %{nil}
-%define _vespa_cxx_abi_flags -D_GLIBCXX_USE_CXX11_ABI=1
%endif
Requires: java-1.8.0-openjdk
Requires: openssl
@@ -122,7 +121,6 @@ cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \
%{?_vespa_llvm_version:-DVESPA_LLVM_VERSION="%{_vespa_llvm_version}"} \
%{?_vespa_boost_lib_suffix:-DVESPA_BOOST_LIB_SUFFIX="%{_vespa_boost_lib_suffix}"} \
- %{?_vespa_cxx_abi_flags:-DVESPA_CXX_ABI_FLAGS="%{_vespa_cxx_abi_flags}"} \
.
make %{_smp_mflags}