patches/duma/2_5_12/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)
branch1.12
changeset 2655 3ba359965eb0
parent 430 5b7efc8dbf85
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>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
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)