bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: fix multiple issues in Makefile

Browse Source 
* provide a proper version information
* make sure we build in the linux directory to avoid out of tree build
  failures
* make package cleaning actually work

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@34663 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-12-13 15:40:45 +00:00
parent 78f0550c9b
commit c535494566
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
devel/perf/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2011 OpenWrt.org # Copyright (C) 2011-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=perf PKG_NAME:=perf
PKG_VERSION:=$(LINUX_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -16,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/perf define Package/perf
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
DEPENDS:= +libdw +libpthread +librt @BROKEN DEPENDS:= +libelf1 +libdw +libpthread +librt @BROKEN
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
@ -26,24 +27,34 @@ define Package/perf/description
perf is the Linux performance monitoring tool perf is the Linux performance monitoring tool
endef endef
# Perf's makefile and headers are not relocatable and must be built from the
# Linux sources directory
define Build/Prepare define Build/Prepare
$(RM) -r $(PKG_BUILD_DIR)
ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR)
endef endef
define Build/Compile # MAKE_FLAGS should be passed again upon cleaning because Perf's makefile
$(MAKE) -C $(LINUX_DIR)/tools/perf \ # always performs checks before processing any rule
ARCH="$(LINUX_KARCH)" \ define Build/Clean
NO_LIBPERL=1 \ $(MAKE) -C $(PKG_BUILD_DIR) \
NO_LIBPYTHON=1 \ $(MAKE_FLAGS) \
NO_NEWT=1 \ clean
CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
LD="$(TARGET_CROSS)ld" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
V=1 \
prefix=/usr
endef endef
MAKE_FLAGS = \
ARCH="$(LINUX_KARCH)" \
NO_LIBPERL=1 \
NO_LIBPYTHON=1 \
NO_NEWT=1 \
CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
LD="$(TARGET_CROSS)ld" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
V=1 \
prefix=/usr
define Package/perf/install define Package/perf/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/ $(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/