diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
commit | 901ced0812b458fdc599fe40b0a4233d422d6df9 (patch) | |
tree | b0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-openembedded/meta-oe/recipes-devtools/pahole/files | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
parent | 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff) | |
download | openbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz |
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/pahole/files')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch new file mode 100644 index 000000000..d64cba109 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch @@ -0,0 +1,44 @@ +From f6ca8c930d0fbd2491b3cc77169e32806a14e5e9 Mon Sep 17 00:00:00 2001 +From: Matteo Croce <mcroce@microsoft.com> +Date: Mon, 30 Aug 2021 16:25:56 +0200 +Subject: [PATCH] CMakeList.txt: make python optional + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=88431099950ab3e8bc1645353508d7978a6cad35] + +ostra-cg, which requires python, is installed in the destination dir. +Make it optional for embedded distributions which doesn't have the +python interpreter available. + +Signed-off-by: Matteo Croce <mcroce@microsoft.com> +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4140574..8523bce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,6 +61,7 @@ find_package(DWARF REQUIRED) + find_package(ZLIB REQUIRED) + find_package(argp REQUIRED) + find_package(obstack REQUIRED) ++find_package(Python3 QUIET) + + # make sure git submodule(s) are checked out + find_package(Git QUIET) +@@ -185,8 +186,10 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h + elfcreator.h elf_symtab.h hash.h libctf.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dwarves/) + install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/) +-install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ++if(Python3_FOUND) ++ install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ++ install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) ++endif() + install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +-install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) + install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime) +-- +2.31.1 + |