Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/duma/2_5_15/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 747 d3e603e7c17c
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@1436 
     1
 
diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
yann@1436 
     2
 
--- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
yann@1436 
     3
 
+++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
yann@1436 
     4
 
@@ -289,9 +289,13 @@
yann@572 
     5
 
 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@572 
     6
 
 	createconf.c
yann@572 
     7
yann@1436 
     8
 
-OBJECTS=dumapp.o duma.o sem_inc.o print.o
yann@572 
     9
 
+OBJECTS = duma.o sem_inc.o print.o
yann@572 
    10
 
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@572 
    11
yann@1436 
    12
 
-SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@572 
    13
 
+ifeq ($(DUMA_CPP),1)
yann@572 
    14
 
+OBJECTS += dumapp.o
yann@572 
    15
 
+SO_OBJECTS += dumapp_so.o
yann@572 
    16
 
+endif
yann@572 
    17
yann@1436 
    18
 
 # Make all the top-level targets the makefile knows about.
yann@572 
    19
 
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
crosstool-ng