Hitchhiker/src
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add autotools to toolchain host tools; Patch zsh to remove deprecated options being passed to texi2html

Browse Source
This commit is contained in:
Nathan Fisher 2024-12-13 01:00:35 -05:00
parent a9ecd6716d
commit e113722e68
7 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mk/versions.mk
View File

@ -102,5 +102,5 @@ wireless_tools_version = 29
wpa_supplicant_version = 2.9 wpa_supplicant_version = 2.9
XML-Parser_version = 2.46 XML-Parser_version = 2.46
xz_version = 5.2.6 xz_version = 5.2.6
zsh_version = 5.8.1 zsh_version = 5.9
zstd_version = 1.5.2 zstd_version = 1.5.2

2
toolchain/Makefile
View File

@ -24,6 +24,8 @@ subdirs += linux-headers
subdirs += musl subdirs += musl
subdirs += gcc-pass2 subdirs += gcc-pass2
subdirs += pkg-config subdirs += pkg-config
subdirs += autoconf
subdirs += automake
installdirs += $(tooldir) $(global_srcdir) $(global_objdir) installdirs += $(tooldir) $(global_srcdir) $(global_objdir)

6
toolchain/autoconf/Makefile Normal file
View File

@ -0,0 +1,6 @@
# Makefile - hhl - /usr/src/world/autoconf
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
#
distname = autoconf
include toolchain.mk
include targets.mk

6
toolchain/automake/Makefile Normal file
View File

@ -0,0 +1,6 @@
# Makefile - hhl - /usr/src/world/automake
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
#
distname = automake
include toolchain.mk
include targets.mk

4
world/Makefile
View File

@ -32,8 +32,8 @@ subdirs += bison
subdirs += flex subdirs += flex
subdirs += libtool subdirs += libtool
subdirs += gdbm subdirs += gdbm
#subdirs += pcre subdirs += pcre
#subdirs += zsh subdirs += zsh
subdirs += inetutils subdirs += inetutils
subdirs += autoconf subdirs += autoconf
subdirs += automake subdirs += automake

1
world/zsh/Makefile
View File

@ -2,6 +2,7 @@
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com> # Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
# #
distname = zsh distname = zsh
patches += zsh-texi2html.patch
include world.mk include world.mk
export CFLAGS = --sysroot=$(DESTDIR) export CFLAGS = --sysroot=$(DESTDIR)

15
world/zsh/zsh-texi2html.patch Normal file
View File

@ -0,0 +1,15 @@
diff -Naur zsh-5.9.orig/Doc/Makefile.in zsh-5.9/Doc/Makefile.in
--- zsh-5.9.orig/Doc/Makefile.in 2022-05-08 02:18:22.000000000 -0400
+++ zsh-5.9/Doc/Makefile.in 2024-12-13 00:54:34.475621988 -0500
@@ -173,9 +173,9 @@
html: zsh_toc.html
.PHONY: html
-zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
+zsh_toc.html: $(sdir)/zsh.texi
$(TEXI2HTML) --output . --ifinfo --split=chapter --node-files \
- --init-file texi2html.conf $(sdir)/zsh.texi
+ $(sdir)/zsh.texi
zshall.1: zsh.yo
case $@ in \