patches/duma/2_5_8/110-separate_cpp.patch
| author |
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
|
Thu Jun 11 21:47:19 2009 +0000 (2009-06-11) |
| branch | 1.4 |
| changeset 1451 |
25d050084e98 |
| parent 369 |
9258a7c3b84f
|
| permissions |
-rw-r--r-- |
populate: fix installing dynamic linker 'ld.so'
The dynamic linker, ld.so, needs the execute bit to be set.
Detect tht the library being installed is in fact ld.so and
install it with 0755 instead of 0644.
Fix detecting src == dst.
Use a simpler command to copy src -> dst.
Also change echo to printf, get rid of 'echo -n', which is
highly non-portable.
-------- diffstat follows --------
/trunk/scripts/populate.in | 76 43 33 0 +++++++++++++++++++++++++++++-----------------------
1 file changed, 43 insertions(+), 33 deletions(-)
(transplanted from d7ddcb75e0f703e2ba6d17169167356389224870)
|
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)
|