Skip to contentSkip to conversation

bison: fix docs build breakage

PATCH New Gustavo Zacarias 2 participants 3 messages Oct 2, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bison: fix docs build breakage

Building docs running the binary itself to see if docs need to be changed is somewhat skippy. Disable it. Fixes:
http://autobuild.buildroot.net/results/e8a/e8a960f38e66f31355af733e510002d45052b541/

---
 package/bison/bison-01-no-docs-regen.patch | 53 ++++++++++++++++++++++++++++++
 package/bison/bison.mk                     |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 package/bison/bison-01-no-docs-regen.patch
package/bison/bison-01-no-docs-regen.patch new file +53 -0
new file mode 100644
index 0000000..7c375d6
@@ -0,0 +1,53 @@
+bison regenerates the docs to see if they changed which requires running
+the recently built bison. This obviously doesn't work for cross compiles
+hence breaks for many target bison builds.
+Just disable it.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura bison-3.0.orig/doc/local.mk bison-3.0/doc/local.mk
+--- bison-3.0.orig/doc/local.mk	2013-10-02 16:52:48.711890121 -0300
++++ bison-3.0/doc/local.mk	2013-10-02 17:14:59.329341143 -0300
+@@ -37,15 +37,6 @@
+ CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
+ CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi
+ $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
+-# Create $@~ which is the previous contents.  Don't use 'mv' here so
+-# that even if we are interrupted, the file is still available for
+-# diff in the next run.  Note that $@ might not exist yet.
+-	$(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
+-	$(AM_V_at)test ! -f [email protected] || rm -f [email protected]
+-	$(AM_V_at)src/bison$(EXEEXT) --help |				 \
+-	  $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >[email protected]
+-	$(AM_V_at)diff -u $@~ [email protected] || true
+-	$(AM_V_at)mv [email protected] $@
+ MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
+ 
+ ## ---------- ##
+@@ -86,9 +77,6 @@
+ EXTRA_DIST += $(top_srcdir)/doc/bison.help
+ MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
+ $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
+-	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
+-	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
+-	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
+ 
+ 
+ ## ----------- ##
+@@ -106,16 +94,6 @@
+ 
+ # Depend on configure to get version number changes.
+ $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
+-	$(AM_V_GEN)$(HELP2MAN)			\
+-	    --include=$(top_srcdir)/doc/bison.x	\
+-	    [email protected] src/bison$(EXEEXT)
+-	$(AM_V_at)if $(remove_time_stamp) $@ >[email protected] 2>/dev/null &&	 \
+-	   $(remove_time_stamp) [email protected] | cmp [email protected] - >/dev/null 2>&1; then \
+-	  touch $@;							 \
+-	else								 \
+-	  mv [email protected] $@;							 \
+-	fi
+-	$(AM_V_at)rm -f $@*.t
+ 
+ nodist_man_MANS = doc/yacc.1
+ 
package/bison/bison.mk +1 -0
index 47a7560..1bead39 100644
@@ -11,6 +11,7 @@ BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING
 BISON_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 BISON_DEPENDENCIES = m4
+BISON_AUTORECONF = YES
 
 define BISON_DISABLE_EXAMPLES
 	echo 'all install:' > $(@D)/examples/Makefile
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 1/1 bison: fix docs build breakage

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Building docs running the binary itself to see if docs need to be Gustavo> changed is somewhat skippy. Disable it. Fixes:
Gustavo> http://autobuild.buildroot.net/results/e8a/e8a960f38e66f31355af733e510002d45052b541/

The bison bump also seems to have broken E.G. gstreamer:

http://autobuild.buildroot.net/results/af0/af0c1f66a05ff08bf10d2abaef6aab6421d7a62e/build-end.log

With 0.10 being end of life, upstream will most likely not fix this. Care to take a look?

Signature · 1 line
Bye, Peter Korsgaard