rpms/valgrind
7
0
Fork 0
Code Issues Pull Requests Releases Activity

3.11.0-25

Browse Source 
- No support for multilib on secondary arches when creating scl.
- Touch up empty .exp files.
This commit is contained in:
Mark Wielaard 2016-07-22 15:17:12 +02:00
parent d0ebe36499
commit 42527797a8
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
valgrind.spec
View File

@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Only arches that are supported upstream as multilib and that the distro # Only arches that are supported upstream as multilib and that the distro
# has multilib builds for should set build_multilib 1. In practice that # has multilib builds for should set build_multilib 1. In practice that
# is only x86_64 and ppc64 (but not in fedora 21 and later, and never # is only x86_64 and ppc64 (but not in fedora 21 and later, and never
# for ppc64le). # for ppc64le or when building for scl).
%global build_multilib 0 %global build_multilib 0
%ifarch x86_64 %ifarch x86_64
@ -23,6 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%endif %endif
%ifarch ppc64 %ifarch ppc64
%if 0%{?scl}
%global build_multilib 0
%else
%if 0%{?rhel} %if 0%{?rhel}
%global build_multilib 1 %global build_multilib 1
%endif %endif
@ -30,6 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%global build_multilib (%fedora < 21) %global build_multilib (%fedora < 21)
%endif %endif
%endif %endif
%endif
# Note s390x doesn't have an openmpi port available. # Note s390x doesn't have an openmpi port available.
# We never want the openmpi subpackage when building a software collecton # We never want the openmpi subpackage when building a software collecton
@ -313,6 +317,13 @@ Valgrind User Manual for details.
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
# Older patch might not have created these (expected) empty files (patch23)
touch none/tests/ppoll_alarm.stderr.exp
touch none/tests/ppoll_alarm.stdout.exp
touch none/tests/pselect_alarm.stderr.exp
touch none/tests/pselect_alarm.stdout.exp
%patch24 -p1 %patch24 -p1
# New filter (from patch24) needs to be executable. # New filter (from patch24) needs to be executable.
@ -533,6 +544,8 @@ echo ===============END TESTING===============
%changelog %changelog
* Fri Jul 22 2016 Mark Wielaard <mjw@redhat.com> - 3.11.0-25 * Fri Jul 22 2016 Mark Wielaard <mjw@redhat.com> - 3.11.0-25
- Only build valgrind-openmpi when not creating a software collection. - Only build valgrind-openmpi when not creating a software collection.
- No support for multilib on secondary arches when creating scl.
- Touch up empty .exp files.
* Thu Jul 21 2016 Mark Wielaard <mjw@redhat.com> - 3.11.0-24 * Thu Jul 21 2016 Mark Wielaard <mjw@redhat.com> - 3.11.0-24
- Mandatory Perl build-requires added - Mandatory Perl build-requires added