|
yann@973
|
1 |
diff -durN ltrace-0.4.orig/Makefile.in ltrace-0.4/Makefile.in
|
|
yann@973
|
2 |
--- ltrace-0.4.orig/Makefile.in 2006-03-05 23:21:07.000000000 +0100
|
|
yann@973
|
3 |
+++ ltrace-0.4/Makefile.in 2008-10-24 10:31:51.000000000 +0200
|
|
yann@973
|
4 |
@@ -2,8 +2,14 @@
|
|
yann@973
|
5 |
# ltrace's Makefile.in
|
|
yann@973
|
6 |
#
|
|
yann@973
|
7 |
|
|
yann@973
|
8 |
-#OS := $(shell uname -s)
|
|
yann@973
|
9 |
OS := @HOST_OS@
|
|
yann@973
|
10 |
+ARCH := $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/ \
|
|
yann@973
|
11 |
+ -e s/sun4u/sparc64/ \
|
|
yann@973
|
12 |
+ -e s/arm.*/arm/ \
|
|
yann@973
|
13 |
+ -e s/sa110/arm/ \
|
|
yann@973
|
14 |
+ -e s/ppc64/ppc/ \
|
|
yann@973
|
15 |
+ -e s/s390x/s390/)
|
|
yann@973
|
16 |
+export ARCH
|
|
yann@973
|
17 |
|
|
yann@973
|
18 |
TOPDIR = $(shell pwd)
|
|
yann@973
|
19 |
|
|
yann@973
|
20 |
@@ -20,10 +26,10 @@
|
|
yann@973
|
21 |
LIBS = @LIBS@
|
|
yann@973
|
22 |
|
|
yann@973
|
23 |
INSTALL = @INSTALL@
|
|
yann@973
|
24 |
-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
|
|
yann@973
|
25 |
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
|
|
yann@973
|
26 |
-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
|
|
yann@973
|
27 |
-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
|
|
yann@973
|
28 |
+INSTALL_FILE = $(INSTALL) -p -m 644
|
|
yann@973
|
29 |
+INSTALL_PROGRAM = $(INSTALL) -p -m 755
|
|
yann@973
|
30 |
+INSTALL_SCRIPT = $(INSTALL) -p -m 755
|
|
yann@973
|
31 |
+INSTALL_DIR = $(INSTALL) -p -d -m 755
|
|
yann@973
|
32 |
|
|
yann@973
|
33 |
OBJ = ltrace.o options.o elf.o output.o read_config_file.o \
|
|
yann@973
|
34 |
execute_program.o wait_for_something.o process_event.o \
|
|
yann@973
|
35 |
diff -durN ltrace-0.4.orig/configure ltrace-0.4/configure
|
|
yann@973
|
36 |
--- ltrace-0.4.orig/configure 2008-10-23 23:35:39.000000000 +0200
|
|
yann@973
|
37 |
+++ ltrace-0.4/configure 2008-10-24 10:27:20.000000000 +0200
|
|
yann@973
|
38 |
@@ -311,7 +311,7 @@
|
|
yann@973
|
39 |
# include <unistd.h>
|
|
yann@973
|
40 |
#endif"
|
|
yann@973
|
41 |
|
|
yann@973
|
42 |
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST_OS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP iquote iquoteend LIBOBJS LTLIBOBJS'
|
|
yann@973
|
43 |
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST_ARCH HOST_OS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP iquote iquoteend LIBOBJS LTLIBOBJS'
|
|
yann@973
|
44 |
ac_subst_files=''
|
|
yann@973
|
45 |
|
|
yann@973
|
46 |
# Initialize some variables set by options.
|
|
yann@973
|
47 |
@@ -1390,7 +1390,7 @@
|
|
yann@973
|
48 |
host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
yann@973
|
49 |
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
yann@973
|
50 |
|
|
yann@973
|
51 |
-
|
|
yann@973
|
52 |
+HOST_ARCH="$host_cpu"
|
|
yann@973
|
53 |
HOST_OS="$host_os"
|
|
yann@973
|
54 |
case "${HOST_OS}" in
|
|
yann@973
|
55 |
linux-*) HOST_OS=linux-gnu;;
|
|
yann@973
|
56 |
@@ -4818,6 +4818,7 @@
|
|
yann@973
|
57 |
s,@host_cpu@,$host_cpu,;t t
|
|
yann@973
|
58 |
s,@host_vendor@,$host_vendor,;t t
|
|
yann@973
|
59 |
s,@host_os@,$host_os,;t t
|
|
yann@973
|
60 |
+s,@HOST_ARCH@,$HOST_ARCH,;t t
|
|
yann@973
|
61 |
s,@HOST_OS@,$HOST_OS,;t t
|
|
yann@973
|
62 |
s,@CC@,$CC,;t t
|
|
yann@973
|
63 |
s,@CFLAGS@,$CFLAGS,;t t
|
|
yann@973
|
64 |
diff -durN ltrace-0.4.orig/configure.ac ltrace-0.4/configure.ac
|
|
yann@973
|
65 |
--- ltrace-0.4.orig/configure.ac 2008-10-23 23:35:39.000000000 +0200
|
|
yann@973
|
66 |
+++ ltrace-0.4/configure.ac 2008-10-24 10:19:47.000000000 +0200
|
|
yann@973
|
67 |
@@ -6,10 +6,12 @@
|
|
yann@973
|
68 |
|
|
yann@973
|
69 |
dnl Check host system type
|
|
yann@973
|
70 |
AC_CANONICAL_HOST
|
|
yann@973
|
71 |
+HOST_ARCH="$host_cpu"
|
|
yann@973
|
72 |
HOST_OS="$host_os"
|
|
yann@973
|
73 |
case "${HOST_OS}" in
|
|
yann@973
|
74 |
linux-*) HOST_OS=linux-gnu;;
|
|
yann@973
|
75 |
esac
|
|
yann@973
|
76 |
+AC_SUBST(HOST_ARCH)
|
|
yann@973
|
77 |
AC_SUBST(HOST_OS)
|
|
yann@973
|
78 |
|
|
yann@973
|
79 |
dnl Checks for programs.
|
|
yann@973
|
80 |
diff -durN ltrace-0.4.orig/sysdeps/linux-gnu/Makefile ltrace-0.4/sysdeps/linux-gnu/Makefile
|
|
yann@973
|
81 |
--- ltrace-0.4.orig/sysdeps/linux-gnu/Makefile 2006-02-20 22:44:45.000000000 +0100
|
|
yann@973
|
82 |
+++ ltrace-0.4/sysdeps/linux-gnu/Makefile 2008-10-24 10:24:41.000000000 +0200
|
|
yann@973
|
83 |
@@ -1,6 +1,3 @@
|
|
yann@973
|
84 |
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
|
|
yann@973
|
85 |
- -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
|
|
yann@973
|
86 |
-
|
|
yann@973
|
87 |
CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
|
|
yann@973
|
88 |
|
|
yann@973
|
89 |
OBJ = trace.o proc.o breakpoint.o
|