X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Fstrace%2FMakefile;h=2019acdc1fe9f79215ca058c98f058aae12ddeae;hb=3d2cf65418e9ae2b33adcceacdc2ab3e26f75a80;hp=6e93e233e144a495a57f9ff76ee3b53db7dfb5d8;hpb=0550a9ac78eaf2c17bd304f198fdf6a6eb3e6e6d;p=packages.git

diff --git a/utils/strace/Makefile b/utils/strace/Makefile
index 6e93e233e..2019acdc1 100644
--- a/utils/strace/Makefile
+++ b/utils/strace/Makefile
@@ -1,22 +1,29 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strace
-PKG_VERSION:=4.5.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
+
+OLD_KERNEL=$(findstring y,$(foreach v,23 24 25 26,$(CONFIG_LINUX_2_6_$(v))))
+ifneq ($(OLD_KERNEL),)
+  PKG_VERSION:=4.5.16
+  PKG_MD5SUM:=77f66d09aa82981bb6d65fa19a2c1ba9
+  PATCH_DIR:=patches-4.5.16
+else
+  PKG_VERSION:=4.5.18
+  PKG_MD5SUM:=e9449fcee97e6a8ed73934c883c870e0
+endif
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/strace
-PKG_MD5SUM:=09bcd5d00ece28f8154dec11cadfce3c
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,13 +35,11 @@ define Package/strace
 endef
 
 define Package/strace/description
-	A useful diagnostic, instructional, and debugging tool. 
-	Allows you to track what system calls a program makes while it is 
+	A useful diagnostic, instructional, and debugging tool.
+	Allows you to track what system calls a program makes while it is
 	running.
 endef
 
-# uses GNU configure
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)"
@@ -42,7 +47,7 @@ endef
 
 define Package/strace/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/strace $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,strace))