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>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com> 
     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