diff options
| -rw-r--r-- | groups/221.native_packages_dev.group | 8 | ||||
| -rw-r--r-- | patches/mandoc-1.14.3.local.patch | 20 | ||||
| -rw-r--r-- | patches/mandoc-1.14.5_pre.local.patch | 109 |
3 files changed, 114 insertions, 23 deletions
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index efcae120..e23b6135 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -62,9 +62,11 @@ patch patchutils perl python2 python3 ruby sbsigntools smallbasic tk")"; : ${PKG_MAKE_VERSION:=4.2.1}; : ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.gz}; : ${PKG_MANDOC_DEPENDS:="libz"}; -: ${PKG_MANDOC_SHA256SUM:=b1c9a2f27c487d6be08387aab7602199fd356086631d6e3f471b00c75249082d}; -: ${PKG_MANDOC_VERSION:=1.14.3}; -: ${PKG_MANDOC_URL:=https://midipix.org/mirror/mandoc/mandoc-${PKG_MANDOC_VERSION}.tar.gz}; +: ${PKG_MANDOC_SHA256SUM:=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7}; +: ${PKG_MANDOC_VERSION:=1.14.5}; +: ${PKG_MANDOC_URL:=https://mandoc.bsd.lv/snapshots/mandoc-${PKG_MANDOC_VERSION}.tar.gz}; +: ${PKG_MANDOC_MAKEFLAGS_BUILD_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib:LDADD=-Wl,-lz,-lfts:HAVE_REALLOCARRAY=0"}; +: ${PKG_MANDOC_CFLAGS_BUILD_EXTRA:="-g3 -O0"}; : ${PKG_MANDOC_IN_TREE:=1}; : ${PKG_NASM_SHA256SUM:=e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5}; : ${PKG_NASM_VERSION:=2.14.02}; diff --git a/patches/mandoc-1.14.3.local.patch b/patches/mandoc-1.14.3.local.patch deleted file mode 100644 index 0cbd7bcd..00000000 --- a/patches/mandoc-1.14.3.local.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mandoc-1.14.3/Makefile.in.orig 2018-05-02 13:56:07.000000000 +0000 -+++ mandoc-1.14.3/Makefile.in 2018-05-09 11:45:31.296000000 +0000 -@@ -1307,13 +1307,13 @@ - # Install makewhatis to .../sbin - install-exec-hook: - $(MKDIR_P) $(DESTDIR)$(sbindir) -- $(LN_S) $(DESTDIR)$(bindir)/mandoc$(EXEEXT) \ -+ $(LN_S) mandoc$(EXEEXT) \ - $(DESTDIR)$(sbindir)/makewhatis$(EXEEXT) -- $(LN_S) $(DESTDIR)$(bindir)/mandoc$(EXEEXT) \ -+ $(LN_S) mandoc$(EXEEXT) \ - $(DESTDIR)$(bindir)/man$(EXEEXT) -- $(LN_S) $(DESTDIR)$(bindir)/mandoc$(EXEEXT) \ -+ $(LN_S) mandoc$(EXEEXT) \ - $(DESTDIR)$(bindir)/apropos$(EXEEXT) -- $(LN_S) $(DESTDIR)$(bindir)/mandoc$(EXEEXT) \ -+ $(LN_S) mandoc$(EXEEXT) \ - $(DESTDIR)$(bindir)/whatis$(EXEEXT) - - # *sigh* diff --git a/patches/mandoc-1.14.5_pre.local.patch b/patches/mandoc-1.14.5_pre.local.patch new file mode 100644 index 00000000..1d193e6f --- /dev/null +++ b/patches/mandoc-1.14.5_pre.local.patch @@ -0,0 +1,109 @@ +diff -Nru mandoc-1.14.5.orig/configure mandoc-1.14.5/configure +--- mandoc-1.14.5.orig/configure 2020-06-02 12:36:34.215963438 +0200 ++++ mandoc-1.14.5/configure 2020-06-02 13:35:04.100931431 +0200 +@@ -41,7 +41,7 @@ + OSNAME= + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` ++CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i PATH="${PATH}" make -sf -` + CFLAGS= + LDADD= + LDFLAGS= +@@ -289,8 +289,6 @@ + runtest EFTYPE EFTYPE || true + runtest err ERR || true + runtest getline GETLINE || true +-singletest getsubopt GETSUBOPT || \ +- runtest getsubopt GETSUBOPT -D_GNU_SOURCE || true + runtest isblank ISBLANK || true + runtest mkdtemp MKDTEMP || true + runtest ntohl NTOHL || true +@@ -299,8 +297,6 @@ + runtest pledge PLEDGE || true + runtest sandbox_init SANDBOX_INIT || true + runtest progname PROGNAME || true +-singletest reallocarray REALLOCARRAY || \ +- runtest reallocarray REALLOCARRAY -D_OPENBSD_SOURCE || true + singletest recallocarray RECALLOCARRAY || \ + runtest recallocarray RECALLOCARRAY -D_OPENBSD_SOURCE || true + runtest rewb-bsd REWB_BSD || true +@@ -361,20 +357,6 @@ + echo 1>&3 + fi + +-# --- nanosleep --- +-if [ -n "${LD_NANOSLEEP}" ]; then +- runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true +-elif singletest nanosleep NANOSLEEP; then +- : +-elif runtest nanosleep NANOSLEEP "-lrt"; then +- LD_NANOSLEEP="-lrt" +-fi +-if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then +- echo "FATAL: nanosleep: no" 1>&2 +- echo "FATAL: nanosleep: no" 1>&3 +- exit 1 +-fi +- + if [ ${BUILD_CATMAN} -gt 0 ]; then + # --- recvmsg --- + if [ -n "${LD_RECVMSG}" ]; then +diff -Nru mandoc-1.14.5.orig/configure.local mandoc-1.14.5/configure.local +--- mandoc-1.14.5.orig/configure.local 1970-01-01 01:00:00.000000000 +0100 ++++ mandoc-1.14.5/configure.local 2020-06-02 13:35:25.328930766 +0200 +@@ -0,0 +1,54 @@ ++PREFIX= ++MANDIR=/share/man ++LIBDIR=/lib ++UTF8_LOCALE="en_US.UTF-8" ++MANPATH_DEFAULT="/share/man" ++LN="ln -sf" ++ ++# no gnu man, so this is fine. ++BINM_MAN=man ++BINM_APROPOS=apropos ++BINM_WHATIS=whatis ++BINM_MAKEWHATIS=makewhatis ++BINM_SOELIM=soelim ++MANM_MANCONF="man.conf" ++ ++# *sigh* ++HAVE_DIRENT_NAMLEN=0 ++HAVE_ISBLANK=1 ++HAVE_ENDIAN=1 ++HAVE_EFTYPE=0 ++HAVE_ERR=1 ++HAVE_FTS=1 ++HAVE_FTS_COMPARE_CONST=1 ++HAVE_GETLINE=1 ++HAVE_GETSUBOPT=1 ++HAVE_ISBLANK=1 ++HAVE_LESS_T=0 ++HAVE_MKDTEMP=1 ++HAVE_NTOHL=1 ++HAVE_O_DIRECTORY=1 ++HAVE_OHASH=0 ++HAVE_PATH_MAX=1 ++HAVE_PLEDGE=0 ++HAVE_PROGNAME=0 ++HAVE_REALLOCARRAY=0 ++HAVE_RECALLOCARRAY=0 ++HAVE_REWB_BSD=0 ++HAVE_REWB_SYSV=1 ++HAVE_STRCASESTR=1 ++HAVE_STRINGLIST=0 ++HAVE_STRLCAT=1 ++HAVE_STRLCPY=1 ++HAVE_STRPTIME=1 ++HAVE_STRSEP=1 ++HAVE_STRTONUM=0 ++HAVE_SYS_ENDIAN=0 ++HAVE_VASPRINTF=1 ++HAVE_WCHAR=1 ++HAVE_STRNDUP=1 ++HAVE_SANDBOX_INIT=0 ++ ++# *sigh x2* ++OSENUM=MANDOC_OS_OTHER ++OSNAME="Midipix" |