* [Buildroot] [PATCH/next 1/1] package/dmalloc: bump to version 5.6.5
@ 2021-11-24 17:29 Fabrice Fontaine
2021-12-05 10:10 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-11-24 17:29 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
- Drop second to fifth patches (already in version)
- License is ISC since version 5.6.2 and
https://github.com/j256/dmalloc/commit/eda734a8ba3ab4c03b3593636186dc3fc777b09d
- Update indentation in hash file (two spaces)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/dmalloc/0001-mips.patch | 18 ++++----
package/dmalloc/0002-fix-parallel-build.patch | 18 --------
package/dmalloc/0003-fix-shlibs.patch | 46 -------------------
package/dmalloc/0004-fix-strdup.patch | 24 ----------
package/dmalloc/0005-fix-strndup.patch | 24 ----------
package/dmalloc/dmalloc.hash | 4 +-
package/dmalloc/dmalloc.mk | 7 ++-
7 files changed, 15 insertions(+), 126 deletions(-)
delete mode 100644 package/dmalloc/0002-fix-parallel-build.patch
delete mode 100644 package/dmalloc/0003-fix-shlibs.patch
delete mode 100644 package/dmalloc/0004-fix-strdup.patch
delete mode 100644 package/dmalloc/0005-fix-strndup.patch
diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch
index 3e6b00e361..3150d030ec 100644
--- a/package/dmalloc/0001-mips.patch
+++ b/package/dmalloc/0001-mips.patch
@@ -1,14 +1,16 @@
+[Fabrice: Updated for 5.6.5]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
--- 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
--#define RETURN_MACROS_WORK 0
-+#define RETURN_MACROS_WORK 1
- _ACEOF
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5
+ $as_echo_n "checking return.h macros work... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h
++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
--- a/return.h
+++ b/return.h
@@ -106,26 +106,16 @@
diff --git a/package/dmalloc/0002-fix-parallel-build.patch b/package/dmalloc/0002-fix-parallel-build.patch
deleted file mode 100644
index c521a114bb..0000000000
--- a/package/dmalloc/0002-fix-parallel-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix parallel build issue
-
-Missing dmallocc.o <- dmalloc.h dependency may break parallel builds.
-dmalloc.h is generated,and may not be around by the time gcc starts
-parsing dmallocc.cc.
-
-Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -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_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
diff --git a/package/dmalloc/0003-fix-shlibs.patch b/package/dmalloc/0003-fix-shlibs.patch
deleted file mode 100644
index a99d926daf..0000000000
--- a/package/dmalloc/0003-fix-shlibs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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 <alex.suykov@gmail.com>
-
---- 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 $@ $@.t
-- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
-+ @shlinkargs@ $(LIBRARY)
- mv $@.t $@
-
- $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
-@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
-
- $(LIB_TH_SL) : $(LIB_TH)
- rm -f $@ $@.t
-- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
-+ @shlinkargs@ $(LIB_TH)
- mv $@.t $@
-
- $(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 $@ $@.t
-- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
-+ @shlinkargs@ $(LIB_CXX)
- mv $@.t $@
-
- $(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 $@ $@.t
-- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
-+ @shlinkargs@ $(LIB_TH_CXX)
- mv $@.t $@
-
- threadssl : $(LIB_TH_SL)
diff --git a/package/dmalloc/0004-fix-strdup.patch b/package/dmalloc/0004-fix-strdup.patch
deleted file mode 100644
index 5884df6a89..0000000000
--- a/package/dmalloc/0004-fix-strdup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 59d73a473f1c1a31bcba90d314f956d0bcc3de95 Mon Sep 17 00:00:00 2001
-From: Siana Gearz <siana.sg@live.de>
-Date: Sat, 8 Sep 2012 22:55:17 +0200
-Subject: [PATCH] Fix strdup
-
-[Retrieved from:
-https://github.com/siana/dmalloc/commit/59d73a473f1c1a31bcba90d314f956d0bcc3de95]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- dmalloc.h.3 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dmalloc.h.3 b/dmalloc.h.3
-index d3d1c13..3fc573a 100644
---- a/dmalloc.h.3
-+++ b/dmalloc.h.3
-@@ -459,6 +459,7 @@ DMALLOC_PNT valloc(DMALLOC_SIZE size);
- *
- * string -> String we are duplicating.
- */
-+#undef strdup
- extern
- char *strdup(const char *string);
- #endif /* ifndef DMALLOC_STRDUP_MACRO */
diff --git a/package/dmalloc/0005-fix-strndup.patch b/package/dmalloc/0005-fix-strndup.patch
deleted file mode 100644
index a1865acb85..0000000000
--- a/package/dmalloc/0005-fix-strndup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 005d92c2cebbde5c8623daa29725f7a62b18df7c Mon Sep 17 00:00:00 2001
-From: Siana Gearz <siana.sg@live.de>
-Date: Sat, 8 Sep 2012 22:44:35 +0200
-Subject: [PATCH] Fix strndup
-
-[Retrieved from:
-https://github.com/siana/dmalloc/commit/005d92c2cebbde5c8623daa29725f7a62b18df7c]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- dmalloc.h.3 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dmalloc.h.3 b/dmalloc.h.3
-index 8bda997..fb538a8 100644
---- a/dmalloc.h.3
-+++ b/dmalloc.h.3
-@@ -429,6 +429,7 @@ char *strdup(const char *string);
- *
- * len -> Length of the string to duplicate.
- */
-+#undef strndup
- extern
- char *strndup(const char *string, const DMALLOC_SIZE len);
-
diff --git a/package/dmalloc/dmalloc.hash b/package/dmalloc/dmalloc.hash
index 113751656c..f4cc98e813 100644
--- a/package/dmalloc/dmalloc.hash
+++ b/package/dmalloc/dmalloc.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a dmalloc-5.5.2.tgz
-sha256 8659d49ceeeb006288ad246164e504ccfe33f7a4c1680439fb6ff6a393b0722b dmalloc.h.1
+sha256 480e3414ab6cedca837721c756b7d64b01a84d2d0e837378d98444e2f63a7c01 dmalloc-5.6.5.tgz
+sha256 8657f6bc5ebb765dd792b2c3c54d5dc37b8b4e6bbe8aa48d464fd92081b1e720 LICENSE.txt
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 749c35359c..05943943d6 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -4,13 +4,12 @@
#
################################################################################
-DMALLOC_VERSION = 5.5.2
+DMALLOC_VERSION = 5.6.5
DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz
DMALLOC_SITE = http://dmalloc.com/releases
-DMALLOC_LICENSE = MIT-like
-# license is in each file, dmalloc.h.1 is the smallest one
-DMALLOC_LICENSE_FILES = dmalloc.h.1
+DMALLOC_LICENSE = ISC
+DMALLOC_LICENSE_FILES = LICENSE.txt
DMALLOC_INSTALL_STAGING = YES
DMALLOC_CFLAGS = $(TARGET_CFLAGS)
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH/next 1/1] package/dmalloc: bump to version 5.6.5
2021-11-24 17:29 [Buildroot] [PATCH/next 1/1] package/dmalloc: bump to version 5.6.5 Fabrice Fontaine
@ 2021-12-05 10:10 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2021-12-05 10:10 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
On Wed, 24 Nov 2021 18:29:13 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> - Drop second to fifth patches (already in version)
> - License is ISC since version 5.6.2 and
> https://github.com/j256/dmalloc/commit/eda734a8ba3ab4c03b3593636186dc3fc777b09d
> - Update indentation in hash file (two spaces)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/dmalloc/0001-mips.patch | 18 ++++----
> package/dmalloc/0002-fix-parallel-build.patch | 18 --------
> package/dmalloc/0003-fix-shlibs.patch | 46 -------------------
> package/dmalloc/0004-fix-strdup.patch | 24 ----------
> package/dmalloc/0005-fix-strndup.patch | 24 ----------
> package/dmalloc/dmalloc.hash | 4 +-
> package/dmalloc/dmalloc.mk | 7 ++-
> 7 files changed, 15 insertions(+), 126 deletions(-)
> delete mode 100644 package/dmalloc/0002-fix-parallel-build.patch
> delete mode 100644 package/dmalloc/0003-fix-shlibs.patch
> delete mode 100644 package/dmalloc/0004-fix-strdup.patch
> delete mode 100644 package/dmalloc/0005-fix-strndup.patch
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-05 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-24 17:29 [Buildroot] [PATCH/next 1/1] package/dmalloc: bump to version 5.6.5 Fabrice Fontaine
2021-12-05 10:10 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.