diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
| commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
| tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-util/kernelshark/files | |
| parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) | |
gentoo resync : 02.08.2019
Diffstat (limited to 'dev-util/kernelshark/files')
| -rw-r--r-- | dev-util/kernelshark/files/kernelshark-1.0-build.patch | 33 | ||||
| -rw-r--r-- | dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch | 11 |
2 files changed, 44 insertions, 0 deletions
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-build.patch b/dev-util/kernelshark/files/kernelshark-1.0-build.patch new file mode 100644 index 000000000000..411d4235a215 --- /dev/null +++ b/dev-util/kernelshark/files/kernelshark-1.0-build.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/kernel-shark/CMakeLists.txt +index 45c6f23..e2394d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,11 +63,11 @@ set(KS_LOGO_LABEL KS_logo_horizontal.svg) + + set(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/") + +-if (CMAKE_BUILD_TYPE MATCHES Package) ++if (NOT CMAKE_BUILD_TYPE MATCHES Package) + + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + +-else (CMAKE_BUILD_TYPE MATCHES Package) ++else (CMAKE_BUILD_TYPE MATCHES Gentoo) + + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +diff --git a/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake +index 2da4eee..c454ce6 100644 +--- a/build/FindTraceCmd.cmake ++++ b/build/FindTraceCmd.cmake +@@ -40,8 +40,8 @@ find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.a + # search was successful "find_path" will do nothing this time. + find_program(TRACECMD_EXECUTABLE NAMES trace-cmd) + find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h) +-find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so) +-find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.so) ++find_library(TRACECMD_LIBRARY NAMES libtracecmd.so) ++find_library(TRACEEVENT_LIBRARY NAMES libtraceevent.so) + + IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE) + diff --git a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch new file mode 100644 index 000000000000..2b9b444958dc --- /dev/null +++ b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch @@ -0,0 +1,11 @@ +diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake +index 2b02c0d..34c02ea 100644 +--- a/build/ks.desktop.cmake ++++ b/build/ks.desktop.cmake +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Version=@KS_VERSION_STRING@ ++Version=1.1 + Type=Application + Name=Kernel Shark + GenericName=Kernel Shark |