diff options
| -rw-r--r-- | libtracefs-use-same-subdir-with-Makefile.patch | 37 | ||||
| -rw-r--r-- | libtracefs.spec | 5 |
2 files changed, 40 insertions, 2 deletions
diff --git a/libtracefs-use-same-subdir-with-Makefile.patch b/libtracefs-use-same-subdir-with-Makefile.patch new file mode 100644 index 0000000..d2dc877 --- /dev/null +++ b/libtracefs-use-same-subdir-with-Makefile.patch @@ -0,0 +1,37 @@ +From 7860e362e2a47ed9caecf848378a6e2e605badef Mon Sep 17 00:00:00 2001 +From: Funda Wang <fundawang@yeah.net> +Date: Tue, 7 Jan 2025 02:05:02 +0800 +Subject: [PATCH] use same subdir with Makefile + +--- + include/meson.build | 2 +- + src/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/meson.build b/include/meson.build +index 52db432..3a9f140 100644 +--- a/include/meson.build ++++ b/include/meson.build +@@ -7,5 +7,5 @@ headers = [ + ] + + foreach h : headers +- install_headers(h, subdir : 'libtracefs') ++ install_headers(h, subdir : 'tracefs') + endforeach +diff --git a/src/meson.build b/src/meson.build +index 31fd9ed..4853912 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -53,7 +53,7 @@ pkg = import('pkgconfig') + pkg.generate( + libtracefs, + libraries: [libtraceevent_dep], +- subdirs: 'libtracefs', ++ subdirs: 'tracefs', + filebase: meson.project_name(), + name: meson.project_name(), + version: meson.project_version(), +-- +2.46.0 + diff --git a/libtracefs.spec b/libtracefs.spec index 00d8818..6b00089 100644 --- a/libtracefs.spec +++ b/libtracefs.spec @@ -6,6 +6,7 @@ Summary: Library for access kernel tracefs URL: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/ Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-%{version}.tar.gz +Patch1: libtracefs-use-same-subdir-with-Makefile.patch BuildRequires: gcc BuildRequires: meson >= 0.50.0 BuildRequires: bison flex @@ -48,8 +49,8 @@ rm -f %{buildroot}%{_libdir}/*.a %{_mandir}/man3/* %files devel -%dir %{_includedir}/libtracefs -%{_includedir}/libtracefs/tracefs.h +%dir %{_includedir}/tracefs +%{_includedir}/tracefs/tracefs.h %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/%{name}.so |