[vlc-devel] [PATCH 2/3] extras/tools: Add help2man

[Hugo Beauzée-Luyssen]

Which is needed by libtool, and can't be disabled through configure
Building automake is enough, but there are cases where we don't want to
build automake but still build libtool
---
 extras/tools/SHA512SUMS   |  1 +
 extras/tools/bootstrap    |  1 +
 extras/tools/packages.mak |  3 +++
 extras/tools/tools.mak    | 14 +++++++++++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 566ff2b47b..d9dbc4c627 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -16,3 +16,4 @@ bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be98
 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
 611e573756e3e936ce16b456df9583eb9acae51a0fbd28212444ddc0c1c5ec21e893d7a666bd77ef53423024939291a31dcf86d129126fa707b729d80b24184d  nasm-2.13.03.tar.gz
 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1  gettext-0.19.8.1.tar.gz
+d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 80c248b808..72e5d2a83d 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -134,6 +134,7 @@ check bison 3.0.0
 check flex
 check_nasm 2.13.01
 check gettext
+check help2man
 
 [ -n "$NEEDED" ] && mkdir -p build/ && echo "To-be-built packages: `echo $NEEDED | sed 's/\.//g'`"
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index b09f005381..b7bb397c04 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -56,3 +56,6 @@ FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-
 
 GETTEXT_VERSION=0.19.8.1
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
+
+HELP2MAN_VERSION=1.47.6
+HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 1b8cb73c79..896d624ad9 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -92,6 +92,18 @@ CLEAN_FILE += .cmake
 CLEAN_PKG += cmake
 DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz
 
+# help2man
+help2man-$(HELP2MAN_VERSION).tar.xz:
+	$(call download_pkg,$(HELP2MAN_URL),help2man)
+
+help2man: help2man-$(HELP2MAN_VERSION).tar.xz
+	$(UNPACK)
+	$(MOVE)
+
+.help2man: help2man
+	(cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
+	touch $@
+
 # libtool
 
 libtool-$(LIBTOOL_VERSION).tar.gz:
@@ -104,7 +116,7 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
 	$(APPLY) libtool-2.4.6-clang-libs.patch
 	$(MOVE)
 
-.libtool: libtool .automake
+.libtool: libtool .automake .help2man
 	(cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
 	ln -sf libtool $(PREFIX)/bin/glibtool
 	ln -sf libtoolize $(PREFIX)/bin/glibtoolize
-- 
2.18.0