helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 18:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

mg: Upgrade to 20200723 tag

Browse Source 
Fixes build with gcc10

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2020-08-13 18:12:19 -07:00
parent 7683c1a606
commit 161072d800
4 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
View File

@ -9,31 +9,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Makefile | 2 +- Makefile | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-) 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 7bf7dca..0e10030 100644
--- a/GNUmakefile --- a/GNUmakefile
+++ b/GNUmakefile +++ b/GNUmakefile
@@ -41,7 +41,6 @@ endif @@ -45,7 +45,6 @@ endif
CC?= gcc CC?= gcc
CFLAGS?= -O2 -pipe CFLAGS?= -O2 -pipe
CFLAGS+= -g -Wall CFLAGS+= -g -Wall
-CPPFLAGS= -DREGEX -CPPFLAGS= -DREGEX
CPPFLAGS+= -D_GNU_SOURCE CPPFLAGS+= -D_GNU_SOURCE
CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 CPPFLAGS+= $(BSD_CPPFLAGS)
LIBS= $(CURSES_LIBS) $(BSD_LIBS) LIBS= $(CURSES_LIBS) $(BSD_LIBS)
diff --git a/Makefile b/Makefile
index 94ce340..d516bbc 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL} @@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL}
# REGEX -- create regular expression functions.
# STARTUPFILE -- look for and handle initialization file. # STARTUPFILE -- look for and handle initialization file.
# MGLOG -- debug mg internals to a log file.
# #
-CFLAGS+=-Wall -DREGEX -CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses`
+CFLAGS+=-Wall +CFLAGS+=-Wall `pkg-config --cflags-only-I ncurses`
SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \
echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \
--
2.12.2

5
meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch
View File

@ -8,8 +8,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
fileio.c | 1 + fileio.c | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/fileio.c b/fileio.c
index 48a67a2..9b69665 100644
--- a/fileio.c --- a/fileio.c
+++ b/fileio.c +++ b/fileio.c
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -20,6 +18,3 @@ index 48a67a2..9b69665 100644
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
--
2.12.2

11
meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch
View File

@ -8,13 +8,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
fileio.c | 4 ++++ fileio.c | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/fileio.c b/fileio.c
index 9b69665..a852fd2 100644
--- a/fileio.c --- a/fileio.c
+++ b/fileio.c +++ b/fileio.c
@@ -28,6 +28,10 @@ @@ -36,6 +36,10 @@
#include "kbd.h" #define DEFFILEMODE 0666
#include "pathnames.h" #endif
+#if !defined(DEFFILEMODE) +#if !defined(DEFFILEMODE)
+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
@ -23,6 +21,3 @@ index 9b69665..a852fd2 100644
static char *bkuplocation(const char *); static char *bkuplocation(const char *);
static int bkupleavetmp(const char *); static int bkupleavetmp(const char *);
--
2.12.2

7
meta-oe/recipes-support/mg/mg_20170401.bb → meta-oe/recipes-support/mg/mg_20200723.bb
View File

@ -5,15 +5,16 @@ LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb"
DEPENDS = "ncurses libbsd" DEPENDS = "ncurses libbsd"
SECTION = "console/editors" SECTION = "console/editors"
SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ SRCREV = "60fa3582f5f735b9d43825f5bdcc4ea5f0740f91"
SRC_URI = "git://github.com/hboetes/mg \
file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \
file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \
" "
SRC_URI_append_libc-musl = "\ SRC_URI_append_libc-musl = "\
file://0001-Undefine-REGEX-for-musl-based-systems.patch \ file://0001-Undefine-REGEX-for-musl-based-systems.patch \
" "
SRC_URI[md5sum] = "884388589fb38c2109ad9fed328be20a"
SRC_URI[sha256sum] = "0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab" S = "${WORKDIR}/git"
# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?=
EXTRA_OEMAKE = "\ EXTRA_OEMAKE = "\