1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/ltrace/0.5/110-allow-cross-compile.patch Tue Nov 04 18:52:59 2008 +0000
1.3 @@ -0,0 +1,89 @@
1.4 +diff -durN ltrace-0.5.orig/Makefile.in ltrace-0.5/Makefile.in
1.5 +--- ltrace-0.5.orig/Makefile.in 2006-03-14 00:12:01.000000000 +0100
1.6 ++++ ltrace-0.5/Makefile.in 2008-11-04 19:23:05.000000000 +0100
1.7 +@@ -2,8 +2,14 @@
1.8 + # ltrace's Makefile.in
1.9 + #
1.10 +
1.11 +-#OS := $(shell uname -s)
1.12 + OS := @HOST_OS@
1.13 ++ARCH := $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/ \
1.14 ++ -e s/sun4u/sparc64/ \
1.15 ++ -e s/arm.*/arm/ \
1.16 ++ -e s/sa110/arm/ \
1.17 ++ -e s/ppc64/ppc/ \
1.18 ++ -e s/s390x/s390/)
1.19 ++export ARCH
1.20 +
1.21 + TOPDIR = $(shell pwd)
1.22 +
1.23 +@@ -20,10 +26,10 @@
1.24 + LIBS = @LIBS@
1.25 +
1.26 + INSTALL = @INSTALL@
1.27 +-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
1.28 +-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
1.29 +-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
1.30 +-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
1.31 ++INSTALL_FILE = $(INSTALL) -p -m 644
1.32 ++INSTALL_PROGRAM = $(INSTALL) -p -m 755
1.33 ++INSTALL_SCRIPT = $(INSTALL) -p -m 755
1.34 ++INSTALL_DIR = $(INSTALL) -p -d -m 755
1.35 +
1.36 + OBJ = ltrace.o options.o elf.o output.o read_config_file.o \
1.37 + execute_program.o wait_for_something.o process_event.o \
1.38 +diff -durN ltrace-0.5.orig/configure ltrace-0.5/configure
1.39 +--- ltrace-0.5.orig/configure 2008-11-04 19:23:00.000000000 +0100
1.40 ++++ ltrace-0.5/configure 2008-11-04 19:23:05.000000000 +0100
1.41 +@@ -311,7 +311,7 @@
1.42 + # include <unistd.h>
1.43 + #endif"
1.44 +
1.45 +-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'
1.46 ++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'
1.47 + ac_subst_files=''
1.48 +
1.49 + # Initialize some variables set by options.
1.50 +@@ -1390,7 +1390,7 @@
1.51 + host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
1.52 + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
1.53 +
1.54 +-
1.55 ++HOST_ARCH="$host_cpu"
1.56 + HOST_OS="$host_os"
1.57 + case "${HOST_OS}" in
1.58 + linux-*) HOST_OS=linux-gnu;;
1.59 +@@ -4846,6 +4846,7 @@
1.60 + s,@host_cpu@,$host_cpu,;t t
1.61 + s,@host_vendor@,$host_vendor,;t t
1.62 + s,@host_os@,$host_os,;t t
1.63 ++s,@HOST_ARCH@,$HOST_ARCH,;t t
1.64 + s,@HOST_OS@,$HOST_OS,;t t
1.65 + s,@CC@,$CC,;t t
1.66 + s,@CFLAGS@,$CFLAGS,;t t
1.67 +diff -durN ltrace-0.5.orig/configure.ac ltrace-0.5/configure.ac
1.68 +--- ltrace-0.5.orig/configure.ac 2008-11-04 19:23:00.000000000 +0100
1.69 ++++ ltrace-0.5/configure.ac 2008-11-04 19:23:05.000000000 +0100
1.70 +@@ -6,10 +6,12 @@
1.71 +
1.72 + dnl Check host system type
1.73 + AC_CANONICAL_HOST
1.74 ++HOST_ARCH="$host_cpu"
1.75 + HOST_OS="$host_os"
1.76 + case "${HOST_OS}" in
1.77 + linux-*) HOST_OS=linux-gnu;;
1.78 + esac
1.79 ++AC_SUBST(HOST_ARCH)
1.80 + AC_SUBST(HOST_OS)
1.81 +
1.82 + dnl Checks for programs.
1.83 +diff -durN ltrace-0.5.orig/sysdeps/linux-gnu/Makefile ltrace-0.5/sysdeps/linux-gnu/Makefile
1.84 +--- ltrace-0.5.orig/sysdeps/linux-gnu/Makefile 2006-02-20 22:44:45.000000000 +0100
1.85 ++++ ltrace-0.5/sysdeps/linux-gnu/Makefile 2008-11-04 19:23:05.000000000 +0100
1.86 +@@ -1,6 +1,3 @@
1.87 +-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
1.88 +- -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
1.89 +-
1.90 + CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
1.91 +
1.92 + OBJ = trace.o proc.o breakpoint.o