From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by mx1.pokylinux.org (Postfix) with ESMTP id 4185B4C80A7D for ; Thu, 24 Feb 2011 12:55:51 -0600 (CST) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 24 Feb 2011 10:55:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.62,219,1297065600"; d="scan'208";a="393651001" Received: from unknown (HELO [10.255.12.120]) ([10.255.12.120]) by azsmga001.ch.intel.com with ESMTP; 24 Feb 2011 10:55:50 -0800 Message-ID: <4D66A9B6.80302@linux.intel.com> Date: Thu, 24 Feb 2011 10:55:50 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100621 Fedora/3.0.5-1.fc13 Lightning/1.0b2pre Thunderbird/3.0.5 MIME-Version: 1.0 To: Tom Zanussi References: <1bdc18$jmfq57@fmsmga002.fm.intel.com> In-Reply-To: <1bdc18$jmfq57@fmsmga002.fm.intel.com> Cc: poky@yoctoproject.org Subject: Re: [PATCH] meta-intel: fix for x86_32 build failures X-BeenThere: poky@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Poky build system developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 18:55:51 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 02/24/2011 08:48 AM, Tom Zanussi wrote: > From: Tom Zanussi > > 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 > --- > .../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 Merged into Meta-Intel Master Thanks Sau!