diff options
| -rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index bfd210cf2e..ebfedb91d7 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
| @@ -121,10 +121,12 @@ do_configure_prepend () { | |||
| 121 | # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit | 121 | # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit |
| 122 | # build, with a 64 bit multilib, the arch won't match and the detection of a | 122 | # build, with a 64 bit multilib, the arch won't match and the detection of a |
| 123 | # 64 bit build (and library) are not exected. To ensure that libraries are | 123 | # 64 bit build (and library) are not exected. To ensure that libraries are |
| 124 | # installed to the correct location, we can make the substitution in the | 124 | # installed to the correct location, we can use the weak assignment in the |
| 125 | # config/Makefile. For non multilib builds, this has no impact. | 125 | # config/Makefile. |
| 126 | if [ -e "${S}/tools/perf/config/Makefile" ]; then | 126 | if [ -e "${S}/tools/perf/config/Makefile" ]; then |
| 127 | sed -i 's,libdir = $(prefix)/$(lib),libdir = $(prefix)/${baselib},' ${S}/tools/perf/config/Makefile | 127 | # Match $(prefix)/$(lib) and $(prefix)/lib |
| 128 | sed -i 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ | ||
| 129 | ${S}/tools/perf/config/Makefile | ||
| 128 | fi | 130 | fi |
| 129 | # We need to ensure the --sysroot option in CC is preserved | 131 | # We need to ensure the --sysroot option in CC is preserved |
| 130 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then | 132 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then |