patches/duma/2_5_8/110-separate_cpp.patch
author Darcy Watkins <dwatkins@tranzeo.com>
Thu Aug 05 18:19:07 2010 +0200 (2010-08-05)
branch1.8
changeset 2073 a3b7a63dce01
parent 369 9258a7c3b84f
permissions -rw-r--r--
cc/gcc: with static ppl, correctly link with libm

On some Fedora boxen (at least FC13), it is also required
to link with libm when static ppl is used.
(transplanted from bcd33fce4db9c18223b59ecdc96f10bf6dd574de)
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)