summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-07-02 12:52:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:58:58 +0100
commit70067f082af279b58247467ec29283b310a1575e (patch)
treee8b482084735997517d663af86d81ee57b67f92a /meta
parent7af1525794fd91e8fca32221ec98f88c4cc3b0f0 (diff)
downloadpoky-70067f082af279b58247467ec29283b310a1575e.tar.gz
grub-efi: Do not use help2man
Fixes [YOCTO #2527] Modify configure.ac and the generated configure script to avoid using help2man during the compilation process. For grub-efi we are only deploying the EFI payload and are not installing grub on the target root filesystem. Therefor, we do not need the man pages. Cleanup the SRC_URI whitespace while we add a line to it. (From OE-Core rev: 035bc3f5ee99ed3bd74219d9717239299e4bc765) Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Paul Eggleton <paul.eggleton@linux.intel.com> CC: Radu Moisan <radu.moisan@intel.com> grub-efi-native whitespace cleanup (INC) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch231
-rw-r--r--meta/recipes-bsp/grub/grub-efi-native_1.99.bb17
2 files changed, 240 insertions, 8 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch b/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch
new file mode 100644
index 0000000000..3ffefdcf35
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch
@@ -0,0 +1,231 @@
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-1.99/configure.ac
14===================================================================
15--- grub-1.99.orig/configure.ac
16+++ grub-1.99/configure.ac
17@@ -275,11 +275,12 @@ if test x$grub_cv_apple_cc = xyes ; then
18 HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
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-1.99/configure
36===================================================================
37--- grub-1.99.orig/configure
38+++ grub-1.99/configure
39@@ -1172,7 +1172,6 @@ GL_COND_LIBTOOL_FALSE
40 GL_COND_LIBTOOL_TRUE
41 BUILD_CC
42 LIBUTIL
43-HELP2MAN
44 POSUB
45 LTLIBINTL
46 LIBINTL
47@@ -1204,6 +1203,7 @@ LEXLIB
48 am__fastdepCC_FALSE
49 am__fastdepCC_TRUE
50 CCDEPMODE
51+am__nodep
52 AMDEPBACKSLASH
53 AMDEP_FALSE
54 AMDEP_TRUE
55@@ -3011,7 +3011,6 @@ _ACEOF
56 # Let the site file select an alternate cache file if it wants to.
57 # Prefer an explicitly selected file to automatically selected ones.
58 ac_site_file1=NONE
59-ac_site_file2=NONE
60 if test -n "$CONFIG_SITE"; then
61 # We do not want a PATH search for config.site.
62 case $CONFIG_SITE in #((
63@@ -3019,14 +3018,8 @@ if test -n "$CONFIG_SITE"; then
64 */*) ac_site_file1=$CONFIG_SITE;;
65 *) ac_site_file1=./$CONFIG_SITE;;
66 esac
67-elif test "x$prefix" != xNONE; then
68- ac_site_file1=$prefix/share/config.site
69- ac_site_file2=$prefix/etc/config.site
70-else
71- ac_site_file1=$ac_default_prefix/share/config.site
72- ac_site_file2=$ac_default_prefix/etc/config.site
73 fi
74-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
75+for ac_site_file in $ac_site_file1
76 do
77 test "x$ac_site_file" = xNONE && continue
78 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
79@@ -3313,8 +3306,9 @@ case $target_os in *\ *) target_os=`echo
80 # The aliases save the names the user supplied, while $host etc.
81 # will get canonicalized.
82 test -n "$target_alias" &&
83- test "$program_prefix$program_suffix$program_transform_name" = \
84- NONENONEs,x,x, &&
85+ test "$target_alias" != "$host_alias" &&
86+ test "$program_prefix$program_suffix$program_transform_name" = \
87+ NONENONEs,x,x, &&
88 program_prefix=${target_alias}-
89
90 am__api_version='1.11'
91@@ -3786,11 +3780,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
92
93 # We need awk for the "check" target. The system "awk" is bad on
94 # some platforms.
95-# Always define AMTAR for backward compatibility.
96-
97-AMTAR=${AMTAR-"${am_missing_run}tar"}
98+# Always define AMTAR for backward compatibility. Yes, it's still used
99+# in the wild :-( We should find a proper way to deprecate it ...
100+AMTAR='$${TAR-tar}'
101
102-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
103+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
104
105
106
107@@ -4256,6 +4250,7 @@ fi
108 if test "x$enable_dependency_tracking" != xno; then
109 am_depcomp="$ac_aux_dir/depcomp"
110 AMDEPBACKSLASH='\'
111+ am__nodep='_no'
112 fi
113 if test "x$enable_dependency_tracking" != xno; then
114 AMDEP_TRUE=
115@@ -5069,6 +5064,7 @@ else
116 # instance it was reported that on HP-UX the gcc test will end up
117 # making a dummy file named `D' -- because `-MD' means `put the output
118 # in D'.
119+ rm -rf conftest.dir
120 mkdir conftest.dir
121 # Copy depcomp to subdir because otherwise we won't find it if we're
122 # using a relative directory.
123@@ -5128,7 +5124,7 @@ else
124 break
125 fi
126 ;;
127- msvisualcpp | msvcmsys)
128+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
129 # This compiler won't grok `-c -o', but also, the minuso test has
130 # not run yet. These depmodes are late enough in the game, and
131 # so weak that their functioning should not be impacted.
132@@ -6044,6 +6040,7 @@ else
133 # instance it was reported that on HP-UX the gcc test will end up
134 # making a dummy file named `D' -- because `-MD' means `put the output
135 # in D'.
136+ rm -rf conftest.dir
137 mkdir conftest.dir
138 # Copy depcomp to subdir because otherwise we won't find it if we're
139 # using a relative directory.
140@@ -6103,7 +6100,7 @@ else
141 break
142 fi
143 ;;
144- msvisualcpp | msvcmsys)
145+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
146 # This compiler won't grok `-c -o', but also, the minuso test has
147 # not run yet. These depmodes are late enough in the game, and
148 # so weak that their functioning should not be impacted.
149@@ -6848,6 +6845,7 @@ else
150 # instance it was reported that on HP-UX the gcc test will end up
151 # making a dummy file named `D' -- because `-MD' means `put the output
152 # in D'.
153+ rm -rf conftest.dir
154 mkdir conftest.dir
155 # Copy depcomp to subdir because otherwise we won't find it if we're
156 # using a relative directory.
157@@ -6905,7 +6903,7 @@ else
158 break
159 fi
160 ;;
161- msvisualcpp | msvcmsys)
162+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
163 # This compiler won't grok `-c -o', but also, the minuso test has
164 # not run yet. These depmodes are late enough in the game, and
165 # so weak that their functioning should not be impacted.
166@@ -9529,51 +9527,13 @@ if test x$grub_cv_apple_cc = xyes ; then
167 HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
168 fi
169
170-if test "x$cross_compiling" = xyes; then
171- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual pages while cross compiling" >&5
172+# Force behaving as though we are cross-compiling with respect to HELP2MAN
173+#if test "x$cross_compiling" = xyes; then
174+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual pages while cross compiling" >&5
175 $as_echo "$as_me: WARNING: cannot generate manual pages while cross compiling" >&2;}
176-else
177- # Extract the first word of "help2man", so it can be a program name with args.
178-set dummy help2man; ac_word=$2
179-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
180-$as_echo_n "checking for $ac_word... " >&6; }
181-if ${ac_cv_path_HELP2MAN+:} false; then :
182- $as_echo_n "(cached) " >&6
183-else
184- case $HELP2MAN in
185- [\\/]* | ?:[\\/]*)
186- ac_cv_path_HELP2MAN="$HELP2MAN" # Let the user override the test with a path.
187- ;;
188- *)
189- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
190-for as_dir in $PATH
191-do
192- IFS=$as_save_IFS
193- test -z "$as_dir" && as_dir=.
194- for ac_exec_ext in '' $ac_executable_extensions; do
195- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
196- ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext"
197- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
198- break 2
199- fi
200-done
201- done
202-IFS=$as_save_IFS
203-
204- ;;
205-esac
206-fi
207-HELP2MAN=$ac_cv_path_HELP2MAN
208-if test -n "$HELP2MAN"; then
209- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
210-$as_echo "$HELP2MAN" >&6; }
211-else
212- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
213-$as_echo "no" >&6; }
214-fi
215-
216-
217-fi
218+#else
219+# AC_PATH_PROG(HELP2MAN, help2man)
220+#fi
221
222 # Check for functions and headers.
223 for ac_func in posix_memalign memalign asprintf vasprintf getextmntent
224@@ -20309,6 +20269,7 @@ $as_echo_n "checking whether \`$CC' gene
225 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
226 /* end confdefs.h. */
227
228+void g (int);
229 void f (int (*p) (void));
230 void g (int i)
231 {
diff --git a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
index 20dcdb96f8..86a6d44d7c 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
@@ -16,20 +16,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
16# FIXME: We should be able to optionally drop freetype as a dependency 16# FIXME: We should be able to optionally drop freetype as a dependency
17DEPENDS = "help2man-native autogen-native" 17DEPENDS = "help2man-native autogen-native"
18RDEPENDS_${PN} = "diffutils freetype" 18RDEPENDS_${PN} = "diffutils freetype"
19PR = "r9" 19PR = "r10"
20 20
21# Native packages do not normally rebuild when the target changes. 21# Native packages do not normally rebuild when the target changes.
22# Ensure this is built once per HOST-TARGET pair. 22# Ensure this is built once per HOST-TARGET pair.
23PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native" 23PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native"
24 24
25SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 25SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
26 file://grub-1.99_fix_for_automake_1.11.2.patch \ 26 file://grub-1.99_fix_for_automake_1.11.2.patch \
27 file://grub-1.99-fpmath-sse-387-fix.patch \ 27 file://grub-1.99-fpmath-sse-387-fix.patch \
28 file://grub-1.99-gcc-4.7.0.patch \ 28 file://grub-1.99-gcc-4.7.0.patch \
29 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \ 29 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \
30 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \ 30 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \
31 file://grub-1.99-fix-enable_execute_stack-check.patch \ 31 file://grub-1.99-fix-enable_execute_stack-check.patch \
32 " 32 file://grub-1.99-disable-help2man.patch \
33 "
33 34
34SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" 35SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5"
35SRC_URI[sha256sum] = "b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff" 36SRC_URI[sha256sum] = "b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff"