298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-20 00:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: fix build on linux 6.6

Browse Source 
- use Makefile.perf to prevent overriding MAKEFLAGS
- fix path to PKG_CONFIG
- link libstdc++ statically (only used for demangling)

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-03-24 15:43:02 +01:00
parent 917b787887
commit b5c1277609
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/devel/perf/Makefile
View File

@ -28,7 +28,7 @@ define Package/perf
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
DEPENDS:= +libelf +libdw +PACKAGE_libunwind:libunwind +libpthread +librt +objdump @!IN_SDK @KERNEL_PERF_EVENTS \ DEPENDS:= +libelf +libdw +PACKAGE_libunwind:libunwind +libpthread +librt +objdump @!IN_SDK @KERNEL_PERF_EVENTS \
+PACKAGE_libbfd:libbfd +PACKAGE_libopcodes:libopcodes +PACKAGE_libbfd:libbfd +PACKAGE_libopcodes:libopcodes +libtraceevent
TITLE:=Linux performance monitoring tool TITLE:=Linux performance monitoring tool
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
URL:=http://www.kernel.org URL:=http://www.kernel.org
@ -63,14 +63,19 @@ MAKE_FLAGS = \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
KBUILD_HOSTCFLAGS="$(HOST_CFLAGS)" \ KBUILD_HOSTCFLAGS="$(HOST_CFLAGS)" \
$(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \ $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \
PKG_CONFIG="$(PKG_CONFIG)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
EXCLUDE_EXTLIBS="-lstdc++" \
EXTRA_PERFLIBS="$(shell $(TARGET_CC) -print-file-name=libstdc++.a)" \
WERROR=0 \ WERROR=0 \
O=$(PKG_BUILD_DIR) \ O=$(PKG_BUILD_DIR) \
prefix=/usr prefix=/usr
define Build/Compile define Build/Compile
+$(MAKE_FLAGS) $(MAKE) $(PKG_JOBS) \ +$(MAKE) $(PKG_JOBS) $(MAKE_FLAGS) \
--no-print-directory \ --no-print-directory \
-C $(LINUX_DIR)/tools/perf -C $(LINUX_DIR)/tools/perf \
-f Makefile.perf
endef endef
define Package/perf/install define Package/perf/install