diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch')
| -rw-r--r-- | meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch new file mode 100644 index 0000000000..a2e42c2b7f --- /dev/null +++ b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch @@ -0,0 +1,148 @@ +Upstream-Status: Inappropriate (Bitbake build environment) + +We do not need the man pages when building just the EFI payload for the target, +all the tools are built for the host. This does not trigger GRUB's built-in +cross-compilation check, so force it. After the change to configure.ac, +autogen.sh was run in devshell and the resulting configure was used to generate +the configure diff. The configure diff was included to avoid having to add +autogen.sh to a do_configure_prepend() routine which would slow down the build +unnecessarily. + +Signed-off-by: Darren Hart <dvhart@linux.intel.com> + +Index: grub-2.00/configure.ac +=================================================================== +--- grub-2.00.orig/configure.ac ++++ grub-2.00/configure.ac +@@ -310,11 +310,12 @@ if test x$USE_NLS = xno; then + HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext" + fi + +-if test "x$cross_compiling" = xyes; then +- AC_MSG_WARN([cannot generate manual pages while cross compiling]) +-else +- AC_PATH_PROG(HELP2MAN, help2man) +-fi ++# Force behaving as though we are cross-compiling with respect to HELP2MAN ++#if test "x$cross_compiling" = xyes; then ++AC_MSG_WARN([cannot generate manual pages while cross compiling]) ++#else ++# AC_PATH_PROG(HELP2MAN, help2man) ++#fi + + # Check for functions and headers. + AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent) +Index: grub-2.00/configure +=================================================================== +--- grub-2.00.orig/configure ++++ grub-2.00/configure +@@ -1215,7 +1215,6 @@ GL_COND_LIBTOOL_FALSE + GL_COND_LIBTOOL_TRUE + BUILD_CC + LIBUTIL +-HELP2MAN + POSUB + LTLIBINTL + LIBINTL +@@ -3069,7 +3068,6 @@ _ACEOF + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. + ac_site_file1=NONE +-ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( +@@ -3077,14 +3075,8 @@ if test -n "$CONFIG_SITE"; then + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +-elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site +-else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++for ac_site_file in $ac_site_file1 + do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then +@@ -3371,8 +3363,9 @@ case $target_os in *\ *) target_os=`echo + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. + test -n "$target_alias" && +- test "$program_prefix$program_suffix$program_transform_name" = \ +- NONENONEs,x,x, && ++ test "$target_alias" != "$host_alias" && ++ test "$program_prefix$program_suffix$program_transform_name" = \ ++ NONENONEs,x,x, && + program_prefix=${target_alias}- + + am__api_version='1.11' +@@ -9633,51 +9626,13 @@ if test x$USE_NLS = xno; then + HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext" + fi + +-if test "x$cross_compiling" = xyes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual pages while cross compiling" >&5 ++# Force behaving as though we are cross-compiling with respect to HELP2MAN ++#if test "x$cross_compiling" = xyes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual pages while cross compiling" >&5 + $as_echo "$as_me: WARNING: cannot generate manual pages while cross compiling" >&2;} +-else +- # Extract the first word of "help2man", so it can be a program name with args. +-set dummy help2man; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_HELP2MAN+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $HELP2MAN in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_HELP2MAN="$HELP2MAN" # Let the user override the test with a path. +- ;; +- *) +- 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-HELP2MAN=$ac_cv_path_HELP2MAN +-if test -n "$HELP2MAN"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5 +-$as_echo "$HELP2MAN" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi ++#else ++# AC_PATH_PROG(HELP2MAN, help2man) ++#fi + + # Check for functions and headers. + for ac_func in posix_memalign memalign asprintf vasprintf getextmntent +@@ -20477,6 +20432,7 @@ $as_echo_n "checking whether \`$CC' gene + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++void g (int); + void f (int (*p) (void)); + void g (int i) + { |