aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-13 18:12:19 -0700
committerKhem Raj <raj.khem@gmail.com>2020-08-13 22:37:48 -0700
commit161072d8002d0307011dd626922f673c18cfcd20 (patch)
tree17ad0b1fff7585a39cc03975305420e5225a9ffb /meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
parent7683c1a60642ad93248b2226f4aa2a59e8243063 (diff)
downloadmeta-openembedded-contrib-161072d8002d0307011dd626922f673c18cfcd20.tar.gz
mg: Upgrade to 20200723 tag
Fixes build with gcc10 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch')
-rw-r--r--meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch19
1 files changed, 6 insertions, 13 deletions
diff --git a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
index 1302679315..9c154a1734 100644
--- a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
+++ b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
@@ -9,31 +9,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Makefile | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
-diff --git a/GNUmakefile b/GNUmakefile
-index 7bf7dca..0e10030 100644
--- a/GNUmakefile
+++ b/GNUmakefile
-@@ -41,7 +41,6 @@ endif
+@@ -45,7 +45,6 @@ endif
CC?= gcc
CFLAGS?= -O2 -pipe
CFLAGS+= -g -Wall
-CPPFLAGS= -DREGEX
CPPFLAGS+= -D_GNU_SOURCE
- CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2
+ CPPFLAGS+= $(BSD_CPPFLAGS)
LIBS= $(CURSES_LIBS) $(BSD_LIBS)
-diff --git a/Makefile b/Makefile
-index 94ce340..d516bbc 100644
--- a/Makefile
+++ b/Makefile
-@@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL}
- # REGEX -- create regular expression functions.
+@@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL}
# STARTUPFILE -- look for and handle initialization file.
+ # MGLOG -- debug mg internals to a log file.
#
--CFLAGS+=-Wall -DREGEX
-+CFLAGS+=-Wall
+-CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses`
++CFLAGS+=-Wall `pkg-config --cflags-only-I ncurses`
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 \
---
-2.12.2
-