patches/duma/2_5_8/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Dec 12 21:41:16 2011 +0200 (2011-12-12)
branch1.13
changeset 2845 0dc9d4931246
parent 369 9258a7c3b84f
permissions -rw-r--r--
scripts: unset CONFIG_SITE

Some distributions (eg. openSUSE 12.1) systematically export
the CONFIG_SITE environment variable to point to a custom
script setting misc paths for ./configure.

This can, and does, break when cross-compiling for architectures
that are not supported by this script.

The simple workaround is to unset this variable.
NB: buildroot has a similar fix:
http://git.buildroot.org/buildroot/commit/?id=12c9f7dd6dee9c6029b4f9a12d6aac1516911ab4

Reported-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 21f4f28e60ec0342133086c9a51e7f0e5b181fb8)
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)