Skip to contentSkip to conversation

dmalloc: bump version to 5.5.2

PATCH New Alex Suykov 3 participants 3 messages Jan 7, 2015

lore
Share & tools
lore

Alex Suykov

author
#0 lore raw

PATCH 1/1 dmalloc: bump version to 5.5.2

Signed-off-by Alex Suykov <[email protected]>
---
 package/dmalloc/0001-add-fpic.patch           | 16 ++++------
 package/dmalloc/0002-mips.patch               | 10 +++---
 package/dmalloc/0003-fix-parallel-build.patch | 12 +++----
 package/dmalloc/0004-fix-shlibs.patch         | 46 +++++++++++++++++++++++++++
 package/dmalloc/dmalloc.mk                    |  2 +-
 5 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 package/dmalloc/0004-fix-shlibs.patch
package/dmalloc/0001-add-fpic.patch +7 -9
@@ -15,11 +15,9 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
  Makefile.in |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: dmalloc-5.4.3/Makefile.in
-===================================================================
---- dmalloc-5.4.3.orig/Makefile.in
-+++ dmalloc-5.4.3/Makefile.in
-@@ -319,17 +319,17 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -318,17 +318,17 @@
  # special _th versions of objects with the LOCK_THREADS variable defined to 1
  chunk_th.o : $(srcdir)/chunk.c
  	rm -f $@

@@ -39,8 +37,8 @@ Index: dmalloc-5.4.3/Makefile.in
 +	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
  		-c $(srcdir)/malloc.c -o ./$@
  
- tests : $(TEST)
-@@ -355,7 +355,7 @@
+ tests : $(TEST) $(TEST_FC)
+@@ -360,7 +360,7 @@
  
  .c.o :
  	rm -f $@

@@ -49,7 +47,7 @@ Index: dmalloc-5.4.3/Makefile.in
  
  #
  # .cc.o auto-target doesn't work on some systems. 
-@@ -363,7 +363,7 @@
+@@ -368,7 +368,7 @@
  #
  dmallocc.o : $(srcdir)/dmallocc.cc
  	rm -f $@

