diff options
author | Alexis Ballier <aballier@gentoo.org> | 2013-06-27 23:05:20 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-27 23:05:20 +0000 |
commit | 84b97d7259b7dad3e97cb629ab95f179eadfaec5 (patch) | |
tree | 155620eb78c70dd873a47eaba73c7bb1bbe743f0 /sys-freebsd/freebsd-lib | |
parent | Drop all keywords but ~amd64 to avoid breaking the deptree with emul-linux st... (diff) | |
download | historical-84b97d7259b7dad3e97cb629ab95f179eadfaec5.tar.gz historical-84b97d7259b7dad3e97cb629ab95f179eadfaec5.tar.bz2 historical-84b97d7259b7dad3e97cb629ab95f179eadfaec5.zip |
bootstrap the libc when building a cross-compiler so that libm can be linked to it and fixes a build failure from a fresh build
Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-freebsd/freebsd-lib')
-rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 6 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/Manifest | 10 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild | 13 |
3 files changed, 19 insertions, 10 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 7908eb6d39ae..a35d93008c8e 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.186 2013/06/27 20:38:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.187 2013/06/27 23:05:05 aballier Exp $ + + 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r9.ebuild: + bootstrap the libc when building a cross-compiler so that libm can be linked + to it and fixes a build failure from a fresh build *freebsd-lib-9.1-r9 (27 Jun 2013) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index de32626b4063..94540fc981b2 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -68,14 +68,14 @@ EBUILD freebsd-lib-9.1-r5.ebuild 17118 SHA256 e721a639a5fb82f213ce40bad39f02a520 EBUILD freebsd-lib-9.1-r6.ebuild 18624 SHA256 43186c9a26fe3f168eba9a526ee5a69021c40093c814431076d79ff1d25a2391 SHA512 28f56883c0fe2b20ab18108b2829a69960878867f1eca9d81f3dc6f159fb41ba2814751876a729e9ed894edabcb6922602e3c07e60502c70baf99288412d4162 WHIRLPOOL 47754469cd1b9ff711f89b881429223c2330ecd6f5320d20287e294286203a6a197c93c657ea0e8d78f2f828901f0974cff59bf251a3ba344f0730d9acc2ad0f EBUILD freebsd-lib-9.1-r7.ebuild 18634 SHA256 c587fa2a4ad95f8534e04188bc8fc9d7430b4a872cd1dd53a12e760be23e3ff3 SHA512 207c4d6f3c4d30c8c6d6c086cb757431de01fa11239bf3f76169fe15261cee6b4233c052013539dc02570f8a2d7c1b75052f4acf272abd909428c4c4176c4ddd WHIRLPOOL ae0af97d61dde7968cfb9c4df664a502acdbf4638b97d1c1384ad461ffea7eba82f58380eaeabc5c83a13a0148f6e9258ef9d40527fdb8662c75f0fbe2878ef9 EBUILD freebsd-lib-9.1-r8.ebuild 18279 SHA256 b5d2a8ed519e4b7fc89494796530e74e37250bef9b8bdd34ea5b04ef0942c917 SHA512 0155df73a36c8745f2fc153fcd94dc8a4a912f935b1df44e9392e9a30079cddc3ea6107ccf52fc36d84dddbc5a705b55972dbf44e0fff2098b46ba5d226ba587 WHIRLPOOL 8c26dc3b07ab3faacc4f9781a16c6f26a2647dfa9e2ba7b9b83933a2281d97df54ead875fc030b1a93e93f8c9476d5faa61cc336f766912158bc6cbecb209031 -EBUILD freebsd-lib-9.1-r9.ebuild 18316 SHA256 0c0c2691792d98cc1d0531f4f506749a2691c9a44e0aaf579cfed7fed495c5da SHA512 e3b633745a7a123a6ec08db6b0ecf0722f1eeda1bce1ceb799b7deb0401c04298d15f7c0ba0fcae2d1c9f4abea8bb81aed94faafdc9520993caf312aee096dcf WHIRLPOOL 0fd1347b82934850b33d53723897384e1b1b912d76679171cbea84860d1686789dcec7f9ec13fe8c138a9157692a206227e634c5b7d686f3a1c7759895842844 +EBUILD freebsd-lib-9.1-r9.ebuild 18389 SHA256 5c71c5a96bb80dcfa6907205f178562674b93dcf47606130cf3c7f77cd953926 SHA512 b384e532de5734178384adeb8747be36da3db15853000dc46960716291d821400868ad7feacbac7a7c83f156061e516704c1815c64ae6487d5f47169f676d562 WHIRLPOOL 784ef7955cbc7c4b116a18b7370647c58e4fc5e43f84ef2ed53ff9b3887c438a10996a73b9cf8e0ca1ffca349156c99826852a8bc7cac82ae32e460bd0d0b66d EBUILD freebsd-lib-9.1.ebuild 17157 SHA256 b1a74967940cb0eb70c6965b3f2add374bc2155afd975c44a90cf65c744ea632 SHA512 ecfb6745880c47dc965363744869cb491f05d60c03463779eb250b3c71d443436dbdc03ae4ce741d8c99d57897a84561e09412d0f825cc9e552c4d17e5253c2d WHIRLPOOL a17b3b88765e62d1f415c41bd5f4e1f9c8349b29eac65e2e064d282ac3af33b5eea532c613fe25d1e6ad2e56ad82263be15128ba5eada42d95023869491c40da -MISC ChangeLog 38507 SHA256 70a050244eb696ab2a39df59a8dc7612794dcfca86fec433286b0829bdebd8e9 SHA512 499616f37dd7422b0e25394fc7698b046ddde8525070ffc43145d3a7c31a3b522dfafa6fcb8ff5a410986fce1598edefc1399f84c199d1d2991eb4a810562d79 WHIRLPOOL e00e4b38b61ae3f89c87022b5d856a31d1081a4f3e4401d3f5e2d44577f473171bae73b940f66ff7898165ad1dd0f78a6f689a6488fe5aab2ad9f4a41534a3a7 +MISC ChangeLog 38719 SHA256 2c791a3fc1fb1c568ad2a177f25ff843b37c8e184d9a7cba0a9f7fb179e934d3 SHA512 dd81c7c48a846d40e48a26d8865f01cdef5aec44f1c537428d20a2731a64d012c92b1fd5ec3beee566d063557387df7c4f130f27405df163d9679bf34ccd1bc8 WHIRLPOOL 3ca4860a3b0b6513adf064ac8dd743d6a4b825a49a0616abcd3eaba746d6384d005052a8c8a350199c7f4191f567c9a0b475bff89f07c01905ceb76844f28f9f MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlHMos0ACgkQvFcC4BYPU0pKswCfdEyfWdSZWcEQklcRcBZXT+/K -9bUAnjJcmpTNLTkByhGxshZiUFk5aiev -=BI1V +iEYEAREIAAYFAlHMxSMACgkQvFcC4BYPU0rUWgCfQinQ84EcHe06qWaakprnBDe7 +7JMAn2k118oFDPgHobQreBcsjB7hsFeI +=W4Ju -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild index 8f50af5fccf5..6d7ff0e4af36 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild,v 1.1 2013/06/27 20:38:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild,v 1.2 2013/06/27 23:05:05 aballier Exp $ EAPI=5 @@ -236,6 +236,12 @@ bootstrap_libssp_nonshared() { export LDADD="-lssp_nonshared" } +bootstrap_libc() { + cd "${WORKDIR}/lib/libc" || die + freebsd_src_compile + append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc" +} + bootstrap_libgcc() { cd "${WORKDIR}/lib/libcompiler_rt" || die freebsd_src_compile @@ -243,9 +249,7 @@ bootstrap_libgcc() { ln -s libcompiler_rt.a libgcc.a || die append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" - cd "${WORKDIR}/lib/libc" || die - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc" + bootstrap_libc cd "${WORKDIR}/gnu/lib/libgcc" || die freebsd_src_compile @@ -310,6 +314,7 @@ do_bootstrap() { fi bootstrap_csu bootstrap_libssp_nonshared + is_crosscompile && bootstrap_libc if ! is_crosscompile && ! is_native_abi ; then # Bootstrap the compiler libs bootstrap_libgcc |