Commit b1f39829 authored by Eric Andersen's avatar Eric Andersen
Browse files

strace 4.5 builds properly for mipsel, and does not use sys_errlist,

so we no longer need to patch anything.
 -Erik
parent d632d42b
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -3,11 +3,10 @@
# strace
#
#############################################################
STRACE_SOURCE:=strace_4.4-1.tar.gz
STRACE_SOURCE:=strace-4.5.tar.bz2
STRACE_SITE:=http://aleron.dl.sourceforge.net/sourceforge/strace
STRACE_CAT:=zcat
STRACE_DIR:=$(BUILD_DIR)/strace-4.4
STRACE_PATCH:=$(SOURCE_DIR)/strace.patch
STRACE_CAT:=bzcat
STRACE_DIR:=$(BUILD_DIR)/strace-4.5


$(DL_DIR)/$(STRACE_SOURCE):
@@ -17,7 +16,6 @@ strace-source: $(DL_DIR)/$(STRACE_SOURCE)

$(STRACE_DIR)/.unpacked: $(DL_DIR)/$(STRACE_SOURCE)
	$(STRACE_CAT) $(DL_DIR)/$(STRACE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
	cat $(STRACE_PATCH) | patch -p1 -d $(STRACE_DIR)
	touch $(STRACE_DIR)/.unpacked

$(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked

sources/strace.patch

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line
--- strace-4.4/syscall.c.orig	2003-09-03 01:15:32.000000000 -0600
+++ strace-4.4/syscall.c	2003-09-03 01:20:35.000000000 -0600
@@ -71,10 +71,12 @@
 # include <asm/rse.h>
 #endif
 
+#ifndef HAVE_STRERROR
 #ifndef SYS_ERRLIST_DECLARED
 extern int sys_nerr;
 extern char *sys_errlist[];
 #endif /* SYS_ERRLIST_DECLARED */
+#endif /* HAVE_STERRROR */
 
 #define NR_SYSCALL_BASE 0
 #ifdef LINUX
@@ -1529,6 +1531,7 @@
 #endif /* LINUX */
 			default:
 				tprintf("= -1 ");
+#ifndef HAVE_STRERROR
 				if (u_error < nerrnos && u_error < sys_nerr)
 					tprintf("%s (%s)", errnoent[u_error],
 						sys_errlist[u_error]);
@@ -1540,6 +1543,13 @@
 						sys_errlist[u_error]);
 				else
 					tprintf("E??? (errno %ld)", u_error);
+#else
+				if (u_error < nerrnos)
+					tprintf("%s (%s)", errnoent[u_error],
+						strerror(u_error));
+				else
+					tprintf("E??? (errno %ld)", u_error);
+#endif
 				break;
 			}
 		}