diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-07 18:24:17 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-24 11:00:53 +0200 |
commit | 0723adbfd6c38377a362338ab23d1ba423c02aaa (patch) | |
tree | 4be64753aa3a8e9542e5bdebcbe1c73ec8fb4514 | |
parent | 584d3114ac565c76f968c96463c24277d964fb92 (diff) | |
download | meta-openembedded-0723adbfd6c38377a362338ab23d1ba423c02aaa.tar.gz |
mg: Upgrade to 20170401 release
Fix musl build along the way
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch | 39 | ||||
-rw-r--r-- | meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch | 25 | ||||
-rw-r--r-- | meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-support/mg/mg_20170401.bb (renamed from meta-oe/recipes-support/mg/mg_20161005.bb) | 12 |
4 files changed, 101 insertions, 3 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 new file mode 100644 index 000000000..130267931 --- /dev/null +++ b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a370ccd9447752c555aeca04f64021efedde4db3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Apr 2017 17:16:19 -0700 | ||
4 | Subject: [PATCH] Undefine REGEX for musl based systems | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | GNUmakefile | 1 - | ||
9 | Makefile | 2 +- | ||
10 | 2 files changed, 1 insertion(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/GNUmakefile b/GNUmakefile | ||
13 | index 7bf7dca..0e10030 100644 | ||
14 | --- a/GNUmakefile | ||
15 | +++ b/GNUmakefile | ||
16 | @@ -41,7 +41,6 @@ endif | ||
17 | CC?= gcc | ||
18 | CFLAGS?= -O2 -pipe | ||
19 | CFLAGS+= -g -Wall | ||
20 | -CPPFLAGS= -DREGEX | ||
21 | CPPFLAGS+= -D_GNU_SOURCE | ||
22 | CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 | ||
23 | LIBS= $(CURSES_LIBS) $(BSD_LIBS) | ||
24 | diff --git a/Makefile b/Makefile | ||
25 | index 94ce340..d516bbc 100644 | ||
26 | --- a/Makefile | ||
27 | +++ b/Makefile | ||
28 | @@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL} | ||
29 | # REGEX -- create regular expression functions. | ||
30 | # STARTUPFILE -- look for and handle initialization file. | ||
31 | # | ||
32 | -CFLAGS+=-Wall -DREGEX | ||
33 | +CFLAGS+=-Wall | ||
34 | |||
35 | SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ | ||
36 | echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ | ||
37 | -- | ||
38 | 2.12.2 | ||
39 | |||
diff --git a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch new file mode 100644 index 000000000..551f1df16 --- /dev/null +++ b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 51539bcd2ee9f765595c0be16eebc1daee112b27 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Apr 2017 16:52:59 -0700 | ||
4 | Subject: [PATCH 1/2] fileio: Include sys/param.h for MAXNAMLEN | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | fileio.c | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/fileio.c b/fileio.c | ||
12 | index 48a67a2..9b69665 100644 | ||
13 | --- a/fileio.c | ||
14 | +++ b/fileio.c | ||
15 | @@ -12,6 +12,7 @@ | ||
16 | #include <sys/time.h> | ||
17 | #include <sys/types.h> | ||
18 | #include <sys/wait.h> | ||
19 | +#include <sys/param.h> | ||
20 | #include <dirent.h> | ||
21 | #include <errno.h> | ||
22 | #include <fcntl.h> | ||
23 | -- | ||
24 | 2.12.2 | ||
25 | |||
diff --git a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch new file mode 100644 index 000000000..907d67064 --- /dev/null +++ b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From ce24a29cabb8f1774d262e120e5764a2afeb3825 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Apr 2017 16:53:49 -0700 | ||
4 | Subject: [PATCH 2/2] fileio: Define DEFFILEMODE if platform is missing | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | fileio.c | 4 ++++ | ||
9 | 1 file changed, 4 insertions(+) | ||
10 | |||
11 | diff --git a/fileio.c b/fileio.c | ||
12 | index 9b69665..a852fd2 100644 | ||
13 | --- a/fileio.c | ||
14 | +++ b/fileio.c | ||
15 | @@ -28,6 +28,10 @@ | ||
16 | #include "kbd.h" | ||
17 | #include "pathnames.h" | ||
18 | |||
19 | +#if !defined(DEFFILEMODE) | ||
20 | +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ | ||
21 | +#endif | ||
22 | + | ||
23 | static char *bkuplocation(const char *); | ||
24 | static int bkupleavetmp(const char *); | ||
25 | |||
26 | -- | ||
27 | 2.12.2 | ||
28 | |||
diff --git a/meta-oe/recipes-support/mg/mg_20161005.bb b/meta-oe/recipes-support/mg/mg_20170401.bb index f9ceb4665..dad1d008b 100644 --- a/meta-oe/recipes-support/mg/mg_20161005.bb +++ b/meta-oe/recipes-support/mg/mg_20170401.bb | |||
@@ -5,9 +5,15 @@ LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" | |||
5 | DEPENDS = "ncurses libbsd" | 5 | DEPENDS = "ncurses libbsd" |
6 | SECTION = "console/editors" | 6 | SECTION = "console/editors" |
7 | 7 | ||
8 | SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz" | 8 | SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ |
9 | SRC_URI[md5sum] = "fc6faeeee7308bb46f3512b75867ed51" | 9 | file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ |
10 | SRC_URI[sha256sum] = "b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61" | 10 | file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ |
11 | " | ||
12 | SRC_URI_append_libc-musl = "\ | ||
13 | file://0001-Undefine-REGEX-for-musl-based-systems.patch \ | ||
14 | " | ||
15 | SRC_URI[md5sum] = "884388589fb38c2109ad9fed328be20a" | ||
16 | SRC_URI[sha256sum] = "0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab" | ||
11 | 17 | ||
12 | # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= | 18 | # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= |
13 | EXTRA_OEMAKE = "\ | 19 | EXTRA_OEMAKE = "\ |