From 35ab49325771e8476ab812505afad3c2bd949fce Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 22 Aug 2022 21:37:06 -0400 Subject: [PATCH 1/7] New package: libtraceevent-1.6.2 --- common/shlibs | 1 + srcpkgs/libtraceevent-devel | 1 + srcpkgs/libtraceevent/template | 41 ++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 120000 srcpkgs/libtraceevent-devel create mode 100644 srcpkgs/libtraceevent/template diff --git a/common/shlibs b/common/shlibs index f829ee12e80f..9bd26c6c36c9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4176,3 +4176,4 @@ libsyncthingmodel.so.1.2.2 syncthingtray-1.2.2_1 libsyncthingconnector.so.1.2.2 syncthingtray-1.2.2_1 libglibutil.so.1 libglibutil-1.0.64_1 libgbinder.so.1 libgbinder-1.1.20_1 +libtraceevent.so.1 libtraceevent-1.6.2_1 diff --git a/srcpkgs/libtraceevent-devel b/srcpkgs/libtraceevent-devel new file mode 120000 index 000000000000..9ca91c55529f --- /dev/null +++ b/srcpkgs/libtraceevent-devel @@ -0,0 +1 @@ +libtraceevent \ No newline at end of file diff --git a/srcpkgs/libtraceevent/template b/srcpkgs/libtraceevent/template new file mode 100644 index 000000000000..fbb5bec450c5 --- /dev/null +++ b/srcpkgs/libtraceevent/template @@ -0,0 +1,41 @@ +# Template file for 'libtraceevent' +pkgname=libtraceevent +version=1.6.2 +revision=1 +build_style=gnu-makefile +make_build_args="prefix=/usr" +make_build_target="all doc" +make_install_args="$make_build_args" +make_install_target="install doc-install" +hostmakedepends="asciidoc xmlto source-highlight pkg-config" +checkdepends="CUnit-devel" +short_desc="Linux kernel trace event library" +maintainer="Orphaned " +license="GPL-2.0-only, LGPL-2.1-only" +homepage="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" +distfiles="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-${version}.tar.gz" +checksum=1aaeb12f5842a843a06b733e3f4230b0937ba9c2ecd39345edf6f66cc8cbe795 + +do_check() { + make ${makejobs} test + utest/trace-utest +} + +post_install() { + if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then + mv ${DESTDIR}/usr/lib64/pkgconfig ${DESTDIR}/usr/lib/pkgconfig + fi +} + +libtraceevent-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/share/man/man3 + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/share/doc + } +} From 0826f09bf8efd39475d2e0455baf1c0de46dba14 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 22 Aug 2022 21:41:02 -0400 Subject: [PATCH 2/7] New package: libtracefs-1.4.2 --- common/shlibs | 1 + srcpkgs/libtracefs-devel | 1 + .../libtracefs/patches/musl-limits_h.patch | 10 +++++ srcpkgs/libtracefs/template | 45 +++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 120000 srcpkgs/libtracefs-devel create mode 100644 srcpkgs/libtracefs/patches/musl-limits_h.patch create mode 100644 srcpkgs/libtracefs/template diff --git a/common/shlibs b/common/shlibs index 9bd26c6c36c9..cc3a69af2a2b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4177,3 +4177,4 @@ libsyncthingconnector.so.1.2.2 syncthingtray-1.2.2_1 libglibutil.so.1 libglibutil-1.0.64_1 libgbinder.so.1 libgbinder-1.1.20_1 libtraceevent.so.1 libtraceevent-1.6.2_1 +libtracefs.so.1 libtracefs-1.4.2_1 diff --git a/srcpkgs/libtracefs-devel b/srcpkgs/libtracefs-devel new file mode 120000 index 000000000000..23466cce7993 --- /dev/null +++ b/srcpkgs/libtracefs-devel @@ -0,0 +1 @@ +libtracefs \ No newline at end of file diff --git a/srcpkgs/libtracefs/patches/musl-limits_h.patch b/srcpkgs/libtracefs/patches/musl-limits_h.patch new file mode 100644 index 000000000000..b499fdceb66d --- /dev/null +++ b/srcpkgs/libtracefs/patches/musl-limits_h.patch @@ -0,0 +1,10 @@ +--- a/utest/tracefs-utest.c ++++ b/utest/tracefs-utest.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/srcpkgs/libtracefs/template b/srcpkgs/libtracefs/template new file mode 100644 index 000000000000..3d7be3ba7e65 --- /dev/null +++ b/srcpkgs/libtracefs/template @@ -0,0 +1,45 @@ +# Template file for 'libtracefs' +pkgname=libtracefs +version=1.4.2 +revision=1 +build_style=gnu-makefile +make_build_args="prefix=/usr" +make_build_target="all doc" +make_install_args="$make_build_args" +make_install_target="install install_doc" +make_use_env=yes +hostmakedepends="asciidoc xmlto source-highlight pkg-config" +makedepends="libtraceevent-devel" +checkdepends="CUnit-devel" +short_desc="Linux kernel trace file system library" +maintainer="Orphaned " +license="GPL-2.0-only, LGPL-2.1-only" +homepage="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" +distfiles="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-${version}.tar.gz" +checksum=8ad03e6d2a6227f6eb11692d9f04614d3da60ac6c5e4fe436e59b2bed90f031b + +do_check() { + make ${makejobs} test + utest/trace-utest +} + +post_install() { + # manpage for sample program + rm ${DESTDIR}/usr/share/man/man1/sqlhist.1 + + if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then + mv ${DESTDIR}/usr/lib64/pkgconfig ${DESTDIR}/usr/lib/pkgconfig + fi +} + +libtracefs-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/share/man/man3 + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From db1b4e345b9646bbb3539831e150d555b3434f1e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 23 Aug 2022 02:39:52 -0400 Subject: [PATCH 3/7] trace-cmd: update to 3.1.2. --- common/shlibs | 1 + srcpkgs/{kernelshark => libtracecmd} | 0 srcpkgs/libtracecmd-devel | 1 + .../trace-cmd/patches/fix-program-name.patch | 23 -------- srcpkgs/trace-cmd/patches/musl-limits_h.patch | 44 ++++++++------ .../musl-no_pthread_attr_setaffinity_np.patch | 24 -------- .../trace-cmd/patches/musl-pthread_h.patch | 10 ---- srcpkgs/trace-cmd/template | 58 ++++++++++++------- 8 files changed, 66 insertions(+), 95 deletions(-) rename srcpkgs/{kernelshark => libtracecmd} (100%) create mode 120000 srcpkgs/libtracecmd-devel delete mode 100644 srcpkgs/trace-cmd/patches/fix-program-name.patch delete mode 100644 srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch delete mode 100644 srcpkgs/trace-cmd/patches/musl-pthread_h.patch diff --git a/common/shlibs b/common/shlibs index cc3a69af2a2b..d0efac27f360 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4178,3 +4178,4 @@ libglibutil.so.1 libglibutil-1.0.64_1 libgbinder.so.1 libgbinder-1.1.20_1 libtraceevent.so.1 libtraceevent-1.6.2_1 libtracefs.so.1 libtracefs-1.4.2_1 +libtracecmd.so.1 libtracecmd-3.1.2_1 diff --git a/srcpkgs/kernelshark b/srcpkgs/libtracecmd similarity index 100% rename from srcpkgs/kernelshark rename to srcpkgs/libtracecmd diff --git a/srcpkgs/libtracecmd-devel b/srcpkgs/libtracecmd-devel new file mode 120000 index 000000000000..77b3407d0913 --- /dev/null +++ b/srcpkgs/libtracecmd-devel @@ -0,0 +1 @@ +trace-cmd \ No newline at end of file diff --git a/srcpkgs/trace-cmd/patches/fix-program-name.patch b/srcpkgs/trace-cmd/patches/fix-program-name.patch deleted file mode 100644 index 970122246115..000000000000 --- a/srcpkgs/trace-cmd/patches/fix-program-name.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/kernel-shark/src/kernelshark.cpp 2019-07-05 18:23:00.000000000 +0200 -+++ b/kernel-shark/src/kernelshark.cpp 2019-07-08 17:52:19.081010524 +0200 -@@ -35,6 +35,11 @@ - { - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QApplication a(argc, argv); -+ const char* program_name = strrchr(argv[0], '/'); -+ if (nullptr == program_name) -+ program_name = argv[0]; -+ else -+ ++program_name; - - KsMainWindow ks; - -@@ -48,7 +51,7 @@ - return 0; - - case 'v': -- printf("%s - %s\n", basename(argv[0]), KS_VERSION_STRING); -+ printf("%s - %s\n", program_name, KS_VERSION_STRING); - return 0; - - case 'i': diff --git a/srcpkgs/trace-cmd/patches/musl-limits_h.patch b/srcpkgs/trace-cmd/patches/musl-limits_h.patch index 83e278c8ab9e..af90e89b8d75 100644 --- a/srcpkgs/trace-cmd/patches/musl-limits_h.patch +++ b/srcpkgs/trace-cmd/patches/musl-limits_h.patch @@ -1,15 +1,5 @@ ---- a/include/tracefs/tracefs.h 2020-07-17 17:14:20.000000000 +0200 -+++ b/include/tracefs/tracefs.h 2020-07-18 16:27:27.559697340 +0200 -@@ -6,6 +6,7 @@ - #ifndef _TRACE_FS_H - #define _TRACE_FS_H - -+#include - #include "traceevent/event-parse.h" - - char *tracefs_get_tracing_file(const char *name); ---- a/lib/trace-cmd/trace-plugin.c 2020-07-17 17:14:20.000000000 +0200 -+++ b/lib/trace-cmd/trace-plugin.c 2020-07-18 16:33:40.323675122 +0200 +--- a/lib/trace-cmd/trace-plugin.c ++++ b/lib/trace-cmd/trace-plugin.c @@ -6,6 +6,7 @@ #include #include @@ -18,18 +8,18 @@ #include #include #include "trace-cmd.h" ---- a/tracecmd/trace-agent.c 2020-07-17 17:14:20.000000000 +0200 -+++ b/tracecmd/trace-agent.c 2020-07-18 16:35:53.882667161 +0200 +--- a/tracecmd/trace-agent.c ++++ b/tracecmd/trace-agent.c @@ -14,6 +14,7 @@ #include #include #include +#include - #include #include #include ---- a/tracecmd/trace-setup-guest.c 2020-07-17 17:14:20.000000000 +0200 -+++ b/tracecmd/trace-setup-guest.c 2020-07-18 16:37:29.463661464 +0200 + #include +--- a/tracecmd/trace-setup-guest.c ++++ b/tracecmd/trace-setup-guest.c @@ -13,6 +13,7 @@ #include #include @@ -38,3 +28,23 @@ #include "trace-local.h" #include "trace-msg.h" +--- a/lib/trace-cmd/trace-timesync-kvm.c ++++ b/lib/trace-cmd/trace-timesync-kvm.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include "trace-cmd.h" + #include "trace-cmd-private.h" +--- a/utest/tracecmd-utest.c ++++ b/utest/tracecmd-utest.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch b/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch deleted file mode 100644 index 5203d3335c2b..000000000000 --- a/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/tracecmd/trace-tsync.c 2020-07-17 17:14:20.000000000 +0200 -+++ b/tracecmd/trace-tsync.c 2020-07-18 16:41:53.175645746 +0200 -@@ -104,8 +104,10 @@ - - pthread_attr_init(&attrib); - pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); -+#if defined(__GLIBC__) - if (!get_first_cpu(&pin_mask, &mask_size)) - pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); -+#endif - - ret = pthread_create(&instance->tsync_thread, &attrib, - tsync_host_thread, &instance->tsync); -@@ -243,8 +245,10 @@ - pthread_attr_init(&attrib); - tsync->sync_proto = proto; - pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); -+#if defined(__GLIBC__) - if (!get_first_cpu(&pin_mask, &mask_size)) - pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); -+#endif - - ret = pthread_create(thr_id, &attrib, tsync_agent_thread, tsync); - diff --git a/srcpkgs/trace-cmd/patches/musl-pthread_h.patch b/srcpkgs/trace-cmd/patches/musl-pthread_h.patch deleted file mode 100644 index 367588391845..000000000000 --- a/srcpkgs/trace-cmd/patches/musl-pthread_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/trace-cmd/trace-cmd.h 2020-07-17 17:14:20.000000000 +0200 -+++ b/include/trace-cmd/trace-cmd.h 2020-07-18 16:23:27.984711620 +0200 -@@ -6,6 +6,7 @@ - #ifndef _TRACE_CMD_H - #define _TRACE_CMD_H - -+#include - #include "traceevent/event-parse.h" - - #define TRACECMD_MAGIC { 23, 8, 68 } diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template index 34f9bcb40d42..70a94b1f7e7a 100644 --- a/srcpkgs/trace-cmd/template +++ b/srcpkgs/trace-cmd/template @@ -1,37 +1,53 @@ # Template file for 'trace-cmd' pkgname=trace-cmd -version=2.9.1 +version=3.1.2 revision=1 wrksrc="${pkgname}-v${version}" build_style=gnu-makefile -make_build_args="prefix=/usr all gui doc" -make_install_args="prefix=/usr install install_gui install_doc" -make_use_env=1 -hostmakedepends="git asciidoc pkg-config cmake qt5-qmake qt5-host-tools" -makedepends="json-c-devel libfreeglut-devel libxml2-devel qt5-devel" +make_build_args="prefix=/usr libdir_relative=lib" +make_build_target="all libs doc" +make_install_args="$make_build_args" +make_install_target="install install_libs install_doc" +make_use_env=yes +hostmakedepends="asciidoc xmlto source-highlight pkg-config" +makedepends="libzstd-devel libtracefs-devel libtraceevent-devel" +checkdepends="CUnit-devel" short_desc="Tools to use ftrace Linux kernel internal tracer" maintainer="Leah Neukirchen " license="GPL-2.0-or-later, LGPL-2.1-only" -homepage="http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/" -distfiles="http://git.kernel.org/cgit/linux/kernel/git/rostedt/${pkgname}.git/snapshot/${pkgname}-v${version}.tar.gz" -checksum=9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38 -disable_parallel_build=yes +homepage="https://trace-cmd.org" +distfiles="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz" +checksum=206672af60aa0bc35cfc44a4be746efa575bac729060e54b6453f7d5dfbcd979 + +do_check() { + make ${makejobs} test + utest/trace-utest +} post_install() { - vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/usr/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions + rm ${DESTDIR}/etc/bash_completion.d/* + vcompletion tracecmd/trace-cmd.bash bash + + if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then + mv ${DESTDIR}/usr/lib64/pkgconfig ${DESTDIR}/usr/lib/pkgconfig + fi +} + +libtracecmd_package() { + short_desc+=" - library" + pkg_install() { + vmove "usr/lib/*.so.*" + } } -kernelshark_package() { +libtracecmd-devel_package() { depends="${sourcepkg}>=${version}_${revision}" - short_desc="GUI for ftrace Linux kernel internal tracer" + short_desc+=" - development files" pkg_install() { - vmove usr/bin/kernelshark - vmove usr/bin/kshark-record - vmove usr/bin/kshark-su-record - vmove usr/lib/kernelshark - vmove usr/share/applications/kernelshark.desktop - vmove usr/share/icons/kernelshark - vmove usr/share/polkit-1/actions/org.freedesktop.kshark-record.policy + vmove usr/share/man/man3 + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/doc/libtracecmd-doc } } From bf6c7b103bbdcf5769c1ece8ab91ccde1f9cb204 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 23 Aug 2022 03:07:55 -0400 Subject: [PATCH 4/7] kernelshark: split from trace-cmd, update to 2.1.1 --- common/shlibs | 1 + srcpkgs/kernelshark/template | 38 ++++++++++++++++++++++++++++++++++++ srcpkgs/libkshark | 1 + srcpkgs/libkshark-devel | 1 + 4 files changed, 41 insertions(+) create mode 100644 srcpkgs/kernelshark/template create mode 120000 srcpkgs/libkshark create mode 120000 srcpkgs/libkshark-devel diff --git a/common/shlibs b/common/shlibs index d0efac27f360..9387807c0574 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4179,3 +4179,4 @@ libgbinder.so.1 libgbinder-1.1.20_1 libtraceevent.so.1 libtraceevent-1.6.2_1 libtracefs.so.1 libtracefs-1.4.2_1 libtracecmd.so.1 libtracecmd-3.1.2_1 +libkshark.so.2 libkshark-2.1.1_1 diff --git a/srcpkgs/kernelshark/template b/srcpkgs/kernelshark/template new file mode 100644 index 000000000000..18d5b9d7430c --- /dev/null +++ b/srcpkgs/kernelshark/template @@ -0,0 +1,38 @@ +# Template file for 'kernelshark' +pkgname=kernelshark +reverts="2.9.1_1 2.9_1 2.8.3_2 2.8.3_1 2.8.2_1 2.8.1_1 2.7_2 2.7_1 2.6.2_1 2.6.1_1 + 2.6_1 2.5.3_3 2.5.3_2 2.5.3_1 2.5.1_1 2.5_1 2.4_1" +version=2.1.1 +revision=1 +wrksrc="kernel-shark-kernelshark-v${version}" +build_style=cmake +configure_args="-D_INSTALL_PREFIX=/usr" +hostmakedepends="qt5-qmake qt5-host-tools pkg-config freefont-ttf" +makedepends="libfreeglut-devel qt5-devel json-c-devel libXmu-devel libXi-devel + libtraceevent-devel libtracefs-devel libtracecmd-devel" +depends="freefont-ttf" +short_desc="Front end reader of trace-cmd(1) output" +maintainer="Leah Neukirchen " +license="GPL-3.0-or-later" +homepage="https://www.kernelshark.org" +distfiles="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernel-shark-kernelshark-v${version}.tar.gz" +checksum=78a0cf28bc06d0e43cd5a2512f83c02b7b5c969a26a0d4b56338154d6cf6f7be +# requires externally-downloaded data and segfaults on some gui tests +make_check=no + +libkshark_package() { + short_desc+=" - library" + pkg_install() { + vmove "usr/lib/libkshark.so.*" + } +} + +libkshark-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libkshark b/srcpkgs/libkshark new file mode 120000 index 000000000000..5e1b3a665844 --- /dev/null +++ b/srcpkgs/libkshark @@ -0,0 +1 @@ +kernelshark \ No newline at end of file diff --git a/srcpkgs/libkshark-devel b/srcpkgs/libkshark-devel new file mode 120000 index 000000000000..5e1b3a665844 --- /dev/null +++ b/srcpkgs/libkshark-devel @@ -0,0 +1 @@ +kernelshark \ No newline at end of file From 855079028903c7d90456b73d8dd470edd83a21c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Aug 2022 22:33:22 +0700 Subject: [PATCH 5/7] fixup! New package: libtraceevent-1.6.2 --- srcpkgs/libtraceevent/template | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/srcpkgs/libtraceevent/template b/srcpkgs/libtraceevent/template index fbb5bec450c5..c472a5002337 100644 --- a/srcpkgs/libtraceevent/template +++ b/srcpkgs/libtraceevent/template @@ -3,9 +3,9 @@ pkgname=libtraceevent version=1.6.2 revision=1 build_style=gnu-makefile -make_build_args="prefix=/usr" +make_build_args="prefix=/usr libdir_relative=lib${XBPS_TARGET_WORDSIZE}" make_build_target="all doc" -make_install_args="$make_build_args" +make_install_args="$make_build_args pkgconfig_dir=/usr/lib/pkgconfig" make_install_target="install doc-install" hostmakedepends="asciidoc xmlto source-highlight pkg-config" checkdepends="CUnit-devel" @@ -21,12 +21,6 @@ do_check() { utest/trace-utest } -post_install() { - if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then - mv ${DESTDIR}/usr/lib64/pkgconfig ${DESTDIR}/usr/lib/pkgconfig - fi -} - libtraceevent-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From aad6ddf37b298c9bd692c5da79c4267150953d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Aug 2022 22:52:42 +0700 Subject: [PATCH 6/7] fixup! New package: libtracefs-1.4.2 --- srcpkgs/libtracefs/patches/musl.patch | 15 +++++++++++++++ srcpkgs/libtracefs/template | 11 ++++------- 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/libtracefs/patches/musl.patch diff --git a/srcpkgs/libtracefs/patches/musl.patch b/srcpkgs/libtracefs/patches/musl.patch new file mode 100644 index 000000000000..b30126ce5736 --- /dev/null +++ b/srcpkgs/libtracefs/patches/musl.patch @@ -0,0 +1,15 @@ +--- a/include/tracefs.h ++++ b/include/tracefs.h +@@ -10,6 +10,12 @@ + #include + #include + ++#ifndef _GNU_SOURCE ++/* See CPU_SET(3) */ ++struct cpu_set_t; ++typedef struct cpu_set_t cpu_set_t; ++#endif ++ + char *tracefs_get_tracing_file(const char *name); + void tracefs_put_tracing_file(char *name); + diff --git a/srcpkgs/libtracefs/template b/srcpkgs/libtracefs/template index 3d7be3ba7e65..424e7bb72843 100644 --- a/srcpkgs/libtracefs/template +++ b/srcpkgs/libtracefs/template @@ -3,9 +3,9 @@ pkgname=libtracefs version=1.4.2 revision=1 build_style=gnu-makefile -make_build_args="prefix=/usr" +make_build_args="prefix=/usr libdir_relative=lib${XBPS_TARGET_WORDSIZE}" make_build_target="all doc" -make_install_args="$make_build_args" +make_install_args="$make_build_args pkgconfig_dir=/usr/lib/pkgconfig" make_install_target="install install_doc" make_use_env=yes hostmakedepends="asciidoc xmlto source-highlight pkg-config" @@ -26,16 +26,13 @@ do_check() { post_install() { # manpage for sample program rm ${DESTDIR}/usr/share/man/man1/sqlhist.1 - - if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then - mv ${DESTDIR}/usr/lib64/pkgconfig ${DESTDIR}/usr/lib/pkgconfig - fi } libtracefs-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} libtraceevent-devel" short_desc+=" - development files" pkg_install() { + vmove usr/share/doc vmove usr/share/man/man3 vmove usr/include vmove usr/lib/pkgconfig From cb48deb4a72b3b0f79c417359b4b80a7e60efba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Aug 2022 22:56:47 +0700 Subject: [PATCH 7/7] fixup! kernelshark: split from trace-cmd, update to 2.1.1 --- srcpkgs/kernelshark/patches/musl.patch | 20 ++++++++++++++++++++ srcpkgs/kernelshark/template | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/kernelshark/patches/musl.patch diff --git a/srcpkgs/kernelshark/patches/musl.patch b/srcpkgs/kernelshark/patches/musl.patch new file mode 100644 index 000000000000..e02fddb486c7 --- /dev/null +++ b/srcpkgs/kernelshark/patches/musl.patch @@ -0,0 +1,20 @@ +--- a/src/libkshark.h ++++ b/src/libkshark.h +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + // Json-C + #include +--- a/src/kernelshark.cpp ++++ b/src/kernelshark.cpp +@@ -7,6 +7,7 @@ + // C + #include + #include ++#include + + // Qt + #include diff --git a/srcpkgs/kernelshark/template b/srcpkgs/kernelshark/template index 18d5b9d7430c..966359c725b0 100644 --- a/srcpkgs/kernelshark/template +++ b/srcpkgs/kernelshark/template @@ -6,11 +6,12 @@ version=2.1.1 revision=1 wrksrc="kernel-shark-kernelshark-v${version}" build_style=cmake -configure_args="-D_INSTALL_PREFIX=/usr" +configure_args="-D_INSTALL_PREFIX=/usr + -DTRACECMD_EXECUTABLE=/usr/bin/trace-cmd" hostmakedepends="qt5-qmake qt5-host-tools pkg-config freefont-ttf" makedepends="libfreeglut-devel qt5-devel json-c-devel libXmu-devel libXi-devel libtraceevent-devel libtracefs-devel libtracecmd-devel" -depends="freefont-ttf" +depends="freefont-ttf trace-cmd" short_desc="Front end reader of trace-cmd(1) output" maintainer="Leah Neukirchen " license="GPL-3.0-or-later"