From: Tom Zanussi <tom.zanussi@intel.com>
To: poky@yoctoproject.org
Subject: [PATCH] meta-intel: fix for x86_32 build failures
Date: Thu, 24 Feb 2011 10:48:07 -0600 [thread overview]
Message-ID: <1bdc18$jmfq57@fmsmga002.fm.intel.com> (raw)
From: Tom Zanussi <tom.zanussi@intel.com>
Fixes [BUG #711].
gentrigtables was being build as a 64-bit binary which wouldn't run on
the build machine. grub-mkfont was also causing compile failures, add
dependency on libfreetype for that.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../grub/grub-1.98/gentrigtables-compile-fix.patch | 52 ++++++++++++++++++++
common/recipes-bsp/grub/grub_1.98.bb | 5 +-
2 files changed, 55 insertions(+), 2 deletions(-)
create mode 100644 common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
diff --git a/common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch b/common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
new file mode 100644
index 0000000..d09ecf5
--- /dev/null
+++ b/common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
@@ -0,0 +1,52 @@
+Index: grub-1.98/conf/any-emu.mk
+===================================================================
+--- grub-1.98.orig/conf/any-emu.mk 2011-02-24 00:54:20.825116207 -0600
++++ grub-1.98/conf/any-emu.mk 2011-02-24 00:55:55.465116194 -0600
+@@ -820,7 +820,7 @@
+ ./gentrigtables > $@
+ DISTCLEANFILES += trigtables.c
+ gentrigtables: gentrigtables.c
+- $(CC) -o $@ $^ $(CPPFLAGS) -lm
++ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
+ DISTCLEANFILES += gentrigtables
+
+ # For grub-mkfont.
+Index: grub-1.98/conf/any-emu.rmk
+===================================================================
+--- grub-1.98.orig/conf/any-emu.rmk 2011-02-24 00:54:24.565116208 -0600
++++ grub-1.98/conf/any-emu.rmk 2011-02-24 00:56:40.665116186 -0600
+@@ -110,7 +110,7 @@
+ ./gentrigtables > $@
+ DISTCLEANFILES += trigtables.c
+ gentrigtables: gentrigtables.c
+- $(CC) -o $@ $^ $(CPPFLAGS) -lm
++ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
+ DISTCLEANFILES += gentrigtables
+
+ # For grub-mkfont.
+Index: grub-1.98/conf/common.mk
+===================================================================
+--- grub-1.98.orig/conf/common.mk 2011-02-24 00:54:30.345116207 -0600
++++ grub-1.98/conf/common.mk 2011-02-24 00:57:08.415116181 -0600
+@@ -11159,7 +11159,7 @@
+ ./gentrigtables > $@
+ DISTCLEANFILES += trigtables.c
+ gentrigtables: gentrigtables.c
+- $(CC) -o $@ $^ $(CPPFLAGS) -lm
++ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
+ DISTCLEANFILES += gentrigtables
+
+ pkglib_MODULES += setjmp.mod
+Index: grub-1.98/conf/common.rmk
+===================================================================
+--- grub-1.98.orig/conf/common.rmk 2011-02-24 00:54:34.035116205 -0600
++++ grub-1.98/conf/common.rmk 2011-02-24 00:57:31.045116179 -0600
+@@ -736,7 +736,7 @@
+ ./gentrigtables > $@
+ DISTCLEANFILES += trigtables.c
+ gentrigtables: gentrigtables.c
+- $(CC) -o $@ $^ $(CPPFLAGS) -lm
++ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
+ DISTCLEANFILES += gentrigtables
+
+ pkglib_MODULES += setjmp.mod
diff --git a/common/recipes-bsp/grub/grub_1.98.bb b/common/recipes-bsp/grub/grub_1.98.bb
index b9d04fc..0cd3a40 100644
--- a/common/recipes-bsp/grub/grub_1.98.bb
+++ b/common/recipes-bsp/grub/grub_1.98.bb
@@ -12,12 +12,13 @@ PRIORITY = "optional"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-RDEPENDS = "diffutils"
-PR = "r0"
+RDEPENDS = "diffutils freetype"
+PR = "r1"
SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://uninit-shdr-fix.patch;apply=yes \
file://grub-install.in.patch;apply=yes \
+ file://gentrigtables-compile-fix.patch;apply=yes \
file://40_custom"
inherit autotools
--
1.7.0.4
next reply other threads:[~2011-02-24 16:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 16:48 Tom Zanussi [this message]
2011-02-24 18:55 ` [PATCH] meta-intel: fix for x86_32 build failures Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='1bdc18$jmfq57@fmsmga002.fm.intel.com' \
--to=tom.zanussi@intel.com \
--cc=poky@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox