diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-24 11:59:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-24 11:59:38 +0100 |
commit | 9b9f6956221465b6c1e3e0678fe639977cc14771 (patch) | |
tree | 928e21dea0566a2ebe7e4f259aeb342fdd3af3e4 /dist | |
parent | ab982a51a2701be604a428d2c9ce947513e497f9 (diff) | |
parent | 7a50240dd3c2c0a914fa7c1cba2b8931807ec607 (diff) |
Merge pull request #20185 from vespa-engine/aressem/vespamalloc-available-on-arm64
vespamalloc is now available on aarch64
Diffstat (limited to 'dist')
-rw-r--r-- | dist/vespa.spec | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 144a2cbc31a..edae861fd64 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -276,18 +276,13 @@ Requires: gtest %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas %endif -%ifnarch x86_64 -%define _skip_vespamalloc 1 -%endif Requires: %{name}-base = %{version}-%{release} Requires: %{name}-base-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-clients = %{version}-%{release} Requires: %{name}-config-model-fat = %{version}-%{release} Requires: %{name}-jars = %{version}-%{release} -%if ! 0%{?_skip_vespamalloc:1} Requires: %{name}-malloc = %{version}-%{release} -%endif Requires: %{name}-tools = %{version}-%{release} # Ugly workaround because vespamalloc/src/vespamalloc/malloc/mmap.cpp uses the private @@ -442,7 +437,6 @@ Summary: Vespa - The open big data serving engine - shared java jar files Vespa - The open big data serving engine - shared java jar files -%if ! 0%{?_skip_vespamalloc:1} %package malloc Summary: Vespa - The open big data serving engine - malloc library @@ -450,7 +444,6 @@ Summary: Vespa - The open big data serving engine - malloc library %description malloc Vespa - The open big data serving engine - malloc library -%endif %package tools @@ -643,9 +636,7 @@ fi %dir %{_prefix}/etc %{_prefix}/etc/systemd %{_prefix}/etc/vespa -%if ! 0%{?_skip_vespamalloc:1} %exclude %{_prefix}/etc/vespamalloc.conf -%endif %{_prefix}/include %dir %{_prefix}/lib %dir %{_prefix}/lib/jars @@ -752,9 +743,7 @@ fi %exclude %{_prefix}/lib64/libvespadefaults.so %exclude %{_prefix}/lib64/libvespalib.so %exclude %{_prefix}/lib64/libvespalog.so -%if ! 0%{?_skip_vespamalloc:1} %exclude %{_prefix}/lib64/vespa -%endif %files clients %if %{_defattr_is_vespa_vespa} @@ -849,7 +838,6 @@ fi %dir %{_prefix}/libexec/vespa %{_prefix}/libexec/vespa/standalone-container.sh -%if ! 0%{?_skip_vespamalloc:1} %files malloc %if %{_defattr_is_vespa_vespa} %defattr(-,%{_vespa_user},%{_vespa_group},-) @@ -859,7 +847,6 @@ fi %config(noreplace) %{_prefix}/etc/vespamalloc.conf %dir %{_prefix}/lib64 %{_prefix}/lib64/vespa -%endif %files tools %if %{_defattr_is_vespa_vespa} |