patches/duma/2_5_8/110-separate_cpp.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Oct 07 22:37:06 2010 +0200 (2010-10-07)
changeset 2138 2242d87c5404
parent 369 9258a7c3b84f
permissions -rw-r--r--
scripts: always create lib32 and lib64 symlinks

Unconditionally create the lib32 -> lib/ and lib64 -> lib/ symlinks.

This is reportedly a fix to build a toolchain for a 32-bit target on
a 'pure' 64-bit host (eg. on Fedora FC12, host libs are in lib64/,
and there is no lib -> lib64 symlink, as we can see on other distors,
as Debian). As gcc only puts static host lib in lib64/ (along with
target files in subdirs), we can safely create the symlinks.

Also note that the symlinks are summarily removed at the end
of the build.

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
[Yann E. MORIN: fix a comment, rephrase the commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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)