diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2011-07-25 10:26:26 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2011-07-25 10:26:26 +0000 |
| commit | a5c6b9b51ca9077d801cee4c1219b320ac506b32 (patch) | |
| tree | a83759878a7e2e157b11bfab61c6f41698801a13 /sys-freebsd | |
| parent | Fix compilation against curl-7.21.7 (bug #376111) (diff) | |
| download | gentoo-2-a5c6b9b51ca9077d801cee4c1219b320ac506b32.tar.gz gentoo-2-a5c6b9b51ca9077d801cee4c1219b320ac506b32.tar.bz2 gentoo-2-a5c6b9b51ca9077d801cee4c1219b320ac506b32.zip | |
Add a patch to fix parallel make bug, fix #374373
(Portage version: 2.2.0_alpha43/cvs/FreeBSD i386)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/boot0/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/boot0/boot0-8.2.ebuild | 4 | ||||
| -rw-r--r-- | sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog index 0bc0bd4c6ba5..7e243977e2c7 100644 --- a/sys-freebsd/boot0/ChangeLog +++ b/sys-freebsd/boot0/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/boot0 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.26 2011/07/06 05:42:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.27 2011/07/25 10:26:26 naota Exp $ + + 25 Jul 2011; Naohiro Aota <naota@gentoo.org> boot0-8.2.ebuild, + +files/boot0-8.2-zfsboot-makefile.patch: + Add a patch to fix parallel make bug *boot0-8.2 (06 Jul 2011) diff --git a/sys-freebsd/boot0/boot0-8.2.ebuild b/sys-freebsd/boot0/boot0-8.2.ebuild index e727c6ec0cb3..04572efb2400 100644 --- a/sys-freebsd/boot0/boot0-8.2.ebuild +++ b/sys-freebsd/boot0/boot0-8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-8.2.ebuild,v 1.1 2011/07/06 05:42:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-8.2.ebuild,v 1.2 2011/07/25 10:26:26 naota Exp $ EAPI=2 @@ -20,6 +20,8 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* S="${WORKDIR}/sys/boot" +PATCHES=( "${FILESDIR}"/${P}-zfsboot-makefile.patch ) + boot0_use_enable() { use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" } diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch new file mode 100644 index 000000000000..a3a33d5d7c5b --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile +index bb16ea3..7dedb49 100644 +--- a/sys/boot/i386/zfsboot/Makefile ++++ b/sys/boot/i386/zfsboot/Makefile +@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out + zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o + ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ++drv.o: drv.c xreadorg.h ++ + zfsboot.o: zfsboot.s + + SRCS= zfsboot.c xreadorg.h |