Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/ltrace/0.4/110-allow-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 diff -durN ltrace-0.4.orig/Makefile.in ltrace-0.4/Makefile.in

     2 --- ltrace-0.4.orig/Makefile.in	2006-03-05 23:21:07.000000000 +0100

     3 +++ ltrace-0.4/Makefile.in	2008-10-24 10:31:51.000000000 +0200

     4 @@ -2,8 +2,14 @@

     5  # ltrace's Makefile.in

     6  #

     7  

     8 -#OS		:= $(shell uname -s)

     9  OS		:= @HOST_OS@

    10 +ARCH		:= $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/      \

    11 +						   -e s/sun4u/sparc64/  \

    12 +						   -e s/arm.*/arm/      \

    13 +						   -e s/sa110/arm/      \

    14 +						   -e s/ppc64/ppc/      \

    15 +						   -e s/s390x/s390/)

    16 +export ARCH

    17  

    18  TOPDIR		= $(shell pwd)

    19  

    20 @@ -20,10 +26,10 @@

    21  LIBS		=	@LIBS@

    22  

    23  INSTALL		=	@INSTALL@

    24 -INSTALL_FILE	=	$(INSTALL) -p    -o root -g root  -m  644

    25 -INSTALL_PROGRAM	=	$(INSTALL) -p    -o root -g root  -m  755

    26 -INSTALL_SCRIPT	=	$(INSTALL) -p    -o root -g root  -m  755

    27 -INSTALL_DIR	=	$(INSTALL) -p -d -o root -g root  -m  755

    28 +INSTALL_FILE	=	$(INSTALL) -p    -m  644

    29 +INSTALL_PROGRAM	=	$(INSTALL) -p    -m  755

    30 +INSTALL_SCRIPT	=	$(INSTALL) -p    -m  755

    31 +INSTALL_DIR	=	$(INSTALL) -p -d -m  755

    32  

    33  OBJ	=	ltrace.o options.o elf.o output.o read_config_file.o	\

    34  		execute_program.o wait_for_something.o process_event.o	\

    35 diff -durN ltrace-0.4.orig/configure ltrace-0.4/configure

    36 --- ltrace-0.4.orig/configure	2008-10-23 23:35:39.000000000 +0200

    37 +++ ltrace-0.4/configure	2008-10-24 10:27:20.000000000 +0200

    38 @@ -311,7 +311,7 @@

    39  # include <unistd.h>

    40  #endif"

    41  

    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'

    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'

    44  ac_subst_files=''

    45  

    46  # Initialize some variables set by options.

    47 @@ -1390,7 +1390,7 @@

    48  host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`

    49  host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

    50  

    51 -

    52 +HOST_ARCH="$host_cpu"

    53  HOST_OS="$host_os"

    54  case "${HOST_OS}" in

    55    linux-*) HOST_OS=linux-gnu;;

    56 @@ -4818,6 +4818,7 @@

    57  s,@host_cpu@,$host_cpu,;t t

    58  s,@host_vendor@,$host_vendor,;t t

    59  s,@host_os@,$host_os,;t t

    60 +s,@HOST_ARCH@,$HOST_ARCH,;t t

    61  s,@HOST_OS@,$HOST_OS,;t t

    62  s,@CC@,$CC,;t t

    63  s,@CFLAGS@,$CFLAGS,;t t

    64 diff -durN ltrace-0.4.orig/configure.ac ltrace-0.4/configure.ac

    65 --- ltrace-0.4.orig/configure.ac	2008-10-23 23:35:39.000000000 +0200

    66 +++ ltrace-0.4/configure.ac	2008-10-24 10:19:47.000000000 +0200

    67 @@ -6,10 +6,12 @@

    68  

    69  dnl Check host system type

    70  AC_CANONICAL_HOST

    71 +HOST_ARCH="$host_cpu"

    72  HOST_OS="$host_os"

    73  case "${HOST_OS}" in

    74    linux-*) HOST_OS=linux-gnu;;

    75  esac

    76 +AC_SUBST(HOST_ARCH)

    77  AC_SUBST(HOST_OS)

    78  

    79  dnl Checks for programs.

    80 diff -durN ltrace-0.4.orig/sysdeps/linux-gnu/Makefile ltrace-0.4/sysdeps/linux-gnu/Makefile

    81 --- ltrace-0.4.orig/sysdeps/linux-gnu/Makefile	2006-02-20 22:44:45.000000000 +0100

    82 +++ ltrace-0.4/sysdeps/linux-gnu/Makefile	2008-10-24 10:24:41.000000000 +0200

    83 @@ -1,6 +1,3 @@

    84 -ARCH		:=	$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \

    85 -			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)

    86 -

    87  CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)

    88  

    89  OBJ		=	trace.o proc.o breakpoint.o
crosstool-ng