diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-04-14 18:51:26 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-04-14 18:51:26 +0000 |
| commit | 98bbb0767ace5ef4335c93dfc394dfcc8d429083 (patch) | |
| tree | 765a705186a2a0f51b4b76109515c0c01bebe03e /patches/ksh_openbsd-20180115.local.patch | |
| parent | ad95e4e18e8e430d4d50a03c59030876837f2b30 (diff) | |
| download | midipix_build-98bbb0767ace5ef4335c93dfc394dfcc8d429083.tar.bz2 midipix_build-98bbb0767ace5ef4335c93dfc394dfcc8d429083.tar.xz | |
vars/build.vars:native_packages_cmdline: adds ksh_openbsd v20180115 (via Redfoxmoon.)
vars/build.vars:native_packages_deps: adds musl_compat & libbsd v0.8.7 (via Redfoxmoon.)
patches/ksh_openbsd-20180115.local.patch: via Redfoxmoon.
patches/libbsd-0.8.7.local.patch: via Redfoxmoon.
Diffstat (limited to 'patches/ksh_openbsd-20180115.local.patch')
| -rw-r--r-- | patches/ksh_openbsd-20180115.local.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/patches/ksh_openbsd-20180115.local.patch b/patches/ksh_openbsd-20180115.local.patch new file mode 100644 index 00000000..63430646 --- /dev/null +++ b/patches/ksh_openbsd-20180115.local.patch @@ -0,0 +1,63 @@ +diff -ru ksh-openbsd-20180115.orig/history.c ksh-openbsd-20180115/history.c +--- ksh-openbsd-20180115.orig/history.c 2018-01-15 23:04:15.000000000 +0100 ++++ ksh-openbsd-20180115/history.c 2018-04-14 15:31:50.346308024 +0200 +@@ -28,6 +28,10 @@ + #include "vis.h" + #include "sh.h" + ++#ifndef F_EXLCK ++#define F_EXLCK 4 ++#endif ++ + #define timespeccmp(tsp, usp, cmp) \ + (((tsp)->tv_sec == (usp)->tv_sec) ? \ + ((tsp)->tv_nsec cmp (usp)->tv_nsec) : \ +diff -ru ksh-openbsd-20180115.orig/Makefile ksh-openbsd-20180115/Makefile +--- ksh-openbsd-20180115.orig/Makefile 2018-01-15 23:04:15.000000000 +0100 ++++ ksh-openbsd-20180115/Makefile 2018-04-14 16:03:43.040414391 +0200 +@@ -22,12 +22,12 @@ + CDIAGFLAGS+= -Wshadow + CDIAGFLAGS+= -Wdeclaration-after-statement + +-CFLAGS += $(CDIAGFLAGS) `getconf LFS_CFLAGS` -DEMACS -DVI ++CFLAGS += $(CDIAGFLAGS) `getconf LFS_CFLAGS` -D_GNU_SOURCE -DEMACS -DVI + LDADD += -lbsd + + $(PROG): $(OBJS) +- $(CC) -o $(PROG) $(CFLAGS) $(LDADD) \ +- $(OBJS) ++ $(CC) -o $(PROG) $(CFLAGS) \ ++ $(OBJS) $(LDADD) + + all: $(PROG) + +@@ -37,7 +37,7 @@ + + install: + install -m755 -d $(BINDIR) +- install -m755 --strip --no-target-directory ksh $(BINDIR)/pdksh ++ install -m755 --no-target-directory ksh $(BINDIR)/pdksh + install -m755 -d $(MANDIR)/man1 + install -m644 --no-target-directory ksh.1 $(MANDIR)/man1/pdksh.1 + install -m644 --no-target-directory sh.1 $(MANDIR)/man1/pdksh-sh.1 +diff -ru ksh-openbsd-20180115.orig/vis.c ksh-openbsd-20180115/vis.c +--- ksh-openbsd-20180115.orig/vis.c 2018-01-15 23:04:15.000000000 +0100 ++++ ksh-openbsd-20180115/vis.c 2018-04-14 15:38:41.605684906 +0200 +@@ -139,7 +139,7 @@ + *dst = '\0'; + return (dst); + } +-DEF_WEAK(vis); ++//DEF_WEAK(vis); + + /* + * strvis, strnvis, strvisx - visually encode characters from src into dst +@@ -165,7 +165,7 @@ + *dst = '\0'; + return (dst - start); + } +-DEF_WEAK(strvis); ++//DEF_WEAK(strvis); + + int + strnvis(char *dst, const char *src, size_t siz, int flag) |