mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
38
package/mg/0001-src-def.h-fix-build-with-gcc-10.patch
Normal file
38
package/mg/0001-src-def.h-fix-build-with-gcc-10.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
[yann.morin.1998@free.fr: backport actual patch after MR was accepted]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
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
|
||||
|
||||
18
package/mg/Config.in
Normal file
18
package/mg/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_MG
|
||||
bool "mg"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
Emacs-like text editor (130 kiB)
|
||||
|
||||
Mg is a MicroEMACS clone with the goal of being compatible
|
||||
with GNU Emacs, because there should never be any reason to
|
||||
learn more than one Emacs flavor.
|
||||
|
||||
Unlike many other editors it does not require ncurses, only a
|
||||
standard C library, making it suitable for really small and
|
||||
embedded systems.
|
||||
|
||||
This version is based on mg2a from OpenBSD, with more features
|
||||
and, in particular, no requirement on ncurses or termcap.
|
||||
|
||||
https://github.com/troglobit/mg/
|
||||
5
package/mg/mg.hash
Normal file
5
package/mg/mg.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# From https://github.com/troglobit/mg/releases/tag/v3.4
|
||||
md5 6b79855d54770bcb23e5457ebde8296c mg-3.4.tar.gz
|
||||
# Locally computed:
|
||||
sha256 1a620cf5b2dd4b00006d6c929ac8e2a70eeab5f807a0d6e5334b878aa182b713 mg-3.4.tar.gz
|
||||
sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c UNLICENSE
|
||||
19
package/mg/mg.mk
Normal file
19
package/mg/mg.mk
Normal file
@@ -0,0 +1,19 @@
|
||||
################################################################################
|
||||
#
|
||||
# mg
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MG_VERSION = 3.4
|
||||
MG_SITE = https://github.com/troglobit/mg/releases/download/v$(MG_VERSION)
|
||||
MG_LICENSE = Public Domain
|
||||
MG_LICENSE_FILES = UNLICENSE
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
MG_DEPENDENCIES += ncurses
|
||||
MG_CONF_OPTS += --with-curses
|
||||
else
|
||||
MG_CONF_OPTS += --without-curses
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user