Compare commits
No commits in common. "77dd77a84f8b74c85332bcc74034643df10c9630" and "0f0e416a8c7b62e485d464abdcba311abb2708d5" have entirely different histories.
77dd77a84f
...
0f0e416a8c
@ -1,26 +0,0 @@
|
|||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 089b621..3665e0f 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -113,7 +113,7 @@ INCLUDES = -I. -I $(srctree)/include $(CONFIG_INCLUDES)
|
|
||||||
ifdef EXTRA_CFLAGS
|
|
||||||
CFLAGS := $(EXTRA_CFLAGS)
|
|
||||||
else
|
|
||||||
- CFLAGS := -g -Wall
|
|
||||||
+ CFLAGS := -g -Wall -fstack-protector-strong
|
|
||||||
endif
|
|
||||||
|
|
||||||
LIBS = -ldl
|
|
||||||
diff --git a/plugins/Makefile b/plugins/Makefile
|
|
||||||
index b60352d..d5744a9 100644
|
|
||||||
--- a/plugins/Makefile
|
|
||||||
+++ b/plugins/Makefile
|
|
||||||
@@ -75,7 +75,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include $(CONFIG_INCLUDES)
|
|
||||||
ifdef EXTRA_CFLAGS
|
|
||||||
CFLAGS := $(EXTRA_CFLAGS)
|
|
||||||
else
|
|
||||||
- CFLAGS := -g -Wall
|
|
||||||
+ CFLAGS := -g -Wall -fstack-protector-strong
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Append required CFLAGS
|
|
||||||
Binary file not shown.
@ -1,73 +0,0 @@
|
|||||||
Name: libtraceevent
|
|
||||||
Version: 1.2.1
|
|
||||||
Release: 5
|
|
||||||
License: LGPLv2+ and GPLv2+
|
|
||||||
Summary: Library to parse raw trace event formats
|
|
||||||
|
|
||||||
URL: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
|
|
||||||
Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-%{version}.tar.gz
|
|
||||||
|
|
||||||
Patch0000: 0001-fix-missing-fstack-protector-strong.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: xmlto
|
|
||||||
BuildRequires: asciidoc
|
|
||||||
|
|
||||||
Conflicts: perf < 6.2.0
|
|
||||||
|
|
||||||
%global __provides_exclude_from ^%{_libdir}/traceevent/plugins
|
|
||||||
|
|
||||||
%description
|
|
||||||
libtraceevent is a library to parse raw trace event formats.
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Development headers of %{name}
|
|
||||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
Development headers of %{name}-libs
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -n %{name}-%{version} -p1
|
|
||||||
|
|
||||||
%build
|
|
||||||
MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl`
|
|
||||||
%set_build_flags
|
|
||||||
%make_build prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc
|
|
||||||
|
|
||||||
%install
|
|
||||||
%make_install prefix=%{_prefix} libdir=%{_libdir} install doc-install
|
|
||||||
rm -rf %{buildroot}/%{_libdir}/libtraceevent.a
|
|
||||||
|
|
||||||
%files
|
|
||||||
%license LICENSES/LGPL-2.1
|
|
||||||
%license LICENSES/GPL-2.0
|
|
||||||
%{_libdir}/traceevent/
|
|
||||||
%{_libdir}/libtraceevent.so.%{version}
|
|
||||||
%{_libdir}/libtraceevent.so.1
|
|
||||||
%{_mandir}/man3/tep_*.3.*
|
|
||||||
%{_mandir}/man3/libtraceevent.3.*
|
|
||||||
%{_mandir}/man3/trace_seq*.3.*
|
|
||||||
%{_docdir}/%{name}-doc
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%{_includedir}/traceevent/
|
|
||||||
%{_libdir}/libtraceevent.so
|
|
||||||
%{_libdir}/pkgconfig/libtraceevent.pc
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Wed Dec 25 2024 xu_ping <707078654@qq.com> - 1.2.1-5
|
|
||||||
- add conflict perf version.
|
|
||||||
|
|
||||||
* Thu Jul 13 2023 liyanan <thistleslyn@163.com> - 1.2.1-4
|
|
||||||
- Delete confilt with perf when the kernel is greater than 6.2
|
|
||||||
|
|
||||||
* Thu Jan 19 2023 yaoxin <yaoxin30@h-partners.com> - 1.2.1-3
|
|
||||||
- Add conflict with perf
|
|
||||||
|
|
||||||
* Mon Dec 05 2022 xu_ping <xuping33@h-partners.com> - 1.2.1-2
|
|
||||||
- Add -fstack-protector-strong compile options
|
|
||||||
|
|
||||||
* Fri Jan 14 2022 houyingchao <houyingchao@huawei.com> - 1.2.1-1
|
|
||||||
- Init package
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user