!28 [sync] PR-26: Fix tcmalloc issues

Merge pull request !28 from openeuler-sync-bot/sync-pr26-openEuler-22.03-LTS-Next-to-master
This commit is contained in:
openeuler-ci-bot 2022-01-30 07:56:59 +00:00 committed by Gitee
commit 3cdcf42fbe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -71,7 +71,11 @@
# libtcmalloc # libtcmalloc
# if you wish to compile an rpm without tcmalloc (i.e. use gluster mempool) # if you wish to compile an rpm without tcmalloc (i.e. use gluster mempool)
# rpmbuild -ta glusterfs-10.0.tar.gz --without tcmalloc # rpmbuild -ta glusterfs-10.0.tar.gz --without tcmalloc
%{?_without_tcmalloc:%global _without_libtcmalloc --without-tcmalloc} %{?_without_tcmalloc:%global _without_tcmalloc --without-tcmalloc}
%ifnarch x86_64
%global _without_tcmalloc --without-tcmalloc
%endif
# Do not use libtirpc on EL6, it does not have xdr_uint64_t() and xdr_uint32_t # Do not use libtirpc on EL6, it does not have xdr_uint64_t() and xdr_uint32_t
# Do not use libtirpc on EL7, it does not have xdr_sizeof() # Do not use libtirpc on EL7, it does not have xdr_sizeof()
@ -220,7 +224,7 @@
Summary: Distributed File System Summary: Distributed File System
Name: glusterfs Name: glusterfs
Version: 10.0 Version: 10.0
Release: 3 Release: 4
License: GPLv2 or LGPLv3+ License: GPLv2 or LGPLv3+
URL: http://docs.gluster.org/ URL: http://docs.gluster.org/
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
@ -241,7 +245,7 @@ Requires(pre): shadow-utils
BuildRequires: systemd BuildRequires: systemd
%endif %endif
%if ( 0%{?_with_tcmalloc:1} ) %if ( 0%{!?_without_tcmalloc:1} )
Requires: gperftools-libs%{?_isa} Requires: gperftools-libs%{?_isa}
%endif %endif
@ -263,7 +267,7 @@ BuildRequires: ncurses-devel readline-devel
BuildRequires: libxml2-devel openssl-devel BuildRequires: libxml2-devel openssl-devel
BuildRequires: libaio-devel libacl-devel BuildRequires: libaio-devel libacl-devel
BuildRequires: python%{_pythonver}-devel BuildRequires: python%{_pythonver}-devel
%if ( 0%{?_with_tcmalloc:1} ) %if ( 0%{!?_without_tcmalloc:1} )
BuildRequires: gperftools-devel BuildRequires: gperftools-devel
%endif %endif
%if ( 0%{?rhel} && 0%{?rhel} < 8 ) %if ( 0%{?rhel} && 0%{?rhel} < 8 )
@ -1512,6 +1516,9 @@ exit 0
%endif %endif
%changelog %changelog
* Fri Jan 28 2022 imxcc <xingchaochao@huawei.com> - 10.0-4
- tcmalloc issues
* Wed Jan 26 2022 Wenchao Hao <haowenchao@huawei.com> - 10.0-3 * Wed Jan 26 2022 Wenchao Hao <haowenchao@huawei.com> - 10.0-3
- Change gluster-server "Requires" from pyxattr to python3-pyxattr - Change gluster-server "Requires" from pyxattr to python3-pyxattr