Skip to content
Snippets Groups Projects
Commit 57e10c2a authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files

patches/buildroot: to build under ubuntu-14.04 avoid building gcc docs 

Somebody decided that suboptimal formatting is now an error. So the
new makeinfo errors out when building gcc-4.3.6 because of
documentation details.  Idiocy has no limits, and we are are bound to
suffer for that.  I remember when "gnu's not unix, we have higher standards".

This patch prevents gcc documentation to be built when buildroot prepares
the cross compiler.  Bah.

/alessandro who wasted a whole day on that
parent 8f06261d
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
patches/buildroot/0002-gcc-no-docs.patch 0 → 100644
+ 197
− 0
View file @ 57e10c2a
--- ./toolchain/gcc/4.3.6/gcc-no-docs.patch.orig 2014-05-27 12:06:43.000000000 +0200
+++ ./toolchain/gcc/4.3.6/gcc-no-docs.patch 2014-05-27 12:05:55.000000000 +0200
@@ -0,0 +1,194 @@
+--- gcc-4.3.6/gcc/configure.ac.orig 2014-05-27 11:57:52.000000000 +0200
++++ gcc-4.3.6/gcc/configure.ac 2014-05-27 12:02:59.000000000 +0200
+@@ -847,17 +847,10 @@
+
+ # See if makeinfo has been installed and is modern enough
+ # that we can use it.
+-ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
+- [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
+-if test $gcc_cv_prog_makeinfo_modern = no; then
+- AC_MSG_WARN([
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built.])
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+-fi
++
++ MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo"
++ BUILD_INFO=
++
+ AC_SUBST(BUILD_INFO)
+
+ # Is pod2man recent enough to regenerate manpages?
+--- gcc-4.3.6/gcc/configure.orig 2014-05-27 11:57:52.000000000 +0200
++++ gcc-4.3.6/gcc/configure 2014-05-27 12:02:25.000000000 +0200
+@@ -7838,82 +7838,8 @@
+ fi
+
+
+-# See if makeinfo has been installed and is modern enough
+-# that we can use it.
+-
+- # Extract the first word of "makeinfo", so it can be a program name with args.
+-set dummy makeinfo; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$MAKEINFO"; then
+- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_MAKEINFO="makeinfo"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+-echo "${ECHO_T}$MAKEINFO" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- if test -n "$MAKEINFO"; then
+- # Found it, now check the version.
+- echo "$as_me:$LINENO: checking for modern makeinfo" >&5
+-echo $ECHO_N "checking for modern makeinfo... $ECHO_C" >&6
+-if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_prog_version=`eval $MAKEINFO --version 2>&1 |
+- sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
+-
+- case $ac_prog_version in
+- '') gcc_cv_prog_makeinfo_modern=no;;
+- 4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;;
+- *) gcc_cv_prog_makeinfo_modern=no;;
+- esac
+-
+-fi
+-echo "$as_me:$LINENO: result: $gcc_cv_prog_makeinfo_modern" >&5
+-echo "${ECHO_T}$gcc_cv_prog_makeinfo_modern" >&6
+- else
+- gcc_cv_prog_makeinfo_modern=no
+- fi
+- if test $gcc_cv_prog_makeinfo_modern = no; then
+ MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo"
+- fi
+-
+-if test $gcc_cv_prog_makeinfo_modern = no; then
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built." >&2;}
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+-fi
+-
++ BUILD_INFO=
+
+ # Is pod2man recent enough to regenerate manpages?
+ echo "$as_me:$LINENO: checking for recent Pod::Man" >&5
+--- gcc-4.3.6/libiberty/configure.ac.orig 2014-05-27 11:58:00.000000000 +0200
++++ gcc-4.3.6/libiberty/configure.ac 2014-05-27 12:01:18.000000000 +0200
+@@ -62,32 +62,10 @@
+ AC_SUBST(MAINT)dnl
+ AC_SUBST(NOTMAINT)dnl
+
+-# Do we have a single-tree copy of texinfo? Even if we do, we can't
+-# rely on it - libiberty is built before texinfo.
+-AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
+-if test "x$MAKEINFO" = "x"; then
++ # Hack: don't build docs, new makeinfo errors for formatting aesthetics
+ MAKEINFO="@echo makeinfo missing; true"
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+- case "$MAKEINFO" in
+- */missing\ makeinfo*)
+- BUILD_INFO=
+- AC_MSG_WARN([
+-*** Makeinfo is missing. Info documentation will not be built.])
+- ;;
+- *)
+- case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+- x*\ [[1-3]].* )
+- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+- BUILD_INFO=
+- AC_MSG_WARN([
+-*** Makeinfo is too old. Info documentation will not be built.])
+- ;;
+- esac
+- ;;
+- esac
+-fi
++ MAKEINFO=true
++
+ AC_SUBST(MAKEINFO)
+ AC_SUBST(BUILD_INFO)
+
+--- gcc-4.3.6/libiberty/configure.orig 2014-05-27 11:58:00.000000000 +0200
++++ gcc-4.3.6/libiberty/configure 2014-05-27 12:01:23.000000000 +0200
+@@ -1431,43 +1431,8 @@
+
+ fi
+ fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+-echo "${ECHO_T}$MAKEINFO" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test "x$MAKEINFO" = "x"; then
+ MAKEINFO="@echo makeinfo missing; true"
+ BUILD_INFO=
+-else
+- BUILD_INFO=info
+- case "$MAKEINFO" in
+- */missing\ makeinfo*)
+- BUILD_INFO=
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&2;}
+- ;;
+- *)
+- case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+- x*\ [1-3].* )
+- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+- BUILD_INFO=
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is too old. Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is too old. Info documentation will not be built." >&2;}
+- ;;
+- esac
+- ;;
+- esac
+-fi
+-
+
+
+ # Extract the first word of "perl", so it can be a program name with args.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment