patches/duma/2_5_14/110-separate_cpp.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Fri Jul 29 13:04:49 2011 +0200 (2011-07-29)
changeset 2574 6e1412ba8da9
parent 572 944e145f3890
permissions -rw-r--r--
scripts/functions: force extract folder to archive basename

Some archives like those of the 2011.07 revisions of Linaro GCC contain a folder
name different from the archive basename, which leads to errors afterwards, e.g.
when patching. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 extracts to gcc-linaro-4.5-2011.07-0/

This patch changes CT_Extract() to force the extraction of all archives to a
folder named like the archive basename. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 now extracts to gcc-linaro-4.5-2011.07/

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
     1 diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
     2 --- duma_2_5_14.orig/Makefile	2008-06-17 10:30:40.000000000 +0200
     3 +++ duma_2_5_14/Makefile	2008-06-17 10:30:17.000000000 +0200
     4 @@ -228,9 +228,13 @@
     5  	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
     6  	createconf.c
     7  
     8 -OBJECTS = dumapp.o duma.o sem_inc.o print.o
     9 +OBJECTS = duma.o sem_inc.o print.o
    10 +SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
    11  
    12 -SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
    13 +ifeq ($(DUMA_CPP),1)
    14 +OBJECTS += dumapp.o
    15 +SO_OBJECTS += dumapp_so.o
    16 +endif
    17  
    18  all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
    19