@@ -57,4 +55,4 @@ Index: dmalloc-5.4.3/Makefile.in
 +	$(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
  		-o ./$@
  
- .texi.info :
+ #
package/dmalloc/0002-mips.patch +5 -5
@@ -1,6 +1,6 @@
---- dmalloc/configure	2006-09-01 18:28:51.000000000 -0700
-+++ dmalloc-mips/configure	2006-09-01 18:49:07.000000000 -0700
-@@ -6114,7 +6114,7 @@
+--- a/configure
++++ b/configure
+@@ -7107,7 +7107,7 @@
  echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6
  if test "$cross_compiling" = yes; then
     cat >>confdefs.h <<\_ACEOF

@@ -9,8 +9,8 @@
  _ACEOF
   echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
---- dmalloc/return.h	2004-10-19 07:51:21.000000000 -0700
-+++ dmalloc-mips/return.h	2006-09-08 21:52:43.000000000 -0700
+--- a/return.h
++++ b/return.h
 @@ -106,26 +106,16 @@
  /*************************************/
package/dmalloc/0003-fix-parallel-build.patch +6 -6
@@ -8,11 +8,11 @@ Signed-off-by: Alex Suykov <[email protected]>
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -399,6 +399,7 @@
- compat.o: compat.c dmalloc.h conf.h settings.h compat.h dmalloc_loc.h
- dmalloc.o: dmalloc.c dmalloc_argv.h conf.h settings.h dmalloc.h \
-  compat.h debug_tok.h dmalloc_loc.h env.h error_val.h version.h
+@@ -401,6 +401,7 @@
+ compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h
+ dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \
+   debug_tok.h dmalloc_loc.h env.h error_val.h version.h
 +dmallocc.o: dmallocc.cc dmalloc.h return.h conf.h settings.h
  dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \
-  dmalloc_argv_loc.h compat.h
- dmalloc_rand.o: dmalloc_rand.c conf.h settings.h dmalloc_rand.h
+   dmalloc_argv_loc.h compat.h
+ dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
package/dmalloc/0004-fix-shlibs.patch new file +46 -0

46 lines not on this page · raw message

package/dmalloc/dmalloc.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DMALLOC_VERSION = 5.4.3
+DMALLOC_VERSION = 5.5.2
 DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz
 DMALLOC_SITE = http://dmalloc.com/releases
Signature · 1 line
2.0.3
#1 lore raw

PATCH 1/1 dmalloc: bump version to 5.5.2

Alex, All,

On 2015-01-07 15:03 +0200, Alex Suykov spake thusly:

Quoted 1 line
Signed-off-by Alex Suykov <[email protected]>
Tested-by "Yann E. MORIN" <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Indeed, without patch 0004, dmalloc does not even build.

And the static versions of the libraries are assembled already contain the object files listed on the shared versions' link commands.

Regards,
Yann E. MORIN.

Quoted 162 lines
---
 package/dmalloc/0001-add-fpic.patch           | 16 ++++------
 package/dmalloc/0002-mips.patch               | 10 +++---
 package/dmalloc/0003-fix-parallel-build.patch | 12 +++----
 package/dmalloc/0004-fix-shlibs.patch         | 46 +++++++++++++++++++++++++++
 package/dmalloc/dmalloc.mk                    |  2 +-
 5 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 package/dmalloc/0004-fix-shlibs.patch
package/dmalloc/0001-add-fpic.patch +7 -9
@@ -15,11 +15,9 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
  Makefile.in |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: dmalloc-5.4.3/Makefile.in
-===================================================================
---- dmalloc-5.4.3.orig/Makefile.in
-+++ dmalloc-5.4.3/Makefile.in
-@@ -319,17 +319,17 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -318,17 +318,17 @@
  # special _th versions of objects with the LOCK_THREADS variable defined to 1
  chunk_th.o : $(srcdir)/chunk.c
  	rm -f $@

@@ -39,8 +37,8 @@ Index: dmalloc-5.4.3/Makefile.in
 +	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
  		-c $(srcdir)/malloc.c -o ./$@
 
- tests : $(TEST)
-@@ -355,7 +355,7 @@
+ tests : $(TEST) $(TEST_FC)
+@@ -360,7 +360,7 @@
 
  .c.o :
  	rm -f $@

@@ -49,7 +47,7 @@ Index: dmalloc-5.4.3/Makefile.in
 
  #
  # .cc.o auto-target doesn't work on some systems. 
-@@ -363,7 +363,7 @@
+@@ -368,7 +368,7 @@
  #
  dmallocc.o : $(srcdir)/dmallocc.cc
  	rm -f $@

@@ -57,4 +55,4 @@ Index: dmalloc-5.4.3/Makefile.in
 +	$(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
  		-o ./$@
 
- .texi.info :
+ #
package/dmalloc/0002-mips.patch +5 -5
@@ -1,6 +1,6 @@
---- dmalloc/configure	2006-09-01 18:28:51.000000000 -0700
-+++ dmalloc-mips/configure	2006-09-01 18:49:07.000000000 -0700
-@@ -6114,7 +6114,7 @@
+--- a/configure
++++ b/configure
+@@ -7107,7 +7107,7 @@
  echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6
  if test "$cross_compiling" = yes; then
     cat >>confdefs.h <<\_ACEOF

@@ -9,8 +9,8 @@
  _ACEOF
   echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
---- dmalloc/return.h	2004-10-19 07:51:21.000000000 -0700
-+++ dmalloc-mips/return.h	2006-09-08 21:52:43.000000000 -0700
+--- a/return.h
++++ b/return.h
 @@ -106,26 +106,16 @@
  /*************************************/
package/dmalloc/0003-fix-parallel-build.patch +6 -6
@@ -8,11 +8,11 @@ Signed-off-by: Alex Suykov <[email protected]>
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -399,6 +399,7 @@
- compat.o: compat.c dmalloc.h conf.h settings.h compat.h dmalloc_loc.h
- dmalloc.o: dmalloc.c dmalloc_argv.h conf.h settings.h dmalloc.h \
-  compat.h debug_tok.h dmalloc_loc.h env.h error_val.h version.h
+@@ -401,6 +401,7 @@
+ compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h
+ dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \
+   debug_tok.h dmalloc_loc.h env.h error_val.h version.h
 +dmallocc.o: dmallocc.cc dmalloc.h return.h conf.h settings.h
  dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \
-  dmalloc_argv_loc.h compat.h
- dmalloc_rand.o: dmalloc_rand.c conf.h settings.h dmalloc_rand.h
+   dmalloc_argv_loc.h compat.h
+ dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
package/dmalloc/0004-fix-shlibs.patch new file +46 -0
@@ -0,0 +1,46 @@
+Fix shared library rules
+
+dmalloc uses ld -shared --whole-archive -o lib.so lib.a,
+but for some reason lists regular objects in addition
+to the archive, ending up with two copies of each symbol.
+
+Signed-off-by: Alex Suykov <[email protected]>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -257,7 +257,7 @@ shlib : $(BUILD_SL)
+ # via: http://256.com/gray/email.html
+ $(LIB_SL) : $(LIBRARY)
+ 	rm -f $@ [email protected]
+-	@shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
++	@shlinkargs@ $(LIBRARY)
+ 	mv [email protected] $@
+ 
+ $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
+@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
+ 
+ $(LIB_TH_SL) : $(LIB_TH)
+ 	rm -f $@ [email protected]
+-	@shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
++	@shlinkargs@ $(LIB_TH)
+ 	mv [email protected] $@
+ 
+ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
+@@ -279,7 +279,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
+ 
+ $(LIB_CXX_SL) : $(LIB_CXX)
+ 	rm -f $@ [email protected]
+-	@shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
++	@shlinkargs@ $(LIB_CXX)
+ 	mv [email protected] $@
+ 
+ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
+@@ -288,7 +288,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
+ 
+ $(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
+ 	rm -f $@ [email protected]
+-	@shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
++	@shlinkargs@ $(LIB_TH_CXX)
+ 	mv [email protected] $@
+ 
+ threadssl : $(LIB_TH_SL)
package/dmalloc/dmalloc.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DMALLOC_VERSION = 5.4.3
+DMALLOC_VERSION = 5.5.2
 DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz
 DMALLOC_SITE = http://dmalloc.com/releases
Signature · 6 lines
2.0.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 dmalloc: bump version to 5.5.2

In reply to Alex Suykov

Dear Alex Suykov,

Quoted 9 lines · Alex Suykov
Signed-off-by Alex Suykov <[email protected]>
---
 package/dmalloc/0001-add-fpic.patch           | 16 ++++------
 package/dmalloc/0002-mips.patch               | 10 +++---
 package/dmalloc/0003-fix-parallel-build.patch | 12 +++----
 package/dmalloc/0004-fix-shlibs.patch         | 46 +++++++++++++++++++++++++++
 package/dmalloc/dmalloc.mk                    |  2 +-
 5 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 package/dmalloc/0004-fix-shlibs.patch

Thanks, applied. Thanks to Yann for the testing/review.

Alex, could you work with the dmalloc upstream developers and see if you can get our 4 patches merged upstream?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com