mg: Upgrade to 20170401 release

Fix musl build along the way

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2017-04-07 18:24:17 -07:00 committed by Martin Jansa
parent 584d3114ac
commit 0723adbfd6
4 changed files with 101 additions and 3 deletions

View File

@ -0,0 +1,39 @@
From a370ccd9447752c555aeca04f64021efedde4db3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Apr 2017 17:16:19 -0700
Subject: [PATCH] Undefine REGEX for musl based systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
GNUmakefile | 1 -
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
CC?= gcc
CFLAGS?= -O2 -pipe
CFLAGS+= -g -Wall
-CPPFLAGS= -DREGEX
CPPFLAGS+= -D_GNU_SOURCE
CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2
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.
# STARTUPFILE -- look for and handle initialization file.
#
-CFLAGS+=-Wall -DREGEX
+CFLAGS+=-Wall
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

View File

@ -0,0 +1,25 @@
From 51539bcd2ee9f765595c0be16eebc1daee112b27 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Apr 2017 16:52:59 -0700
Subject: [PATCH 1/2] fileio: Include sys/param.h for MAXNAMLEN
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
fileio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fileio.c b/fileio.c
index 48a67a2..9b69665 100644
--- a/fileio.c
+++ b/fileio.c
@@ -12,6 +12,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/param.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
--
2.12.2

View File

@ -0,0 +1,28 @@
From ce24a29cabb8f1774d262e120e5764a2afeb3825 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Apr 2017 16:53:49 -0700
Subject: [PATCH 2/2] fileio: Define DEFFILEMODE if platform is missing
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
fileio.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fileio.c b/fileio.c
index 9b69665..a852fd2 100644
--- a/fileio.c
+++ b/fileio.c
@@ -28,6 +28,10 @@
#include "kbd.h"
#include "pathnames.h"
+#if !defined(DEFFILEMODE)
+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
+#endif
+
static char *bkuplocation(const char *);
static int bkupleavetmp(const char *);
--
2.12.2

View File

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