Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/dmalloc/5.5.2/140-shared_library.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 103 b6e20abe9256
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com> 
     1 This patch makes building the shared library possible.

     2 

     3 Copyright 2007 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>

     4 Licensed to you as dmalloc-5.5.2 is.

     5 

     6 diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in

     7 --- dmalloc-5.5.2.orig/Makefile.in	2007-05-14 19:26:14.000000000 +0200

     8 +++ dmalloc-5.5.2/Makefile.in	2007-05-18 15:54:04.000000000 +0200

     9 @@ -257,7 +257,7 @@

    10  # via: http://256.com/gray/email.html

    11  $(LIB_SL) : $(LIBRARY)

    12  	rm -f $@ $@.t

    13 -	@shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)

    14 +	@shlinkargs@ $(LIBRARY)

    15  	mv $@.t $@

    16  

    17  $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)

    18 @@ -270,7 +270,7 @@

    19  

    20  $(LIB_TH_SL) : $(LIB_TH)

    21  	rm -f $@ $@.t

    22 -	@shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)

    23 +	@shlinkargs@ $(LIB_TH)

    24  	mv $@.t $@

    25  

    26  $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)

    27 @@ -279,7 +279,7 @@

    28  

    29  $(LIB_CXX_SL) : $(LIB_CXX)

    30  	rm -f $@ $@.t

    31 -	@shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)

    32 +	@shlinkargs@ $(LIB_CXX)

    33  	mv $@.t $@

    34  

    35  $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)

    36 @@ -288,7 +288,7 @@

    37  

    38  $(LIB_TH_CXX_SL) : $(LIB_TH_CXX)

    39  	rm -f $@ $@.t

    40 -	@shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)

    41 +	@shlinkargs@ $(LIB_TH_CXX)

    42  	mv $@.t $@

    43  

    44  threadssl : $(LIB_TH_SL)
crosstool-ng