scripts: fix revision calculation using new "main" branch

[openwrt/openwrt.git] / package / devel / perf / Makefile

diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile
index f5c8c7060a2eb138604805ac1016e07ff318bc34..20be59516dad1226f40987b82edd7f8018c1a952 100644 (file)
--- a/package/devel/perf/Makefile
+++ b/package/devel/perf/Makefile
@@ -10,9 +10,9 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=perf
 PKG_VERSION:=$(LINUX_VERSION)
-PKG_RELEASE:=2
+PKG_RELEASE:=5
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16 no-lto
 PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_FLAGS:=nonshared
@@ -22,11 +22,13 @@ PKG_FLAGS:=nonshared
 PKG_BUILD_DIR:=$(LINUX_DIR)/tools/perf-$(TARGET_DIR_NAME)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/perf
   SECTION:=devel
   CATEGORY:=Development
-  DEPENDS:= +libelf1 +libdw +libunwind +libpthread +librt +objdump @!LINUX_3_18 @!IN_SDK @!TARGET_arc770 @KERNEL_PERF_EVENTS
+  DEPENDS:= +libelf +libdw +PACKAGE_libunwind:libunwind +libpthread +librt +objdump @!IN_SDK @KERNEL_PERF_EVENTS \
+           +PACKAGE_libbfd:libbfd +PACKAGE_libopcodes:libopcodes +libtraceevent
   TITLE:=Linux performance monitoring tool
   VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
   URL:=http://www.kernel.org
@@ -36,9 +38,9 @@ define Package/perf/description
   perf is the Linux performance monitoring tool
 endef
 
-define Build/Prepare
-       $(CP) $(LINUX_DIR)/tools/perf/* $(PKG_BUILD_DIR)/
-endef
+HOST_CFLAGS += -I$(LINUX_DIR)/tools/include
+
+TARGET_LDFLAGS += $(INTL_LDFLAGS)
 
 MAKE_FLAGS = \
        ARCH="$(LINUX_KARCH)" \
@@ -52,26 +54,32 @@ MAKE_FLAGS = \
        NO_LIBAUDIT=1 \
        NO_LIBCRYPTO=1 \
        NO_LIBUNWIND=1 \
+       NO_LIBZSTD=1 \
+       NO_LIBCAP=1 \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        CC="$(TARGET_CC)" \
        LD="$(TARGET_CROSS)ld" \
-       CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+       EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
        LDFLAGS="$(TARGET_LDFLAGS)" \
+       KBUILD_HOSTCFLAGS="$(HOST_CFLAGS)" \
        $(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 \
+       O=$(PKG_BUILD_DIR) \
        prefix=/usr
 
-ifdef CONFIG_LINUX_4_4
-ifdef CONFIG_USE_MUSL
- MAKE_FLAGS += EXTRA_CFLAGS="-I$(CURDIR)/musl-include -include $(CURDIR)/musl-compat.h -D__UCLIBC__"
-endif
+ifeq ($(LINUX_KARCH),powerpc)
+       MAKE_FLAGS += NO_AUXTRACE=1
 endif
 
 define Build/Compile
-       +$(MAKE_FLAGS) $(MAKE) $(PKG_JOBS) \
-               -C $(PKG_BUILD_DIR) \
-               -f Makefile.perf \
-               --no-print-directory
+       +$(MAKE) $(PKG_JOBS) $(MAKE_FLAGS) \
+               --no-print-directory \
+               -C $(LINUX_DIR)/tools/perf \
+               -f Makefile.perf
 endef
 
 define Package/perf/install