Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/ltrace/0.5.1/100-allow-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate. 
     1 diff -durN ltrace-0.5.1.orig/Makefile.in ltrace-0.5.1/Makefile.in

     2 --- ltrace-0.5.1.orig/Makefile.in	2008-12-10 18:43:41.000000000 +0100

     3 +++ ltrace-0.5.1/Makefile.in	2009-03-16 17:23:26.000000000 +0100

     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 diff -durN ltrace-0.5.1.orig/configure ltrace-0.5.1/configure

    21 --- ltrace-0.5.1.orig/configure	2008-12-10 18:43:43.000000000 +0100

    22 +++ ltrace-0.5.1/configure	2009-03-16 17:20:10.000000000 +0100

    23 @@ -660,6 +660,7 @@

    24  host_cpu

    25  host_vendor

    26  host_os

    27 +HOST_ARCH

    28  HOST_OS

    29  CC

    30  CFLAGS

    31 @@ -1823,6 +1824,7 @@

    32  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

    33  

    34  

    35 +HOST_ARCH="$host_cpu"

    36  case "$host_os" in

    37    linux-gnu*) host_os=linux-gnu

    38  esac

    39 @@ -5406,6 +5408,7 @@

    40  host_cpu!$host_cpu$ac_delim

    41  host_vendor!$host_vendor$ac_delim

    42  host_os!$host_os$ac_delim

    43 +HOST_ARCH!$HOST_ARCH$ac_delim

    44  HOST_OS!$HOST_OS$ac_delim

    45  CC!$CC$ac_delim

    46  CFLAGS!$CFLAGS$ac_delim

    47 @@ -5426,7 +5429,7 @@

    48  LTLIBOBJS!$LTLIBOBJS$ac_delim

    49  _ACEOF

    50  

    51 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then

    52 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then

    53      break

    54    elif $ac_last_try; then

    55      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

    56 diff -durN ltrace-0.5.1.orig/configure.ac ltrace-0.5.1/configure.ac

    57 --- ltrace-0.5.1.orig/configure.ac	2008-12-10 18:43:41.000000000 +0100

    58 +++ ltrace-0.5.1/configure.ac	2009-03-16 17:21:26.000000000 +0100

    59 @@ -11,6 +11,8 @@

    60  esac

    61  HOST_OS="$host_os"

    62  AC_SUBST(HOST_OS)

    63 +HOST_ARCH="$host_cpu"

    64 +AC_SUBST(HOST_ARCH)

    65  

    66  dnl Checks for programs.

    67  AC_PROG_CC

    68 diff -durN ltrace-0.5.1.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.1/sysdeps/linux-gnu/Makefile

    69 --- ltrace-0.5.1.orig/sysdeps/linux-gnu/Makefile	2008-12-10 18:43:41.000000000 +0100

    70 +++ ltrace-0.5.1/sysdeps/linux-gnu/Makefile	2009-03-16 17:21:49.000000000 +0100

    71 @@ -1,6 +1,3 @@

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

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

    74 -

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

    76  

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