Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/ltrace/0.5.3/150-allow-configurable-arch.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 This patch is to ensure the proper ARCH is selected when cross compiling.  Make

     2 sure to call the configure script with, e.g., HOST=arm ./configure to select 

     3 the arm sysdeps.

     4 

     5 	Joachim Nilsson <jocke@vmlinux.org>

     6 

     7 diff -ru ltrace-0.5.3.orig/configure ltrace-0.5.3/configure

     8 --- ltrace-0.5.3.orig/configure	2010-01-02 11:05:55.000000000 +0100

     9 +++ ltrace-0.5.3/configure	2010-01-02 20:49:11.000000000 +0100

    10 @@ -110,7 +110,7 @@

    11  #

    12  # Makefile.in -> Makefile

    13  #

    14 -x_subst_vars='PACKAGE_VERSION HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'

    15 +x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'

    16  

    17  for i in $x_subst_vars

    18  do

    19 Only in ltrace-0.5.3: configure~

    20 diff -ru ltrace-0.5.3.orig/Makefile.in ltrace-0.5.3/Makefile.in

    21 --- ltrace-0.5.3.orig/Makefile.in	2010-01-02 11:05:55.000000000 +0100

    22 +++ ltrace-0.5.3/Makefile.in	2010-01-03 01:28:41.000000000 +0100

    23 @@ -1,10 +1,12 @@

    24  #

    25  # ltrace's Makefile.in

    26  #

    27 -

    28 +MY_TARGET       = @HOST@

    29 +ifdef MY_TARGET

    30 +ARCH            = $(MY_TARGET)

    31 +endif

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

    33  OS		:= @HOST_OS@

    34 -

    35  TOPDIR		= $(shell pwd)

    36  

    37  prefix		= @prefix@

    38 Only in ltrace-0.5.3: Makefile.in~

    39 diff -ru ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.3/sysdeps/linux-gnu/Makefile

    40 --- ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile	2010-01-02 11:05:55.000000000 +0100

    41 +++ ltrace-0.5.3/sysdeps/linux-gnu/Makefile	2010-01-02 20:49:51.000000000 +0100

    42 @@ -1,4 +1,4 @@

    43 -ARCH		:=	$(shell uname -m | sed \

    44 +ARCH		?=	$(shell uname -m | sed \

    45  				-e s/i.86/i386/ \

    46  				-e s/sun4u/sparc64/ \

    47  				-e s/sparc64/sparc/ \

    48 Only in ltrace-0.5.3/sysdeps/linux-gnu: Makefile~
crosstool-ng