diff --git a/0001-fix-missing-fstack-protector-strong.patch b/0001-fix-missing-fstack-protector-strong.patch index 37bf0fc..ef85098 100644 --- a/0001-fix-missing-fstack-protector-strong.patch +++ b/0001-fix-missing-fstack-protector-strong.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 089b621..3665e0f 100644 +index 41ad866..20ae048 100644 --- a/Makefile +++ b/Makefile -@@ -113,7 +113,7 @@ INCLUDES = -I. -I $(srctree)/include $(CONFIG_INCLUDES) +@@ -127,7 +127,7 @@ export LIBTRACEEVENT_STATIC LIBTRACEEVENT_SHARED EP_HEADERS_DIR ifdef EXTRA_CFLAGS CFLAGS := $(EXTRA_CFLAGS) else @@ -10,12 +10,12 @@ index 089b621..3665e0f 100644 + CFLAGS := -g -Wall -fstack-protector-strong endif - LIBS = -ldl + LIBS ?= -ldl diff --git a/plugins/Makefile b/plugins/Makefile -index b60352d..d5744a9 100644 +index 4c8cb17..56b5646 100644 --- a/plugins/Makefile +++ b/plugins/Makefile -@@ -75,7 +75,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include $(CONFIG_INCLUDES) +@@ -68,7 +68,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include -I $(EP_HEADERS_DIR) $(CONFIG ifdef EXTRA_CFLAGS CFLAGS := $(EXTRA_CFLAGS) else diff --git a/libtraceevent-1.2.1.tar.gz b/libtraceevent-1.2.1.tar.gz deleted file mode 100644 index e39e27c..0000000 Binary files a/libtraceevent-1.2.1.tar.gz and /dev/null differ diff --git a/libtraceevent-1.8.2.tar.gz b/libtraceevent-1.8.2.tar.gz new file mode 100644 index 0000000..3f7c8c1 Binary files /dev/null and b/libtraceevent-1.8.2.tar.gz differ diff --git a/libtraceevent.spec b/libtraceevent.spec index e261de3..74b08fb 100644 --- a/libtraceevent.spec +++ b/libtraceevent.spec @@ -1,6 +1,6 @@ Name: libtraceevent -Version: 1.2.1 -Release: 4 +Version: 1.8.2 +Release: 1 License: LGPLv2+ and GPLv2+ Summary: Library to parse raw trace event formats @@ -30,8 +30,8 @@ Development headers of %{name}-libs %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 +# Parallel build does not work +make -O -j1 V=1 VERBOSE=1 CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc %install %make_install prefix=%{_prefix} libdir=%{_libdir} install doc-install @@ -43,9 +43,10 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/traceevent/ %{_libdir}/libtraceevent.so.%{version} %{_libdir}/libtraceevent.so.1 -%{_mandir}/man3/tep_*.3.* -%{_mandir}/man3/libtraceevent.3.* -%{_mandir}/man3/trace_seq*.3.* +%{_mandir}/man3/tep_*.3* +%{_mandir}/man3/libtraceevent.3* +%{_mandir}/man3/trace_seq*.3* +%{_mandir}/man3/kbuffer_*.3* %{_docdir}/%{name}-doc %files devel @@ -54,6 +55,9 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/pkgconfig/libtraceevent.pc %changelog +* Sun Jun 30 2024 shafeipaozi - 1.8.2-1 +- update to 1.8.2 + * Thu Jul 13 2023 liyanan - 1.2.1-4 - Delete confilt with perf when the kernel is greater than 6.2