[dts+el7] [x86*] Bundle libipt - fix#3 its initialization (RH BZ 1256513).

This commit is contained in:
Jan Kratochvil 2016-08-23 09:52:01 +02:00
parent aacdec2a04
commit efdba24c8f
1 changed files with 8 additions and 5 deletions

View File

@ -27,7 +27,7 @@ Version: 7.11.1
# The release always contains a leading reserved number, start it at 1. # The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 82%{?dist} Release: 83%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
Group: Development/Debuggers Group: Development/Debuggers
@ -630,7 +630,7 @@ BuildRequires: guile-devel%{buildisa}
%if 0%{!?rhel:1} || 0%{?rhel} > 7 || (0%{?rhel} == 7 && 0%{?scl:1}) %if 0%{!?rhel:1} || 0%{?rhel} > 7 || (0%{?rhel} == 7 && 0%{?scl:1})
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%global have_libipt 1 %global have_libipt 1
%if 0%{?scl:1} %if 0%{?el7:1} && 0%{?scl:1}
BuildRequires: cmake BuildRequires: cmake
%else %else
BuildRequires: libipt-devel%{buildisa} BuildRequires: libipt-devel%{buildisa}
@ -767,7 +767,7 @@ This package provides INFO, HTML and PDF user manual for GDB.
tar xJf %{SOURCE5} tar xJf %{SOURCE5}
%endif # 0%{?rhel:1} && 0%{?rhel} <= 7 %endif # 0%{?rhel:1} && 0%{?rhel} <= 7
%if 0%{have_libipt} && 0%{?scl:1} %if 0%{have_libipt} && 0%{?el7:1} && 0%{?scl:1}
tar xzf %{SOURCE7} tar xzf %{SOURCE7}
( (
cd processor-trace-%{libipt_version} cd processor-trace-%{libipt_version}
@ -981,7 +981,7 @@ CFLAGS="$CFLAGS -DGDB_INDEX_VERIFY_VENDOR"
%endif %endif
# [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513). # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
%if 0%{?el7:1} && 0%{?scl:1} %if %{have_libipt} && 0%{?el7:1} && 0%{?scl:1}
CFLAGS="$CFLAGS -DPERF_ATTR_SIZE_VER5_BUNDLE" CFLAGS="$CFLAGS -DPERF_ATTR_SIZE_VER5_BUNDLE"
%endif %endif
@ -996,7 +996,7 @@ CFLAGS="$CFLAGS -DNEED_RL_STATE_FEDORA_GDB"
CFLAGS="$CFLAGS -DNEED_DETACH_SIGSTOP" CFLAGS="$CFLAGS -DNEED_DETACH_SIGSTOP"
%endif %endif
%if 0%{have_libipt} && 0%{?scl:1} %if 0%{have_libipt} && 0%{?el7:1} && 0%{?scl:1}
( (
mkdir processor-trace-%{libipt_version}-root mkdir processor-trace-%{libipt_version}-root
mkdir processor-trace-%{libipt_version}-build mkdir processor-trace-%{libipt_version}-build
@ -1457,6 +1457,9 @@ then
fi fi
%changelog %changelog
* Tue Aug 23 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11.1-83.fc24
- [dts+el7] [x86*] Bundle libipt - fix#3 its initialization (RH BZ 1256513).
* Tue Aug 23 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11.1-82.fc24 * Tue Aug 23 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11.1-82.fc24
- [dts+el7] [x86*] Bundle libipt - fix#2 its initialization (RH BZ 1256513). - [dts+el7] [x86*] Bundle libipt - fix#2 its initialization (RH BZ 1256513).