diff options
| -rw-r--r-- | sys-firmware/sgabios/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch | 23 | ||||
| -rw-r--r-- | sys-firmware/sgabios/sgabios-0.1_pre8.ebuild | 8 |
3 files changed, 36 insertions, 2 deletions
diff --git a/sys-firmware/sgabios/ChangeLog b/sys-firmware/sgabios/ChangeLog index d56779a5f7a7..63f7d9e4be8b 100644 --- a/sys-firmware/sgabios/ChangeLog +++ b/sys-firmware/sgabios/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-firmware/sgabios # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/ChangeLog,v 1.6 2015/03/16 21:17:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/ChangeLog,v 1.7 2015/07/07 07:20:06 vapier Exp $ + + 07 Jul 2015; Mike Frysinger <vapier@gentoo.org> + +files/sgabios-0.1_pre8-build-cc.patch, sgabios-0.1_pre8.ebuild: + Use BUILD_CC when compiling the csum8 build-only tool #552280 by José + Pekkarinen. 16 Mar 2015; Mike Frysinger <vapier@gentoo.org> sgabios-0.1_pre8.ebuild: Use new toolchain helpers for selecting the bfd linker. diff --git a/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch b/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch new file mode 100644 index 000000000000..6cdac84c6acb --- /dev/null +++ b/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/552280 + +--- a/Makefile ++++ b/Makefile +@@ -20,6 +20,9 @@ + BUILD_USER = \"$(shell whoami)\" + + CFLAGS := -Wall -Os -m32 -nostdlib ++BUILD_CFLAGS := -Wall -O2 ++BUILD_CC ?= $(CC) ++BUILD_LD ?= $(BUILD_CC) + + ASFLAGS := $(CFLAGS) + ASFLAGS += -DBUILD_DATE="$(BUILD_DATE)" +@@ -55,7 +56,7 @@ + $(LD) $(LDFLAGS) $(OBJS) -o $@ + + csum8: csum8.c +- $(CC) -Wall -O2 -o $@ $< ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ $< + + sgabios.o: buildinfo + diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild index fa57261bf177..5fc5b3524b7d 100644 --- a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild +++ b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild,v 1.6 2015/03/16 21:17:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild,v 1.7 2015/07/07 07:20:06 vapier Exp $ EAPI=4 @@ -19,13 +19,19 @@ IUSE="" src_prepare() { epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-build-cc.patch #552280 epatch_user } src_compile() { if use amd64 || use x86 ; then tc-ld-disable-gold + tc-export_build_env BUILD_CC emake \ + BUILD_CC="${BUILD_CC}" \ + BUILD_CFLAGS="${BUILD_CFLAGS}" \ + BUILD_LDFLAGS="${BUILD_LDFLAGS}" \ + BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \ CC="$(tc-getCC)" \ LD="$(tc-getLD)" \ AR="$(tc-getAR)" \ |