public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0

Browse Source
This commit is contained in:
Bas van Dijk
2019-10-31 16:07:39 -05:00
committed by Austin Seipp
parent ded2b8a669
commit d6cf06b950
4 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+21 -38
View File
@@ -1,52 +1,35 @@
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 21e42fd..826361d 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -108,7 +108,11 @@ $(IMGS_INSTALL): %.png.install : %.png force
GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL)
-install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL)
+install_man: $(MAN1_INSTALL) $(MAN5_INSTALL)
+
+install_gui: $(GUI_INSTALL)
+
+install: install_man install_gui
clean:
(cd $(obj); \
diff --git a/Makefile b/Makefile
index 2bcc383..107ead0 100644
index bbdf15e..deb8ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
@@ -288,7 +288,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
libtracecmd.a: $(LIBTRACECMD_STATIC)
libtracecmd.so: $(LIBTRACECMD_SHARED)
-libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED)
+libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC)
plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
$(Q)$(MAKE) -C $(src)/plugins
@@ -345,6 +345,8 @@ install_gui: install_cmd gui
plugins: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(obj)/lib/traceevent/plugins/trace_python_dir
$(Q)$(MAKE) -C $(src)/lib/traceevent/plugins
@@ -344,6 +344,8 @@ install_gui: install_cmd gui
install_libs: libs
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ))
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ))
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd)
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
@@ -356,6 +358,12 @@ doc:
doc_clean:
$(MAKE) -C $(src)/Documentation clean
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd)
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index e20a030..7fce165 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
+install_man:
+ $(MAKE) -C $(src)/Documentation install_man
+
+install_gui_docs:
+ $(MAKE) -C $(src)/Documentation install_gui
+
install_doc:
$(MAKE) -C $(src)/Documentation install
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
- DESTINATION /usr/share/polkit-1/actions/)
+ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
DESTINATION ${_INSTALL_PREFIX}/bin/)