Add a patch to fix parallel make bug, fix #374373

Package-Manager: portage-2.2.0_alpha43/cvs/FreeBSD i386

4 files changed, 24 insertions, 14 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/Manifest b/sys-freebsd/boot0/Manifest
index 6a0ae3847ab3..532bbfa5f203 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX boot0-7.0-gentoo.patch 5523 RMD160 d6805e228c05acfd47deb42a8363a8aac2091aec SHA1 c77f9526f0eee1ec82b4e4f851b6cc9a9da0d0a0 SHA256 deb18a75bb96314fb34da515f12af3706df711b53d6ebf0c7c2d10c3ba8a6ace
+AUX boot0-8.2-zfsboot-makefile.patch 436 RMD160 2e0615b7d16389e0f659893fe1b99411fb5c9e63 SHA1 d30e0dd3cf71beec22ff8b01568f43eee435e75e SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 EBUILD boot0-7.2.ebuild 981 RMD160 3265097b97af3facc530b9483563ccdd7645aa9a SHA1 fe3898c11632890cf45fe7701595811e1c413e3a SHA256 827af5fa71c32a25c391b72cbde31c763a823dfc09eb6511efe6354f4444403f
 EBUILD boot0-8.0.ebuild 1237 RMD160 f4aa7226ec3c342688d4dfed5d5c49250f0935bf SHA1 5dd55da5174328b774eb138761242d3c488003e9 SHA256 7b8ef4a6c8bb4611795a1063f4b19db4e1e36d323e7579e02786e1bba4faa333
-EBUILD boot0-8.2.ebuild 1237 RMD160 f2a811026e2cd3358195cf1e1c919b2c37aeec30 SHA1 1f6711bb001295fc2cacb21c48d1ed2d7c29a0ce SHA256 c4b74cd1a99484fc1c239c233c7adb51c69c227115543fac6fccbf25fa00d489
-MISC ChangeLog 3982 RMD160 76231ac0129af5831d273d235e25004b3c9581e1 SHA1 211e21e82cadd34f2d7af60cf641c1ace71a1cb4 SHA256 767c8cf967b94751352cdd51a3c4df81f25f3f7d148b5c0d2fed0ded166c4ba5
+EBUILD boot0-8.2.ebuild 1289 RMD160 18f4b0a42952ae54dc766a45cc302dcfb0088fdc SHA1 c7ec4b8919faa9e14c99576279213e14806b02f4 SHA256 40e0e4d5a35139168f684a17063dcc109c2a8b51e24713d90177a057eeba62ce
+MISC ChangeLog 4127 RMD160 75248f6405060e2d1bd094ae210e123a7d3dbe20 SHA1 b29028a4c9a42741c1c953aaab45ecc8ebb5fe5b SHA256 7099f9b9c099919cf2de15182e3b706937f6f24d326bcc541de8d68b732ed190
 MISC metadata.xml 295 RMD160 9c5ae6b33450455b8d24d0d610513de8a1a51b4b SHA1 725ddfa0063fd7cffb9d678920e97a2fa2aa1f4f SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4T9eYACgkQvFcC4BYPU0o11gCfeKfLkh4omuUf/d1/ZVMSMd0d
-WHwAoLanFUFtT9iN4A3dlMwEAVYz848f
-=qCj1
------END PGP SIGNATURE-----
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