summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch27
-rw-r--r--meta/recipes-bsp/grub/grub-efi-native_1.99.bb3
-rw-r--r--meta/recipes-bsp/grub/grub_1.99.bb4
3 files changed, 32 insertions, 2 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch b/meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch
new file mode 100644
index 0000000000..9d7272b269
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch
@@ -0,0 +1,27 @@
1Upstream-Status: Pending
2
3
4This patch avoids this configure failure
5
6configure:20306: checking whether `ccache i586-poky-linux-gcc -m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse --sysroot=/builddisk/build/build0/tmp/sysroots/emenlow' generates calls to `__enable_execute_stack()'
7configure:20320: ccache i586-poky-linux-gcc -m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse --sysroot=/builddisk/build/build0/tmp/sysroots/emenlow -O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g -falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -mfpmath=387 -fno-dwarf2-cfi-asm -m32 -fno-stack-protector -mno-stack-arg-probe -Werror -Wno-trampolines -falign-loops=1 -S conftest.c
8conftest.c:308:6: error: no previous prototype for 'g' [-Werror=missing-prototypes]
9cc1: all warnings being treated as errors
10configure:20323: $? = 1
11configure:20327: error: ccache i586-poky-linux-gcc -m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse --sysroot=/builddisk/build/build0/tmp/sysroots/emenlow failed to produce assembly code
12
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142012/04/13
15
16Index: grub-1.99/acinclude.m4
17===================================================================
18--- grub-1.99.orig/acinclude.m4
19+++ grub-1.99/acinclude.m4
20@@ -317,6 +317,7 @@ dnl Check if the C compiler generates ca
21 AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[
22 AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
23 AC_LANG_CONFTEST([[
24+void g (int);
25 void f (int (*p) (void));
26 void g (int i)
27 {
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 30e9c74d39..20dcdb96f8 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
@@ -16,7 +16,7 @@ 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 = "r8" 19PR = "r9"
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.
@@ -28,6 +28,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
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 " 32 "
32 33
33SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" 34SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5"
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb
index b08fa560bb..143b1e839b 100644
--- a/meta/recipes-bsp/grub/grub_1.99.bb
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -12,14 +12,16 @@ LICENSE = "GPLv3"
12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
13 13
14RDEPENDS_${PN} = "diffutils freetype" 14RDEPENDS_${PN} = "diffutils freetype"
15PR = "r6" 15PR = "r7"
16 16
17SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 17SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
18 file://grub-install.in.patch \ 18 file://grub-install.in.patch \
19 file://grub-1.99_fix_for_automake_1.11.2.patch \
19 file://grub-1.99-fpmath-sse-387-fix.patch \ 20 file://grub-1.99-fpmath-sse-387-fix.patch \
20 file://grub-1.99-gcc-4.7.0.patch \ 21 file://grub-1.99-gcc-4.7.0.patch \
21 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \ 22 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \
22 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \ 23 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \
24 file://grub-1.99-fix-enable_execute_stack-check.patch \
23 file://40_custom" 25 file://40_custom"
24 26
25SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" 27SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5"