Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/ltrace/0.5.2/100-allow-cross-compile.patch
author Matthieu Crapet <mcrapet@gmail.com>
Wed Jun 06 12:03:12 2012 +0200 (2012-06-06)
changeset 2991 252ade1e9e17
parent 1262 e3574ccecb6d
permissions -rw-r--r--
libc/eglibc: fix missing LIBC_TRY_CC_OPTION definition (eglibc 2.15)

Upstream SVN is currently broken:
http://www.eglibc.org/svn/branches/eglibc-2_15/libc/

LIBC_TRY_CC_OPTION macro is not defined in aclocal.m4.
This patch fix the configure script.

Once upstream branch will be fixed this patch could be reverted.

Related patch (committed to eglibc trunk):
Use autoconf macro for testing compiler options with empty input
http://sourceware.org/ml/libc-alpha/2012-03/msg00816.html

Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>

diff -r 1f6c8e4b2b92 -r d10afc5bcc25
patches/eglibc/2_15/110-aclocal-LIBC_TRY_CC_OPTION.patch 
     1 diff -durN ltrace-0.5.2.orig/Makefile.in ltrace-0.5.2/Makefile.in

     2 --- ltrace-0.5.2.orig/Makefile.in	2009-05-21 19:14:54.000000000 +0200

     3 +++ ltrace-0.5.2/Makefile.in	2009-06-27 15:30:34.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 diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure

    21 --- ltrace-0.5.2.orig/configure	2009-05-21 19:14:57.000000000 +0200

    22 +++ ltrace-0.5.2/configure	2009-06-27 15:30:34.000000000 +0200

    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.2.orig/configure.ac ltrace-0.5.2/configure.ac

    57 --- ltrace-0.5.2.orig/configure.ac	2009-05-21 19:14:54.000000000 +0200

    58 +++ ltrace-0.5.2/configure.ac	2009-06-27 15:30:34.000000000 +0200

    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.2.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.2/sysdeps/linux-gnu/Makefile

    69 --- ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile	2009-05-21 19:14:54.000000000 +0200

    70 +++ ltrace-0.5.2/sysdeps/linux-gnu/Makefile	2009-06-27 15:30:34.000000000 +0200

    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		=	events.o trace.o proc.o breakpoint.o
crosstool-ng