Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/duma/2_5_8/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 369 9258a7c3b84f
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>
yann@369 
     1
 
diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
yann@369 
     2
 
--- duma_2_5_8.orig/Makefile	2007-09-07 21:57:45.000000000 +0200
yann@369 
     3
 
+++ duma_2_5_8/Makefile	2007-09-07 21:58:35.000000000 +0200
yann@369 
     4
 
@@ -216,9 +216,13 @@
yann@369 
     5
 
 	dumatest.c tstheap.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@369 
     6
 
 	createconf.c
yann@369 
     7
yann@369 
     8
 
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@369 
     9
 
+OBJECTS = duma.o sem_inc.o print.o
yann@369 
    10
 
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@369 
    11
yann@369 
    12
 
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@369 
    13
 
+ifeq ($(DUMA_CPP),1)
yann@369 
    14
 
+OBJECTS += dumapp.o
yann@369 
    15
 
+SO_OBJECTS += dumapp_so.o
yann@369 
    16
 
+endif
yann@369 
    17
yann@369 
    18
 
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
yann@369 
    19
 
 	@ $(ECHOLF)
crosstool-ng