summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-07-25 12:09:23 +0000
committerMichał Górny <mgorny@gentoo.org>2015-07-25 12:09:23 +0000
commit8a43fe265f1f90ce668770ca829a59aac369e7bd (patch)
tree9db0c1537344f6f72d400da67e48690afcc04b4a /sys-freebsd
parentFix FreeBSD-SA-15:13.tcp (diff)
downloadhistorical-8a43fe265f1f90ce668770ca829a59aac369e7bd.tar.gz
historical-8a43fe265f1f90ce668770ca829a59aac369e7bd.tar.bz2
historical-8a43fe265f1f90ce668770ca829a59aac369e7bd.zip
Fix build failure on x86-fbsd, bug #554738. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/181 by nigoro.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/boot0/ChangeLog6
-rw-r--r--sys-freebsd/boot0/Manifest32
-rw-r--r--sys-freebsd/boot0/boot0-10.1.ebuild7
3 files changed, 25 insertions, 20 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/Manifest b/sys-freebsd/boot0/Manifest
index 0625ee984655..07e428d92a68 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -11,27 +11,27 @@ DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f
DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
-EBUILD boot0-10.1.ebuild 2212 SHA256 e0e1195eeccf23161af3b1019a70f371ead0626f57bb479bfca7fa96f52f9d7a SHA512 5e29e6d8dff8102061475b3f7e7f90f746ccf9a3bbaa0a960395311af6c750fd4e2ac6e3b04b50cc46cd9cb67ec1a0870ec92952a78ca9d39dcd1f0726cce8b8 WHIRLPOOL af6b32cbf5c17cce074c93c553787807e0c79a1bbbfea1a08e9ba296a86d139afd9c2ed1978751feac93812028af935af47ee7a609af15fff56e8acfa115a646
+EBUILD boot0-10.1.ebuild 2211 SHA256 37d694558f682a72d00da9f2475c6d07546a184c150626e471d7c2ab2657162c SHA512 7fb849c04535be0444eb38ffd10fcabe03fc104054597ff7300b92770f2b1c50a96baac64f3935d0430c75adae119a7ceba66f0d5d44369d3724042430563fb7 WHIRLPOOL 76d288c25f8a5dff0c4ce4ad252a80ff9fa53b99d2704606a8400d9abb0e57628263ee23a4d47aa3af217b9d6ced0fdd29163b1056090f95d1a5c00ccfc6ab0f
EBUILD boot0-8.2.ebuild 1289 SHA256 40e0e4d5a35139168f684a17063dcc109c2a8b51e24713d90177a057eeba62ce SHA512 79785ee0f577f744dd4087f69333bc76d9624046526d4f9a36f2be9d27e8b68e3d3bb488147996cd95a034ab288274c43bee8ac444776f40c2e9f2f3ed3edb91 WHIRLPOOL b9c59ec699020212e0ce439bde6b3d4acf899e2b6620ce3261f537e1ce05108989b8cff38abd1ab4afc1586e1ba564d1221e420d83c6509ad24f260e1a803d15
EBUILD boot0-9.1.ebuild 1586 SHA256 f48b11c0c8cf859582a3ad16d7b8303c645b8e29b1a63d024e90bc014ff1348d SHA512 3c034b9f9b99636e5678ce7bdb89dca59747f8a28473e8e7592e8cb209ee4671b739ee422a633f591d0b007a1e000911c38b4c4dfafbdffcea2a5be40d0894a1 WHIRLPOOL e9ebb57b09f5672e9ce327bbec785c1dab4b88ac17a98c45830587b9b1092012b09603a747e6d275a1253e3189c66ba1f00ebd66b2f12a836516d4d7148c996f
-MISC ChangeLog 8163 SHA256 ee2c8ae0d345b5cf7a184e255e520e9e1884dce1b8227237e0751337d224c7df SHA512 ee288b133d3fbbc2617cac1392f16417378c7eb206c501fa41c071efcd1c54b3da542081310ecc6168a64f2c480b35d0d45acbea8df62169262f378f63b03478 WHIRLPOOL dbcca7f28ee24aea4de5f20009444b66f2de580e7c0a871d77fb3f4010d32d4d212d55d9933782b39dbd69365133f15b690575cda79f241edbe21fb9ac684b3b
+MISC ChangeLog 8356 SHA256 8c0af2a79e25332eaad01fbc8d7a9f2687f09d78dcb6b64eab3a09c018a5ba72 SHA512 5a6eef7c4b64c46225715cdb9cb1e1d7182a8f5b42f1ac346d71dcdfc95e13a1ddf517ad509963e1e2b832713e44ba1810739834f458ca22e21090f67de113d1 WHIRLPOOL 97aa61125896c790634a8b8f43ddea1e0d2ac274654e4cb9bbdd35c94194653edc3a9c9cd61b4b810f9280e8a3d4a3b94268e92a4f7599a715f56bceba35d2f4
MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJVfcHEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVs3xzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOR3sQAIaAYQbpJlG0xRsmwhj1lSBj
-sKuZiDU61b+OxDR8RzeFVbeC0tWqdK3c50APq8FQVMhb0Bjesm0Ucs4Vtps4ReSo
-ChDLDmCfTsjSJ/2K2u7J9EddgOAfqCcKrx5g/txOtObrHcAmiRQieOZNpof7I5Lt
-tktOFQFeiQ0GIJlrgLVQ7TxVhUtjsEwvaxdGbbMd06E5osSnAMO2xb/oewR4nIzR
-U/+d7qbaNAMNVxkk2G8WSdC9jcBGiERl31adugmAGZI2hcSpINhqIiAYXwjuv23f
-FbMTZMSWEqFx4AYBzO5uUAmQCLmlAwvcomUB020rZY/O4GzAf8lpi1vE3wYfuVOc
-cVJdz+BzmtmA8BhV9ixPzoh8Y2zCfrY836cPsr6oeOGLrTcKKjzleEBBSA4KYYWz
-Zjw78PMtaZ8Ym4KKEvZ+qcncQU8cC5WaMEP/zxauJZFjS2FULSg0ViaVc1L2JROo
-7GIaLoigZsdJdHcsFCrAjnPa3+yjB2ob03sJyqO91jYn//FNmjWPMZ2roO9CisUX
-wp42booHRLDLKAJ8F0ZP6RWRaD/kIP8ucF7UTSQqMKleB9m/iULzmhQ8NIVR+F1E
-H4fKiJxjitrOxseRl9Ul9VbVvCIiERaUhnwSi4UggZhmVeLn2QEY3OHLnGOsvoCV
-6y9dGm0FePHcbQbeLrZi
-=yndw
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqAkQAIVBjg9jANFyjxRIlccv5ARi
+zsaycGEt+pX1GWQwq1R9Y8w3KGiL+GT8sOl7VUqQ8ABIpFPvCYwKr9zkWs2gMwo4
+5rhExLSAs6Nx+zB6IrOs8nH491+H/LZoXlA4npEkrwmuKutpyCwmoGxKJuoKJDfn
+Ixw8CqJIq48y/sawBEZPUZzJmGbDXHCV/EqMcOlr5CZmVyNU+3iX9jok3tmGMX3S
+yUvPiqwBnQjgasFC92JrjauhOLn84JLrHkfQl0LWjYuvt+FsiMY8lr8a0gvorFCy
+fMLaU4MlXxgs2YsnUBfS/XcWCqR/uxMRWVGgFe3fW2C0/CKo4RixkAsSILLpvsa4
+WxmgYvbzLOBGbUVO0y+3f/GzfvTjKtR8ZWquxsq8xktonuM1gFWOOGX3G93oSZz0
+z/1eW9o+oWfgBq+EAoEX+EnqSzwiTM2ic6uUHPmXESUzWhVx8G9zzzWUBGSgUg+/
+U0uiUoeIst4cDY9fTalZwHODtmW8E2Xid9oWYOHQ7EpL8rErnRU1L05i2ZwizLDK
+U3irWFZ6VJuSHG1Ooo9xpdcI1SIRBaDPu4i/SCnTmGohg0WUy9zK67VCFLcgLtWl
+x5vQi/y54D9aNej96j9EJ9KWMo1H/q8Oy3r0aar/z3lNSDp+aXxDMvHHM6Djphg/
+6jUb23MKmHTWT+4T/i/a
+=1w6O
-----END PGP SIGNATURE-----
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