diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-03-30 20:04:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-30 20:04:16 +0000 |
| commit | e5eea718fb9f599d287a3db64f2e65e626f6ad07 (patch) | |
| tree | add662810b7698a3348997546c23e7cb30af7e68 | |
| parent | Version bump to development release. (diff) | |
| download | historical-e5eea718fb9f599d287a3db64f2e65e626f6ad07.tar.gz historical-e5eea718fb9f599d287a3db64f2e65e626f6ad07.tar.bz2 historical-e5eea718fb9f599d287a3db64f2e65e626f6ad07.zip | |
Add cross-compiling fixes to match upstream.
Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/Manifest | 32 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.21.1.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.21.ebuild | 8 |
4 files changed, 35 insertions, 19 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 69083aca8be8..164be42ebe9a 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.374 2012/03/30 18:53:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.375 2012/03/30 20:04:16 vapier Exp $ + + 30 Mar 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.21.ebuild, + util-linux-2.21.1.ebuild: + Add cross-compiling fixes to match upstream. *util-linux-2.21.1 (30 Mar 2012) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 2bf6bd879f54..574798f35a81 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -21,25 +21,25 @@ EBUILD util-linux-2.20-r1.ebuild 3639 RMD160 8dad7cbdd3c818084c42cbbe49a37fbf179 EBUILD util-linux-2.20.1-r1.ebuild 3553 RMD160 ac25f9648a7a2031b809fc368008bb95191ed303 SHA1 77b95140a55d8c3f243c07e0039fab5427fbfdb6 SHA256 f6af57e96fde274749fd4df4ed4d7bca379b88a70a9a5c15d6423d3f1cbf260d EBUILD util-linux-2.20.1-r2.ebuild 3679 RMD160 13ce8cc23225aba2a484058d53866b014412ce52 SHA1 b349423497fe45f477a730e464a004d5535fe635 SHA256 490a3d40e23fb35eea315946fbee9f993b6900c7275b5970c4cebcd3e1e9e1a3 EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63 -EBUILD util-linux-2.21.1.ebuild 3413 RMD160 91d59a39cb4f98b8bb8c1a247b9d358160fdf60f SHA1 a9ac3d6f123a8ed26634aada283d0e4bdf9264f4 SHA256 980926568947b72264bcce6fe6c650bab8bef0127bcf4c58c9c1cde4c11c19f8 -EBUILD util-linux-2.21.ebuild 3411 RMD160 ed4d70258545a7c31f93e0fb3ac9c3cb6e0a2dfd SHA1 bd9299ef48eb1ec29098106834aacefa03ab5334 SHA256 5644161a89b2fc7a10a874bcf9377d60ce47857c229e364533b845e1b73d6e89 +EBUILD util-linux-2.21.1.ebuild 3640 RMD160 69502d9c529aff4279546d155373f43377cd48f3 SHA1 0083b527f49a9d2054dadf16ce09a23227a3b109 SHA256 6f9c13b466c5b909f005117c013fa6dcc13c8826fa9f2528252216a9a560d76f +EBUILD util-linux-2.21.ebuild 3638 RMD160 2e3216f4fc9e1e88dfce4ce13b054f7b588fcd38 SHA1 a7a107feb50c393bb3fb166900170ad9c5c6367d SHA256 62bb3aaa0cd1e8f4a879f7292027207189be95162dae82651af43aeba2e6e06e EBUILD util-linux-9999.ebuild 3412 RMD160 7c490b30962ff82c9f55144106222ce72be1d7d2 SHA1 0e7b8c482787a424b0853c5dc8cd20606b123853 SHA256 684a2d6929ba190d3711bdd406ad007e06152461aee2f9528f978ca9e537e835 -MISC ChangeLog 57456 RMD160 6fe3eec29167304ab7b7cf352177220ac0672287 SHA1 8b2fa377db2ecdc2e99f1cf8fb0dfc12d67954b2 SHA256 e2803e044527b2da32732e53fd5ceeeae7c41eb615630b0216bd7b4779917ea9 +MISC ChangeLog 57606 RMD160 c908685a5d7825c8f6932b7d5e53e084717f0998 SHA1 f49ae3c3c08a3274f17a959f6897e036cfe10c20 SHA256 c84c2d791ea9adaa9cc116e9b2861c01f405100a31c637ccfb05bf8c7caee25d MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPdgEhAAoJELEHsLL7fEFWrtMQAMCB6T8UMPvZEWGnDEFFqngZ -XuODR6UFLlEPq9HqIl7XBx5WnbJvFCafOYPbNa1JxmITe820sVU39unaU+QnoJI+ -5b2MFgYVfdUlbdc/MdEXVHvTFAeYuIrfT8LHgmGnIttdCoCNFZmy9G2zMgzs52mZ -fvLPD7b731YSB80GJ3rXtO5Ml0d4kbKfVS58mrPmR5Lu4azhtOgy5iF2mB87xjrd -W8TMq924QxC7mD5JZlDy2M5RBq/iPCqsRaqsgSLiCN6m8qiSSkNszxYRyGTFhGGq -/u75h0ROwQt8V+gME/uIz1e0VU9Qae3G/tu9pZAOQUTrXmNw531DJ0q1DPxaplVU -mJKM+Qr9WN06ixeJ3ao5iqVfEli5ta3G30Da5aQ3diNlRWbbFDqYhacedoEGRcgw -Uxx/nvBDQ876eVdz1hHK1z1q+L3H3Sx7nhZMHlrHyadUQ00tnMT14bgEZFAqiqpM -W56fZar8q9dfRUBbrMRS1CGK3rB/YaVIdyINSzjTsoMUhzKowcJ2kq25AETwTx6l -saHiI0DhuppP0nMIzcnVl6EVKXSXBn52bHt6I1hqBOkiA9T426l6FahVArUe08c8 -81EeQVvSmRGi4/WhmnXMGmNh84jAPjbSjcm3dJgen1PKBYXvGtIeToLZ8TJWa4H+ -KgJ2T7s60CgoZvfY3q5G -=94xj +iQIcBAEBAgAGBQJPdhHQAAoJELEHsLL7fEFW1N8QALKQZivZO1ldbdcaNDqruZKl +HI7zWZ8G9YWuGVAYRiyq/Mt6UWfOUwS9BVkZvIgRNOb4l807CN/D90hs6TFlVrN9 +acL3FJZkuUnqX2J7mznT4/Jc2mOQ9OzwZhIhWZkFPysWtM8Yeyj4yzelZezyejcx +/Oweqi0CcsHShAOEcWM2W8pReJr7ZHnUcHW7RZtekcU9A5ggO4mId/47PuxSwOkp +gp3uEUcBq7imA3edB4buoz3c2m5tLTARjLJf2T9/KPntG+67o8OMe0R8pSyeGvgI +RJ67nyBKD0M4SKAH6iWt/p8T7n7mG3U88zjOmH/EuTN8RgOHL7CwGQAB3SUnbsTo +LvM1fR2PQt28Gw55FuNXF9PWiRodgoHb8WkAt/QLCBGyUSvEYuJwrePbigFCVhO2 +2e6SWPvycfx1F9gcMe560rFBMgcg4LCgTW7SoMPGXj8zuaUgb5sQsNpPcd1nQ6og +jy7ItQOlNApwL+lpDTwSWC6rybhHvvmldhJCKAi1fUc1rdi7W1la8S/xSk/UkxHI ++l2ebo9Jhcx7b4gKzohy/pINLJo/jrxqXs//Po6bmhQxAUB+u4BpX3zwa3ngLgcP +K7SWgd/sKA6vmIDPuGzT9SekBhW38gM0ePZ9Gt6vfiLNpIauVSAUe2sWn0m4qYDk +GWWxFK/3/AowUWQ5yPON +=VeJb -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/util-linux-2.21.1.ebuild b/sys-apps/util-linux/util-linux-2.21.1.ebuild index 1ca4e407b69a..d584687927bc 100644 --- a/sys-apps/util-linux/util-linux-2.21.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.21.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v 1.1 2012/03/30 18:53:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v 1.2 2012/03/30 20:04:16 vapier Exp $ EAPI="3" @@ -68,6 +68,12 @@ lfs_fallocate_test() { src_configure() { lfs_fallocate_test + if tc-is-cross-compiler ; then + # newer util-linux has this fixed in the configure script already + [[ ${PV} != 2.21* ]] && die + export scanf_cv_alloc_modifier=no + [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms + fi econf \ --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ diff --git a/sys-apps/util-linux/util-linux-2.21.ebuild b/sys-apps/util-linux/util-linux-2.21.ebuild index ef5255468054..4c259ba8a813 100644 --- a/sys-apps/util-linux/util-linux-2.21.ebuild +++ b/sys-apps/util-linux/util-linux-2.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.1 2012/02/24 16:35:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.2 2012/03/30 20:04:16 vapier Exp $ EAPI="3" @@ -68,6 +68,12 @@ lfs_fallocate_test() { src_configure() { lfs_fallocate_test + if tc-is-cross-compiler ; then + # newer util-linux has this fixed in the configure script already + [[ ${PV} != 2.21* ]] && die + export scanf_cv_alloc_modifier=no + [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms + fi econf \ --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ |