yann@1262: diff -durN ltrace-0.5.1.orig/Makefile.in ltrace-0.5.1/Makefile.in yann@1262: --- ltrace-0.5.1.orig/Makefile.in 2008-12-10 18:43:41.000000000 +0100 yann@1262: +++ ltrace-0.5.1/Makefile.in 2009-03-16 17:23:26.000000000 +0100 yann@1262: @@ -2,8 +2,14 @@ yann@1262: # ltrace's Makefile.in yann@1262: # yann@1262: yann@1262: -#OS := $(shell uname -s) yann@1262: OS := @HOST_OS@ yann@1262: +ARCH := $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/ \ yann@1262: + -e s/sun4u/sparc64/ \ yann@1262: + -e s/arm.*/arm/ \ yann@1262: + -e s/sa110/arm/ \ yann@1262: + -e s/ppc64/ppc/ \ yann@1262: + -e s/s390x/s390/) yann@1262: +export ARCH yann@1262: yann@1262: TOPDIR = $(shell pwd) yann@1262: yann@1262: diff -durN ltrace-0.5.1.orig/configure ltrace-0.5.1/configure yann@1262: --- ltrace-0.5.1.orig/configure 2008-12-10 18:43:43.000000000 +0100 yann@1262: +++ ltrace-0.5.1/configure 2009-03-16 17:20:10.000000000 +0100 yann@1262: @@ -660,6 +660,7 @@ yann@1262: host_cpu yann@1262: host_vendor yann@1262: host_os yann@1262: +HOST_ARCH yann@1262: HOST_OS yann@1262: CC yann@1262: CFLAGS yann@1262: @@ -1823,6 +1824,7 @@ yann@1262: case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac yann@1262: yann@1262: yann@1262: +HOST_ARCH="$host_cpu" yann@1262: case "$host_os" in yann@1262: linux-gnu*) host_os=linux-gnu yann@1262: esac yann@1262: @@ -5406,6 +5408,7 @@ yann@1262: host_cpu!$host_cpu$ac_delim yann@1262: host_vendor!$host_vendor$ac_delim yann@1262: host_os!$host_os$ac_delim yann@1262: +HOST_ARCH!$HOST_ARCH$ac_delim yann@1262: HOST_OS!$HOST_OS$ac_delim yann@1262: CC!$CC$ac_delim yann@1262: CFLAGS!$CFLAGS$ac_delim yann@1262: @@ -5426,7 +5429,7 @@ yann@1262: LTLIBOBJS!$LTLIBOBJS$ac_delim yann@1262: _ACEOF yann@1262: yann@1262: - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then yann@1262: + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then yann@1262: break yann@1262: elif $ac_last_try; then yann@1262: { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 yann@1262: diff -durN ltrace-0.5.1.orig/configure.ac ltrace-0.5.1/configure.ac yann@1262: --- ltrace-0.5.1.orig/configure.ac 2008-12-10 18:43:41.000000000 +0100 yann@1262: +++ ltrace-0.5.1/configure.ac 2009-03-16 17:21:26.000000000 +0100 yann@1262: @@ -11,6 +11,8 @@ yann@1262: esac yann@1262: HOST_OS="$host_os" yann@1262: AC_SUBST(HOST_OS) yann@1262: +HOST_ARCH="$host_cpu" yann@1262: +AC_SUBST(HOST_ARCH) yann@1262: yann@1262: dnl Checks for programs. yann@1262: AC_PROG_CC yann@1262: diff -durN ltrace-0.5.1.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.1/sysdeps/linux-gnu/Makefile yann@1262: --- ltrace-0.5.1.orig/sysdeps/linux-gnu/Makefile 2008-12-10 18:43:41.000000000 +0100 yann@1262: +++ ltrace-0.5.1/sysdeps/linux-gnu/Makefile 2009-03-16 17:21:49.000000000 +0100 yann@1262: @@ -1,6 +1,3 @@ yann@1262: -ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ yann@1262: - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/) yann@1262: - yann@1262: CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH) yann@1262: yann@1262: OBJ = trace.o proc.o breakpoint.o