diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:44:06 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:44:06 +0200 |
| commit | 4ca8e53e1ddb2f2f1e5520be33654c33481faae0 (patch) | |
| tree | 94896f54f338cc97a1e43adf3dcbdff15d5a512c /pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch | |
| parent | 59ac7e16347e2e841e24d3dd959b9fc5dab5fdc8 (diff) | |
| parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
| download | nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.gz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.bz2 nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.lz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.xz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.zst nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch')
| -rw-r--r-- | pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch new file mode 100644 index 00000000000..0d6f5c5d8bf --- /dev/null +++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch @@ -0,0 +1,52 @@ +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 +--- a/Makefile ++++ b/Makefile +@@ -289,7 +289,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 + 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,$(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 + ++install_man: ++ $(MAKE) -C $(src)/Documentation install_man ++ ++install_gui_docs: ++ $(MAKE) -C $(src)/Documentation install_gui ++ + install_doc: + $(MAKE) -C $(src)/Documentation install + |