Skip to contentSkip to conversation

package/mg: bump version to v3.5, drop backported patch

PATCH Applied Joachim Wiberg 2 participants 2 messages Oct 17, 2021 – Oct 18, 2021

lore
Share & tools
lore

Joachim Wiberg

author
#0 lore raw

PATCH 1/1 package/mg: bump version to v3.5, drop backported patch

- Drop backported patch for GCC 10 build problem, part of release
- Use upstream sha256 instead of locally computed

Signed-off-by Joachim Wiberg <[email protected]>
---
 ...0001-src-def.h-fix-build-with-gcc-10.patch | 38 -------------------
 package/mg/mg.hash                            |  5 +--
 package/mg/mg.mk                              |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/mg/0001-src-def.h-fix-build-with-gcc-10.patch
package/mg/0001-src-def.h-fix-build-with-gcc-10.patch deleted +0 -38
deleted file mode 100644
index d88e2f44f0..0000000000
@@ -1,38 +0,0 @@
-From 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sat, 5 Sep 2020 14:50:20 +0200
-Subject: [PATCH] src/def.h: fix build with gcc 10
-
-Define hlp as extern to avoid the following build failure with gcc 10
-(which defaults to -fno-common):
-
-  CCLD     mg
-/home/buildroot/autobuild/run/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: mg-bell.o:(.bss+0x0): multiple definition of `hlp'; mg-basic.o:(.bss+0x0): first defined here
-
-Fixes:
- - http://autobuild.buildroot.org/results/aacc02abf41e120e0d0b22faa38642e6d149d73f
-
-[backport of upstream 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530]
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[[email protected]: backport actual patch after MR was accepted]
-Signed-off-by: Yann E. MORIN <[email protected]>
----
- src/def.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/def.h b/src/def.h
-index e4c049c..cd59725 100644
---- a/src/def.h
-+++ b/src/def.h
-@@ -650,7 +650,7 @@ int		 excline(char *);
- char		*skipwhite(char *);
- 
- /* help.c X */
--const char	*hlp;
-+extern const char	*hlp;
- int		 desckey(int, int);
- int		 wallchart(int, int);
- int		 help_help(int, int);
--- 
-2.28.0
-
package/mg/mg.hash +2 -3
index 758a5232d4..9257daf5ac 100644
@@ -1,5 +1,4 @@
-# From https://github.com/troglobit/mg/releases/tag/v3.4
-md5 6b79855d54770bcb23e5457ebde8296c  mg-3.4.tar.gz
+# From https://github.com/troglobit/mg/releases/tag/v3.5
+sha256 a906eab9370c0f24a5fa25923561ad933b74ad339d0b2851d2067badf0d7e4ce  mg-3.5.tar.gz
 # Locally computed:
-sha256 1a620cf5b2dd4b00006d6c929ac8e2a70eeab5f807a0d6e5334b878aa182b713  mg-3.4.tar.gz
 sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c  UNLICENSE
package/mg/mg.mk +1 -1
index e3b79da006..bb3f59a14d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MG_VERSION = 3.4
+MG_VERSION = 3.5
 MG_SITE = https://github.com/troglobit/mg/releases/download/v$(MG_VERSION)
 MG_LICENSE = Public Domain
 MG_LICENSE_FILES = UNLICENSE
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Applied
#1 lore raw
Quoted 10 lines · On Sun, 17 Oct 2021 18:56:46 +0200 Joachim Wiberg <[email protected]> wrote:

- Drop backported patch for GCC 10 build problem, part of release
- Use upstream sha256 instead of locally computed

Signed-off-by Joachim Wiberg <[email protected]>
---
 ...0001-src-def.h-fix-build-with-gcc-10.patch | 38 -------------------
 package/mg/mg.hash                            |  5 +--
 package/mg/mg.mk                              |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/mg/0001-src-def.h-fix-build-with-gcc-10.patch

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot