perf: fix building with musl when NLS is enabled

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

diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile
index 0ec2bba3e2d57674398eda6e633dd6c50aba8fbd..e611d5eca3269c33d960c3e36fe281f7eb97cd3e 100644 (file)
--- a/package/devel/perf/Makefile
+++ b/package/devel/perf/Makefile
@@ -10,22 +10,24 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=perf
 PKG_VERSION:=$(LINUX_VERSION)
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_FLAGS:=nonshared
 
 # Perf's makefile and headers are not relocatable and must be built from the
 # Linux sources directory
 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 +libpthread +librt +objdump @!LINUX_3_18
+  DEPENDS:= +libelf +libdw +PACKAGE_libunwind:libunwind +libpthread +librt +objdump @!IN_SDK @!TARGET_arc770 @KERNEL_PERF_EVENTS
   TITLE:=Linux performance monitoring tool
   VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
   URL:=http://www.kernel.org
@@ -35,9 +37,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)" \
@@ -50,24 +52,23 @@ MAKE_FLAGS = \
        NO_GTK2=1 \
        NO_LIBAUDIT=1 \
        NO_LIBCRYPTO=1 \
+       NO_LIBUNWIND=1 \
+       NO_LIBCAP=1 \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        CC="$(TARGET_CC)" \
        LD="$(TARGET_CROSS)ld" \
        CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
        LDFLAGS="$(TARGET_LDFLAGS)" \
+       KBUILD_HOSTCFLAGS="$(HOST_CFLAGS)" \
        $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \
        WERROR=0 \
+       O=$(PKG_BUILD_DIR) \
        prefix=/usr
 
-ifdef CONFIG_USE_MUSL
- MAKE_FLAGS += EXTRA_CFLAGS="-I$(CURDIR)/musl-include -include $(CURDIR)/musl-compat.h -D__UCLIBC__"
-endif
-
 define Build/Compile
        +$(MAKE_FLAGS) $(MAKE) $(PKG_JOBS) \
-               -C $(PKG_BUILD_DIR) \
-               -f Makefile.perf \
-               --no-print-directory
+               --no-print-directory \
+               -C $(LINUX_DIR)/tools/perf
 endef
 
 define Package/perf/install