[vlc-commits] extras/tools: Add help2man

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Jul 12 20:16:46 2018 +0200| [c45c54a0317890973bfa61dc13993ffbeb93ae40] | committer: Steve Lhomme

extras/tools: Add help2man

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

(cherry picked from commit c4d68e98e57981dd453dd4b2fa2d06b3d03d964e) (rebased)

rebased:
- meson was already in this branch

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c45c54a0317890973bfa61dc13993ffbeb93ae40
---

 extras/tools/SHA512SUMS   |  1 +
 extras/tools/bootstrap    |  1 +
 extras/tools/packages.mak |  3 +++
 extras/tools/tools.mak    | 18 +++++++++++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 12de8e0981..0a96f50a4e 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -15,5 +15,6 @@ e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bf
 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412  bison-3.0.4.tar.xz
 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
+d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859  meson-0.53.1.tar.gz
 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2  ninja-1.8.2.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index fd2a97e153..1738faf3c5 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -105,6 +105,7 @@ check xz
 check bison 3.0.0
 check flex
 check_nasm 2.14
+check help2man
 check meson 0.51.1
 check ninja
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 92bbcfee75..25e144ae64 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -54,6 +54,9 @@ BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
 FLEX_VERSION=2.6.4
 FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-$(FLEX_VERSION).tar.gz
 
+HELP2MAN_VERSION=1.47.6
+HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
+
 MESON_VERSION=0.53.1
 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
 
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index da703d8577..751e6c9b28 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -92,6 +92,22 @@ 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 $@
+
+CLEAN_FILE += .help2man
+CLEAN_PKG += help2man
+DISTCLEAN_PKG += help2man-$(HELP2MAN_VERSION).tar.xz
+
 # libtool
 
 libtool-$(LIBTOOL_VERSION).tar.gz:
@@ -104,7 +120,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