summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-07-25 12:09:21 +0000
committerMichał Górny <mgorny@gentoo.org>2015-07-25 12:09:21 +0000
commitfdc831c2e6246861caa2bc7f0cc880593ff13fa0 (patch)
tree9f5f181b22275a23f214bb4fb5e0d996331a4efe /sys-freebsd
parentppc stable wrt bug #550740 (diff)
downloadgentoo-2-fdc831c2e6246861caa2bc7f0cc880593ff13fa0.tar.gz
gentoo-2-fdc831c2e6246861caa2bc7f0cc880593ff13fa0.tar.bz2
gentoo-2-fdc831c2e6246861caa2bc7f0cc880593ff13fa0.zip
Fix build failure on x86-fbsd, bug #554738. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/181 by nigoro.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/boot0/ChangeLog6
-rw-r--r--sys-freebsd/boot0/boot0-10.1.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index a04e4434ca48..160dad820aee 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/boot0
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.55 2015/06/14 18:02:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.56 2015/07/25 12:09:21 mgorny Exp $
+
+ 25 Jul 2015; Michał Górny <mgorny@gentoo.org> boot0-10.1.ebuild:
+ Fix build failure on x86-fbsd, bug #554738. https://github.com/gentoo/gentoo-
+ portage-rsync-mirror/pull/181 by nigoro.
14 Jun 2015; Michał Górny <mgorny@gentoo.org> boot0-10.1.ebuild:
Do not force clang, gcc works nowadays. https://github.com/gentoo/gentoo-
diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.1.ebuild
index cd2407a3cee3..d1e3bb9dbc9f 100644
--- a/sys-freebsd/boot0/boot0-10.1.ebuild
+++ b/sys-freebsd/boot0/boot0-10.1.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-freebsd/boot0/boot0-10.1.ebuild,v 1.4 2015/06/14 18:02:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.5 2015/07/25 12:09:21 mgorny Exp $
EAPI=5
@@ -60,10 +60,11 @@ src_compile() {
freebsd_src_compile
cd "${S}/userboot/zfs" || die
freebsd_src_compile
- cd "${S}/libstand32" || die
- freebsd_src_compile
fi
+ cd "${S}/libstand32" || die
+ freebsd_src_compile
+
# bug542676
if [[ $(tc-getCC) == *clang* ]]; then
cd "${S}/i386/btx" || die