Rather use ifarch than checking builder kernel for thp support

Cleanup; removed unnecessary patch for atomic ops on arm, pulled el5 support,
  use ix86 macro for ifarch i386 and friends
This commit is contained in:
Ingvar Hagelund 2017-08-17 12:35:22 +02:00
parent 2579d5ed9a
commit a1dce39784

View File

@ -1,7 +1,7 @@
Name: jemalloc Name: jemalloc
Version: 4.5.0 Version: 4.5.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: General-purpose scalable concurrent malloc implementation Summary: General-purpose scalable concurrent malloc implementation
Group: System Environment/Libraries Group: System Environment/Libraries
@ -10,12 +10,6 @@ URL: http://www.canonware.com/jemalloc/
Source0: https://github.com/jemalloc/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2 Source0: https://github.com/jemalloc/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# ARMv5tel has no atomic operations
Patch2: jemalloc-armv5-force-atomic.patch
# RHEL5/POWER has no atomic operations
Patch3: jemalloc-3.0.0.atomic_h_ppc_32bit_operations.patch
Patch4: jemalloc-3.6.0.no_explicit_altivec.patch
# No Transparent Hugepages on systems not supporting them # No Transparent Hugepages on systems not supporting them
Patch5: jemalloc-4.4.0.disable_thp.patch Patch5: jemalloc-4.4.0.disable_thp.patch
@ -41,25 +35,15 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
#% patch2 -p1 -b .armv5tel
%ifarch ppc ppc64
%if 0%{?rhel} == 5
%patch3 -b .ppc
%patch4 -b .ppc
%endif
%endif
# Disable thp on systems not supporting this, trusting that Fedora will enable # Disable thp on systems not supporting this, trusting that Fedora will enable
# this on the build servers when ready for installed systems. # this on the build servers when ready for installed systems.
if test -d /sys/kernel/mm/transparent_hugepage %ifarch %ix86 %arm aarch64 s390x
then %define disable_thp --disable-thp
true
else
%patch5 %patch5
fi %endif
%build %build
%ifarch i686 %ifarch %ix86
%if 0%{?fedora} >= 21 %if 0%{?fedora} >= 21
CFLAGS="%{optflags} -msse2" CFLAGS="%{optflags} -msse2"
%endif %endif
@ -81,7 +65,7 @@ cat /sys/kernel/mm/transparent_hugepage/enabled || true
echo "What kernel version and config is this?" echo "What kernel version and config is this?"
uname -a uname -a
%configure %configure %{?disable_thp}
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check
@ -111,11 +95,6 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/jemalloc.pc %{_libdir}/pkgconfig/jemalloc.pc
%doc COPYING README VERSION %doc COPYING README VERSION
%doc doc/jemalloc.html %doc doc/jemalloc.html
%ifarch ppc ppc64
%if 0%{?rhel} == 5
%doc COPYING.epel5-ppc
%endif
%endif
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -128,6 +107,11 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Wed Aug 16 2017 Ingvar Hagelund <ingvar@redpill-linpro.com> - 4.5.0-4
- Rather use ifarch than checking builder kernel for thp support
- Cleanup; removed unnecessary patch for atomic ops on arm, pulled el5 support,
use ix86 macro for ifarch i386 and friends
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-3 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild