1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/ltrace/0.4/100-fix-build-with-exotic-linux-host-OS.patch Fri Oct 24 15:40:58 2008 +0000
1.3 @@ -0,0 +1,26 @@
1.4 +diff -durN ltrace-0.4.orig/configure ltrace-0.4/configure
1.5 +--- ltrace-0.4.orig/configure 2008-10-23 23:19:38.000000000 +0200
1.6 ++++ ltrace-0.4/configure 2008-10-23 23:19:06.000000000 +0200
1.7 +@@ -1392,6 +1392,9 @@
1.8 +
1.9 +
1.10 + HOST_OS="$host_os"
1.11 ++case "${HOST_OS}" in
1.12 ++ linux-*) HOST_OS=linux-gnu;;
1.13 ++esac
1.14 +
1.15 +
1.16 + ac_ext=c
1.17 +diff -durN ltrace-0.4.orig/configure.ac ltrace-0.4/configure.ac
1.18 +--- ltrace-0.4.orig/configure.ac 2008-10-23 23:19:43.000000000 +0200
1.19 ++++ ltrace-0.4/configure.ac 2008-10-23 23:18:44.000000000 +0200
1.20 +@@ -7,6 +7,9 @@
1.21 + dnl Check host system type
1.22 + AC_CANONICAL_HOST
1.23 + HOST_OS="$host_os"
1.24 ++case "${HOST_OS}" in
1.25 ++ linux-*) HOST_OS=linux-gnu;;
1.26 ++esac
1.27 + AC_SUBST(HOST_OS)
1.28 +
1.29 + dnl Checks for programs.
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/ltrace/0.4/110-allow-cross-compile.patch Fri Oct 24 15:40:58 2008 +0000
2.3 @@ -0,0 +1,89 @@
2.4 +diff -durN ltrace-0.4.orig/Makefile.in ltrace-0.4/Makefile.in
2.5 +--- ltrace-0.4.orig/Makefile.in 2006-03-05 23:21:07.000000000 +0100
2.6 ++++ ltrace-0.4/Makefile.in 2008-10-24 10:31:51.000000000 +0200
2.7 +@@ -2,8 +2,14 @@
2.8 + # ltrace's Makefile.in
2.9 + #
2.10 +
2.11 +-#OS := $(shell uname -s)
2.12 + OS := @HOST_OS@
2.13 ++ARCH := $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/ \
2.14 ++ -e s/sun4u/sparc64/ \
2.15 ++ -e s/arm.*/arm/ \
2.16 ++ -e s/sa110/arm/ \
2.17 ++ -e s/ppc64/ppc/ \
2.18 ++ -e s/s390x/s390/)
2.19 ++export ARCH
2.20 +
2.21 + TOPDIR = $(shell pwd)
2.22 +
2.23 +@@ -20,10 +26,10 @@
2.24 + LIBS = @LIBS@
2.25 +
2.26 + INSTALL = @INSTALL@
2.27 +-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
2.28 +-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
2.29 +-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
2.30 +-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
2.31 ++INSTALL_FILE = $(INSTALL) -p -m 644
2.32 ++INSTALL_PROGRAM = $(INSTALL) -p -m 755
2.33 ++INSTALL_SCRIPT = $(INSTALL) -p -m 755
2.34 ++INSTALL_DIR = $(INSTALL) -p -d -m 755
2.35 +
2.36 + OBJ = ltrace.o options.o elf.o output.o read_config_file.o \
2.37 + execute_program.o wait_for_something.o process_event.o \
2.38 +diff -durN ltrace-0.4.orig/configure ltrace-0.4/configure
2.39 +--- ltrace-0.4.orig/configure 2008-10-23 23:35:39.000000000 +0200
2.40 ++++ ltrace-0.4/configure 2008-10-24 10:27:20.000000000 +0200
2.41 +@@ -311,7 +311,7 @@
2.42 + # include <unistd.h>
2.43 + #endif"
2.44 +
2.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'
2.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'
2.47 + ac_subst_files=''
2.48 +
2.49 + # Initialize some variables set by options.
2.50 +@@ -1390,7 +1390,7 @@
2.51 + host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
2.52 + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
2.53 +
2.54 +-
2.55 ++HOST_ARCH="$host_cpu"
2.56 + HOST_OS="$host_os"
2.57 + case "${HOST_OS}" in
2.58 + linux-*) HOST_OS=linux-gnu;;
2.59 +@@ -4818,6 +4818,7 @@
2.60 + s,@host_cpu@,$host_cpu,;t t
2.61 + s,@host_vendor@,$host_vendor,;t t
2.62 + s,@host_os@,$host_os,;t t
2.63 ++s,@HOST_ARCH@,$HOST_ARCH,;t t
2.64 + s,@HOST_OS@,$HOST_OS,;t t
2.65 + s,@CC@,$CC,;t t
2.66 + s,@CFLAGS@,$CFLAGS,;t t
2.67 +diff -durN ltrace-0.4.orig/configure.ac ltrace-0.4/configure.ac
2.68 +--- ltrace-0.4.orig/configure.ac 2008-10-23 23:35:39.000000000 +0200
2.69 ++++ ltrace-0.4/configure.ac 2008-10-24 10:19:47.000000000 +0200
2.70 +@@ -6,10 +6,12 @@
2.71 +
2.72 + dnl Check host system type
2.73 + AC_CANONICAL_HOST
2.74 ++HOST_ARCH="$host_cpu"
2.75 + HOST_OS="$host_os"
2.76 + case "${HOST_OS}" in
2.77 + linux-*) HOST_OS=linux-gnu;;
2.78 + esac
2.79 ++AC_SUBST(HOST_ARCH)
2.80 + AC_SUBST(HOST_OS)
2.81 +
2.82 + dnl Checks for programs.
2.83 +diff -durN ltrace-0.4.orig/sysdeps/linux-gnu/Makefile ltrace-0.4/sysdeps/linux-gnu/Makefile
2.84 +--- ltrace-0.4.orig/sysdeps/linux-gnu/Makefile 2006-02-20 22:44:45.000000000 +0100
2.85 ++++ ltrace-0.4/sysdeps/linux-gnu/Makefile 2008-10-24 10:24:41.000000000 +0200
2.86 +@@ -1,6 +1,3 @@
2.87 +-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
2.88 +- -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
2.89 +-
2.90 + CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
2.91 +
2.92 + OBJ = trace.o proc.o breakpoint.o
3.1 --- a/scripts/build/debug/400-ltrace.sh Fri Oct 24 15:38:13 2008 +0000
3.2 +++ b/scripts/build/debug/400-ltrace.sh Fri Oct 24 15:40:58 2008 +0000
3.3 @@ -21,9 +21,10 @@
3.4 mkdir -p "${CT_BUILD_DIR}/build-ltrace"
3.5 CT_Pushd "${CT_BUILD_DIR}/build-ltrace"
3.6
3.7 + CT_DoLog EXTRA "Copying sources to build dir"
3.8 + (cd "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}"; tar cf - .)| tar xvf - |CT_DoLog ALL
3.9 +
3.10 CT_DoLog EXTRA "Configuring ltrace"
3.11 -# CFLAGS="-I${CT_SYSROOT_DIR}/usr/include" \
3.12 -# LDFLAGS="-L${CT_SYSROOT_DIR}/usr/include" \
3.13 CT_DoExecLog ALL \
3.14 "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/configure" \
3.15 --build=${CT_BUILD} \