summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-13 17:26:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 17:03:55 +0000
commita4bcb3f19f4a64cce8e8e406903255a4a6b547f8 (patch)
treef6569c50d7b2e80d01d119ad8b53ab00d2b1cc4f /meta/recipes-bsp/grub
parent5ccdc914126e2408519bd9cae9dec20066a3033e (diff)
downloadpoky-a4bcb3f19f4a64cce8e8e406903255a4a6b547f8.tar.gz
grub-efi: remove configure patch, simply seed the cache
grub-2.00-disable-help2man patches configure.ac to disable the help2man check because we don't need the man pages. It also then patches configure itself so that autogen.sh doesn't have to be called for performance reasons. However, do_configure causes a full autoreconf so this optimisation is moot, and can cause patch failures when an existing build tree is re-used. Instead, simply use CACHED_CONFIGUREVARS to tell configure that it can't find help2man. (From OE-Core rev: 34b9b2931da1fbf4c68a3e35f4ca56553058574b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch148
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.00.bb2
2 files changed, 1 insertions, 149 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
deleted file mode 100644
index a2e42c2b7f..0000000000
--- a/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1Upstream-Status: Inappropriate (Bitbake build environment)
2
3We do not need the man pages when building just the EFI payload for the target,
4all the tools are built for the host. This does not trigger GRUB's built-in
5cross-compilation check, so force it. After the change to configure.ac,
6autogen.sh was run in devshell and the resulting configure was used to generate
7the configure diff. The configure diff was included to avoid having to add
8autogen.sh to a do_configure_prepend() routine which would slow down the build
9unnecessarily.
10
11Signed-off-by: Darren Hart <dvhart@linux.intel.com>
12
13Index: grub-2.00/configure.ac
14===================================================================
15--- grub-2.00.orig/configure.ac
16+++ grub-2.00/configure.ac
17@@ -310,11 +310,12 @@ if test x$USE_NLS = xno; then
18 HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
19 fi
20
21-if test "x$cross_compiling" = xyes; then
22- AC_MSG_WARN([cannot generate manual pages while cross compiling])
23-else
24- AC_PATH_PROG(HELP2MAN, help2man)
25-fi
26+# Force behaving as though we are cross-compiling with respect to HELP2MAN
27+#if test "x$cross_compiling" = xyes; then
28+AC_MSG_WARN([cannot generate manual pages while cross compiling])
29+#else
30+# AC_PATH_PROG(HELP2MAN, help2man)
31+#fi
32
33 # Check for functions and headers.
34 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent)
35Index: grub-2.00/configure
36===================================================================
37--- grub-2.00.orig/configure
38+++ grub-2.00/configure
39@@ -1215,7 +1215,6 @@ GL_COND_LIBTOOL_FALSE
40 GL_COND_LIBTOOL_TRUE
41 BUILD_CC
42 LIBUTIL
43-HELP2MAN
44 POSUB
45 LTLIBINTL
46 LIBINTL
47@@ -3069,7 +3068,6 @@ _ACEOF
48 # Let the site file select an alternate cache file if it wants to.
49 # Prefer an explicitly selected file to automatically selected ones.
50 ac_site_file1=NONE
51-ac_site_file2=NONE
52 if test -n "$CONFIG_SITE"; then
53 # We do not want a PATH search for config.site.
54 case $CONFIG_SITE in #((
55@@ -3077,14 +3075,8 @@ if test -n "$CONFIG_SITE"; then
56 */*) ac_site_file1=$CONFIG_SITE;;
57 *) ac_site_file1=./$CONFIG_SITE;;
58 esac
59-elif test "x$prefix" != xNONE; then
60- ac_site_file1=$prefix/share/config.site
61- ac_site_file2=$prefix/etc/config.site
62-else
63- ac_site_file1=$ac_default_prefix/share/config.site
64- ac_site_file2=$ac_default_prefix/etc/config.site
65 fi
66-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
67+for ac_site_file in $ac_site_file1
68 do
69 test "x$ac_site_file" = xNONE && continue
70 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
71@@ -3371,8 +3363,9 @@ case $target_os in *\ *) target_os=`echo
72 # The aliases save the names the user supplied, while $host etc.
73 # will get canonicalized.
74 test -n "$target_alias" &&
75- test "$program_prefix$program_suffix$program_transform_name" = \
76- NONENONEs,x,x, &&
77+ test "$target_alias" != "$host_alias" &&
78+ test "$program_prefix$program_suffix$program_transform_name" = \
79+ NONENONEs,x,x, &&
80 program_prefix=${target_alias}-
81
82 am__api_version='1.11'
83@@ -9633,51 +9626,13 @@ if test x$USE_NLS = xno; then
84 HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
85 fi
86
87-if test "x$cross_compiling" = xyes; then
88- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual pages while cross compiling" >&5
89+# Force behaving as though we are cross-compiling with respect to HELP2MAN
90+#if test "x$cross_compiling" = xyes; then
91+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual pages while cross compiling" >&5
92 $as_echo "$as_me: WARNING: cannot generate manual pages while cross compiling" >&2;}
93-else
94- # Extract the first word of "help2man", so it can be a program name with args.
95-set dummy help2man; ac_word=$2
96-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
97-$as_echo_n "checking for $ac_word... " >&6; }
98-if ${ac_cv_path_HELP2MAN+:} false; then :
99- $as_echo_n "(cached) " >&6
100-else
101- case $HELP2MAN in
102- [\\/]* | ?:[\\/]*)
103- ac_cv_path_HELP2MAN="$HELP2MAN" # Let the user override the test with a path.
104- ;;
105- *)
106- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
107-for as_dir in $PATH
108-do
109- IFS=$as_save_IFS
110- test -z "$as_dir" && as_dir=.
111- for ac_exec_ext in '' $ac_executable_extensions; do
112- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
113- ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext"
114- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
115- break 2
116- fi
117-done
118- done
119-IFS=$as_save_IFS
120-
121- ;;
122-esac
123-fi
124-HELP2MAN=$ac_cv_path_HELP2MAN
125-if test -n "$HELP2MAN"; then
126- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
127-$as_echo "$HELP2MAN" >&6; }
128-else
129- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
130-$as_echo "no" >&6; }
131-fi
132-
133-
134-fi
135+#else
136+# AC_PATH_PROG(HELP2MAN, help2man)
137+#fi
138
139 # Check for functions and headers.
140 for ac_func in posix_memalign memalign asprintf vasprintf getextmntent
141@@ -20477,6 +20432,7 @@ $as_echo_n "checking whether \`$CC' gene
142 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
143 /* end confdefs.h. */
144
145+void g (int);
146 void f (int (*p) (void));
147 void g (int i)
148 {
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index deb95149b3..e02def3e5f 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -22,7 +22,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
22 file://cfg \ 22 file://cfg \
23 file://grub-2.00-fpmath-sse-387-fix.patch \ 23 file://grub-2.00-fpmath-sse-387-fix.patch \
24 file://grub-2.00-fix-enable_execute_stack-check.patch \ 24 file://grub-2.00-fix-enable_execute_stack-check.patch \
25 file://grub-2.00-disable-help2man.patch \
26 file://check-if-liblzma-is-disabled.patch \ 25 file://check-if-liblzma-is-disabled.patch \
27 file://grub-no-unused-result.patch \ 26 file://grub-no-unused-result.patch \
28 file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ 27 file://grub-2.00-ignore-gnulib-gets-stupidity.patch \
@@ -56,6 +55,7 @@ inherit autotools
56inherit gettext 55inherit gettext
57inherit deploy 56inherit deploy
58 57
58CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN="
59EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ 59EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
60 --enable-efiemu=no --program-prefix='' \ 60 --enable-efiemu=no --program-prefix='' \
61 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" 61 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"