Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/duma/2_5_14/100-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Apr 28 00:13:41 2011 +0200 (2011-04-28)
changeset 2412 20edcd78cf67
permissions -rw-r--r--
scripts/addToolsVersion: versions can be either in the .in or the .in.2

The components have their version selection handled either in the .in
file or the .in.2 file. Handle both cases.

Also, when dumping an existing version, keep the user's grep options
(ie. do override neither options nor colors).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile

     2 --- duma_2_5_14.orig/Makefile	2008-03-13 00:54:10.000000000 +0100

     3 +++ duma_2_5_14/Makefile	2008-06-17 10:28:45.000000000 +0200

     4 @@ -93,10 +93,6 @@

     5  # also define 'WIN32'

     6  

     7  # some defaults:

     8 -CC=gcc

     9 -CXX=g++

    10 -AR=ar

    11 -RANLIB=ranlib

    12  INSTALL=install

    13  RM=rm

    14  RMFORCE=rm -f

    15 @@ -317,7 +313,7 @@

    16  

    17  createconf$(EXEPOSTFIX): createconf.o

    18  	- $(RMFORCE) createconf$(EXEPOSTFIX)

    19 -	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)

    20 +	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)

    21  

    22  tstheap$(EXEPOSTFIX): libduma.a tstheap.o

    23  	- $(RMFORCE) tstheap$(EXEPOSTFIX)

    24 @@ -378,7 +374,7 @@

    25  # define rules how to build objects for createconf

    26  #

    27  createconf.o:

    28 -	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@

    29 +	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@

    30  

    31  

    32  #
crosstool-ng