From 3096250cae9a326f8c93112723a94eaab52a9cb3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 Sep 2011 09:33:47 +0200
Subject: update to latest upstream, fix crisv32 build, allow static building

---
 package/strace/Makefile                        | 14 +++++++++-----
 package/strace/patches/patch-Makefile_in       | 21 +++++++++++----------
 package/strace/patches/patch-net_c             | 10 ----------
 package/strace/src/linux/crisv32/ioctlent.h.in |  1 +
 package/strace/src/linux/crisv32/syscallent.h  |  1 +
 5 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 package/strace/patches/patch-net_c
 create mode 100644 package/strace/src/linux/crisv32/ioctlent.h.in
 create mode 100644 package/strace/src/linux/crisv32/syscallent.h

(limited to 'package')

diff --git a/package/strace/Makefile b/package/strace/Makefile
index 8a0bfb694..548891921 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,23 +4,27 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.5.20
+PKG_VERSION:=		4.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		64dfe10d9db0c1e34030891695ffca4b
+PKG_MD5SUM:=		e537b2b1afeec70c0e6e27a0d0fd671e
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+endif
+
 INSTALL_STYLE:=		manual
 
 do-install:
-	${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in
index c93da1102..38329e3ac 100644
--- a/package/strace/patches/patch-Makefile_in
+++ b/package/strace/patches/patch-Makefile_in
@@ -1,10 +1,11 @@
---- strace-4.5.20.orig/Makefile.in	2010-04-14 21:41:05.000000000 +0200
-+++ strace-4.5.20/Makefile.in	2010-12-28 22:43:17.000000000 +0100
-@@ -242,6 +242,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh sig
- 	     linux/ioctlent.h linux/errnoent.h linux/signalent.h \
- 	     linux/syscall.h linux/dummy.h \
- 	     linux/i386/syscallent.h \
-+	     linux/cris/syscallent.h \
- 	     linux/alpha/errnoent.h linux/alpha/ioctlent.h \
- 	     linux/alpha/signalent.h linux/alpha/syscallent.h \
- 	     linux/arm/syscallent.h linux/arm/syscallent1.h \
+--- strace-4.6.orig/Makefile.in	2011-03-15 19:23:18.000000000 +0100
++++ strace-4.6/Makefile.in	2011-09-02 09:14:19.198484990 +0200
+@@ -270,7 +270,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tests
++SUBDIRS =
+ man_MANS = strace.1
+ bin_SCRIPTS = strace-graph
+ 
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
deleted file mode 100644
index a0dc31029..000000000
--- a/package/strace/patches/patch-net_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.5.19.orig/net.c	2009-09-01 21:53:29.000000000 +0200
-+++ strace-4.5.19/net.c	2009-12-03 23:35:36.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <net/if.h>
- #if defined(LINUX)
- #include <asm/types.h>
-+#include <linux/netlink.h>
- #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
- #  include <netipx/ipx.h>
- #else
diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in
new file mode 100644
index 000000000..52ac99ba0
--- /dev/null
+++ b/package/strace/src/linux/crisv32/ioctlent.h.in
@@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h
new file mode 100644
index 000000000..d8dd9f7ab
--- /dev/null
+++ b/package/strace/src/linux/crisv32/syscallent.h
@@ -0,0 +1 @@
+#include "i386/syscallent.h"
-- 
cgit v1.2.3