patches/duma/2_5_12/110-separate_cpp.patch
author David Holsgrove <david.holsgrove@xilinx.com>
Wed Oct 03 15:59:22 2012 +1000 (2012-10-03)
changeset 3071 5243d1b432b1
parent 430 5b7efc8dbf85
permissions -rw-r--r--
scripts/gdb: If not building expat for gdb, disable

--with-expat=yes is unconditionally passed to the gdb configure
stage, instead of respecting the ${do_expat} decision.

Disable if not needed. Prevents error building canadian cross;

configure: error: expat is missing or unusable

Where configure stage fails to find expat on the host compiler.

Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Message-Id: <4c4410a2a8aab24a29c5.1349244128@localhost.localdomain>
PatchWork-Id: 188711
yann@430
     1
diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile
yann@430
     2
--- duma_2_5_12.orig/Makefile	2007-09-07 21:57:45.000000000 +0200
yann@430
     3
+++ duma_2_5_12/Makefile	2007-09-07 21:58:35.000000000 +0200
yann@430
     4
@@ -231,9 +231,13 @@
yann@430
     5
 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@430
     6
 	createconf.c
yann@430
     7
yann@430
     8
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@430
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@430
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@430
    11
yann@430
    12
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@430
    13
+ifeq ($(DUMA_CPP),1)
yann@430
    14
+OBJECTS += dumapp.o
yann@430
    15
+SO_OBJECTS += dumapp_so.o
yann@430
    16
+endif
yann@430
    17
yann@430
    18
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
yann@430
    19
 	@ $(ECHOLF)