[vlc-commits] [Git][videolan/vlc][master] extras/tools: disable automake documentation

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
90462d2f by Steve Lhomme at 2023-12-12T06:26:23+00:00
extras/tools: disable automake documentation

It does not build for me, as it tries to use makeinfo/texinfo which is not
installed and not part of the tools we require.

- - - - -


2 changed files:

- + extras/tools/automake-disable-documentation.patch
- extras/tools/tools.mak


Changes:

=====================================
extras/tools/automake-disable-documentation.patch
=====================================
@@ -0,0 +1,25 @@
+From 47370dc3c47615e4a02e490f077780a3122839f4 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <slhomme at matroska.org>
+Date: Sat, 9 Dec 2023 09:35:05 +0100
+Subject: [PATCH] disable documentation
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8a4850384..bdb608a21 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -126,7 +126,7 @@ EXTRA_DIST += \
+ 
+ # Most work delegated to sub-dir makefile fragments.
+ include $(srcdir)/bin/local.mk
+-include $(srcdir)/doc/local.mk
++# include $(srcdir)/doc/local.mk
+ include $(srcdir)/lib/local.mk
+ include $(srcdir)/lib/Automake/local.mk
+ include $(srcdir)/lib/am/local.mk
+-- 
+2.39.3 (Apple Git-145)
+


=====================================
extras/tools/tools.mak
=====================================
@@ -189,10 +189,12 @@ automake-$(AUTOMAKE_VERSION).tar.gz:
 
 automake: automake-$(AUTOMAKE_VERSION).tar.gz
 	$(UNPACK)
+	$(APPLY) $(TOOLS)/automake-disable-documentation.patch
 	$(APPLY) $(TOOLS)/automake-clang.patch
 	$(MOVE)
 
 .buildautomake: automake .autoconf
+	(cd $<; ./bootstrap)
 	(cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
 	touch $@
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/90462d2f4d0f0555d4f0915960506c1fa8226343

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/90462d2f4d0f0555d4f0915960506c1fa8226343
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance