| author | Arnaud Lacombe <lacombar@gmail.com> |
| Thu Aug 05 17:59:51 2010 +0200 (2010-08-05) | |
| changeset 2069 | 366bd2b22675 |
| permissions | -rw-r--r-- |
| yann@1262 | 1 |
diff -durN ltrace-0.5.1.orig/Makefile.in ltrace-0.5.1/Makefile.in |
| yann@1262 | 2 |
--- ltrace-0.5.1.orig/Makefile.in 2008-12-10 18:43:41.000000000 +0100 |
| yann@1262 | 3 |
+++ ltrace-0.5.1/Makefile.in 2009-03-16 17:23:26.000000000 +0100 |
| yann@1262 | 4 |
@@ -2,8 +2,14 @@ |
| yann@1262 | 5 |
# ltrace's Makefile.in |
| yann@1262 | 6 |
# |
| yann@1262 | 7 |
|
| yann@1262 | 8 |
-#OS := $(shell uname -s) |
| yann@1262 | 9 |
OS := @HOST_OS@ |
| yann@1262 | 10 |
+ARCH := $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/ \ |
| yann@1262 | 11 |
+ -e s/sun4u/sparc64/ \ |
| yann@1262 | 12 |
+ -e s/arm.*/arm/ \ |
| yann@1262 | 13 |
+ -e s/sa110/arm/ \ |
| yann@1262 | 14 |
+ -e s/ppc64/ppc/ \ |
| yann@1262 | 15 |
+ -e s/s390x/s390/) |
| yann@1262 | 16 |
+export ARCH |
| yann@1262 | 17 |
|
| yann@1262 | 18 |
TOPDIR = $(shell pwd) |
| yann@1262 | 19 |
|
| yann@1262 | 20 |
diff -durN ltrace-0.5.1.orig/configure ltrace-0.5.1/configure |
| yann@1262 | 21 |
--- ltrace-0.5.1.orig/configure 2008-12-10 18:43:43.000000000 +0100 |
| yann@1262 | 22 |
+++ ltrace-0.5.1/configure 2009-03-16 17:20:10.000000000 +0100 |
| yann@1262 | 23 |
@@ -660,6 +660,7 @@ |
| yann@1262 | 24 |
host_cpu |
| yann@1262 | 25 |
host_vendor |
| yann@1262 | 26 |
host_os |
| yann@1262 | 27 |
+HOST_ARCH |
| yann@1262 | 28 |
HOST_OS |
| yann@1262 | 29 |
CC |
| yann@1262 | 30 |
CFLAGS |
| yann@1262 | 31 |
@@ -1823,6 +1824,7 @@ |
| yann@1262 | 32 |
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
| yann@1262 | 33 |
|
| yann@1262 | 34 |
|
| yann@1262 | 35 |
+HOST_ARCH="$host_cpu" |
| yann@1262 | 36 |
case "$host_os" in |
| yann@1262 | 37 |
linux-gnu*) host_os=linux-gnu |
| yann@1262 | 38 |
esac |
| yann@1262 | 39 |
@@ -5406,6 +5408,7 @@ |
| yann@1262 | 40 |
host_cpu!$host_cpu$ac_delim |
| yann@1262 | 41 |
host_vendor!$host_vendor$ac_delim |
| yann@1262 | 42 |
host_os!$host_os$ac_delim |
| yann@1262 | 43 |
+HOST_ARCH!$HOST_ARCH$ac_delim |
| yann@1262 | 44 |
HOST_OS!$HOST_OS$ac_delim |
| yann@1262 | 45 |
CC!$CC$ac_delim |
| yann@1262 | 46 |
CFLAGS!$CFLAGS$ac_delim |
| yann@1262 | 47 |
@@ -5426,7 +5429,7 @@ |
| yann@1262 | 48 |
LTLIBOBJS!$LTLIBOBJS$ac_delim |
| yann@1262 | 49 |
_ACEOF |
| yann@1262 | 50 |
|
| yann@1262 | 51 |
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then |
| yann@1262 | 52 |
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then |
| yann@1262 | 53 |
break |
| yann@1262 | 54 |
elif $ac_last_try; then |
| yann@1262 | 55 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| yann@1262 | 56 |
diff -durN ltrace-0.5.1.orig/configure.ac ltrace-0.5.1/configure.ac |
| yann@1262 | 57 |
--- ltrace-0.5.1.orig/configure.ac 2008-12-10 18:43:41.000000000 +0100 |
| yann@1262 | 58 |
+++ ltrace-0.5.1/configure.ac 2009-03-16 17:21:26.000000000 +0100 |
| yann@1262 | 59 |
@@ -11,6 +11,8 @@ |
| yann@1262 | 60 |
esac |
| yann@1262 | 61 |
HOST_OS="$host_os" |
| yann@1262 | 62 |
AC_SUBST(HOST_OS) |
| yann@1262 | 63 |
+HOST_ARCH="$host_cpu" |
| yann@1262 | 64 |
+AC_SUBST(HOST_ARCH) |
| yann@1262 | 65 |
|
| yann@1262 | 66 |
dnl Checks for programs. |
| yann@1262 | 67 |
AC_PROG_CC |
| yann@1262 | 68 |
diff -durN ltrace-0.5.1.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.1/sysdeps/linux-gnu/Makefile |
| yann@1262 | 69 |
--- ltrace-0.5.1.orig/sysdeps/linux-gnu/Makefile 2008-12-10 18:43:41.000000000 +0100 |
| yann@1262 | 70 |
+++ ltrace-0.5.1/sysdeps/linux-gnu/Makefile 2009-03-16 17:21:49.000000000 +0100 |
| yann@1262 | 71 |
@@ -1,6 +1,3 @@ |
| yann@1262 | 72 |
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ |
| yann@1262 | 73 |
- -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/) |
| yann@1262 | 74 |
- |
| yann@1262 | 75 |
CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH) |
| yann@1262 | 76 |
|
| yann@1262 | 77 |
OBJ = trace.o proc.o breakpoint.o |