| 1 |
vapier 12/03/30 20:04:16 |
| 2 |
|
| 3 |
Modified: util-linux-2.21.1.ebuild ChangeLog |
| 4 |
util-linux-2.21.ebuild |
| 5 |
Log: |
| 6 |
Add cross-compiling fixes to match upstream. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha95/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 sys-apps/util-linux/util-linux-2.21.1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: util-linux-2.21.1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- util-linux-2.21.1.ebuild 30 Mar 2012 18:53:06 -0000 1.1 |
| 24 |
+++ util-linux-2.21.1.ebuild 30 Mar 2012 20:04:16 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI="3" |
| 32 |
|
| 33 |
@@ -68,6 +68,12 @@ |
| 34 |
|
| 35 |
src_configure() { |
| 36 |
lfs_fallocate_test |
| 37 |
+ if tc-is-cross-compiler ; then |
| 38 |
+ # newer util-linux has this fixed in the configure script already |
| 39 |
+ [[ ${PV} != 2.21* ]] && die |
| 40 |
+ export scanf_cv_alloc_modifier=no |
| 41 |
+ [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms |
| 42 |
+ fi |
| 43 |
econf \ |
| 44 |
--enable-fs-paths-extra=/usr/sbin \ |
| 45 |
$(use_enable nls) \ |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.375 sys-apps/util-linux/ChangeLog |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.375&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.375&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?r1=1.374&r2=1.375 |
| 54 |
|
| 55 |
Index: ChangeLog |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v |
| 58 |
retrieving revision 1.374 |
| 59 |
retrieving revision 1.375 |
| 60 |
diff -u -r1.374 -r1.375 |
| 61 |
--- ChangeLog 30 Mar 2012 18:53:06 -0000 1.374 |
| 62 |
+++ ChangeLog 30 Mar 2012 20:04:16 -0000 1.375 |
| 63 |
@@ -1,6 +1,10 @@ |
| 64 |
# ChangeLog for sys-apps/util-linux |
| 65 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.374 2012/03/30 18:53:06 vapier Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.375 2012/03/30 20:04:16 vapier Exp $ |
| 68 |
+ |
| 69 |
+ 30 Mar 2012; Mike Frysinger <vapier@g.o> util-linux-2.21.ebuild, |
| 70 |
+ util-linux-2.21.1.ebuild: |
| 71 |
+ Add cross-compiling fixes to match upstream. |
| 72 |
|
| 73 |
*util-linux-2.21.1 (30 Mar 2012) |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.2 sys-apps/util-linux/util-linux-2.21.ebuild |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild?rev=1.2&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild?rev=1.2&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild?r1=1.1&r2=1.2 |
| 83 |
|
| 84 |
Index: util-linux-2.21.ebuild |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v |
| 87 |
retrieving revision 1.1 |
| 88 |
retrieving revision 1.2 |
| 89 |
diff -u -r1.1 -r1.2 |
| 90 |
--- util-linux-2.21.ebuild 24 Feb 2012 16:35:39 -0000 1.1 |
| 91 |
+++ util-linux-2.21.ebuild 30 Mar 2012 20:04:16 -0000 1.2 |
| 92 |
@@ -1,6 +1,6 @@ |
| 93 |
# Copyright 1999-2012 Gentoo Foundation |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
-# $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 $ |
| 96 |
+# $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 $ |
| 97 |
|
| 98 |
EAPI="3" |
| 99 |
|
| 100 |
@@ -68,6 +68,12 @@ |
| 101 |
|
| 102 |
src_configure() { |
| 103 |
lfs_fallocate_test |
| 104 |
+ if tc-is-cross-compiler ; then |
| 105 |
+ # newer util-linux has this fixed in the configure script already |
| 106 |
+ [[ ${PV} != 2.21* ]] && die |
| 107 |
+ export scanf_cv_alloc_modifier=no |
| 108 |
+ [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms |
| 109 |
+ fi |
| 110 |
econf \ |
| 111 |
--enable-fs-paths-extra=/usr/sbin \ |
| 112 |
$(use_enable nls) \ |
Archives