patches/duma/2_5_12/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:28:10 2011 +0200 (2011-08-02)
changeset 2590 b64cfb67944e
parent 430 5b7efc8dbf85
permissions -rw-r--r--
scripts/functions: svn retrieval first tries the mirror for tarballs

The svn download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via svn.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard svn retrieval will kick in.

Reported-by: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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)