patches/duma/2_5_1/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
changeset 2653 e5fc5c9ea78a
parent 236 42650dc4e95e
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     1 diff -dur duma_2_5_1.orig/Makefile duma_2_5_1/Makefile
     2 --- duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200
     3 +++ duma_2_5_1/Makefile	2007-07-11 17:50:46.000000000 +0200
     4 @@ -115,9 +115,14 @@
     5  	dumatest.c tstheap.c dumatestpp.cpp testoperators.cpp \
     6  	createconf.c
     7  
     8 -OBJECTS = dumapp.o duma.o sem_inc.o print.o
     9 +OBJECTS = duma.o sem_inc.o print.o
    10 +SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
    11 +
    12 +ifeq ($(DUMA_CPP),1)
    13 +OBJECTS += dumapp.o
    14 +SO_OBJECTS += dumapp_so.o
    15 +endif
    16  
    17 -SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
    18  
    19  all:	libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
    20  	@ echo "Testing DUMA."