| 1 |
grobian 13/07/28 11:08:59 |
| 2 |
|
| 3 |
Modified: tree-1.6.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix compilation on non-glibc platforms, bug #433972 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.22124-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.13 app-text/tree/tree-1.6.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild?rev=1.13&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild?rev=1.13&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild?r1=1.12&r2=1.13 |
| 15 |
|
| 16 |
Index: tree-1.6.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v |
| 19 |
retrieving revision 1.12 |
| 20 |
retrieving revision 1.13 |
| 21 |
diff -u -r1.12 -r1.13 |
| 22 |
--- tree-1.6.0-r1.ebuild 1 Feb 2013 14:53:14 -0000 1.12 |
| 23 |
+++ tree-1.6.0-r1.ebuild 28 Jul 2013 11:08:58 -0000 1.13 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v 1.12 2013/02/01 14:53:14 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v 1.13 2013/07/28 11:08:58 grobian Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
inherit toolchain-funcs flag-o-matic bash-completion-r1 |
| 32 |
@@ -11,7 +11,7 @@ |
| 33 |
|
| 34 |
LICENSE="GPL-2" |
| 35 |
SLOT="0" |
| 36 |
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" |
| 37 |
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
| 38 |
IUSE="" |
| 39 |
|
| 40 |
RDEPEND="!=sci-biology/meme-4.8.1" |
| 41 |
@@ -22,6 +22,10 @@ |
| 42 |
-e 's:LINUX:__linux__:' tree.c \ |
| 43 |
|| die "sed failed" |
| 44 |
mv doc/tree.1.fr doc/tree.fr.1 |
| 45 |
+ if use !elibc_glibc ; then |
| 46 |
+ # 433972, also previously done only for elibc_uclibc |
| 47 |
+ sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die |
| 48 |
+ fi |
| 49 |
} |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
@@ -29,8 +33,7 @@ |
| 53 |
emake \ |
| 54 |
CC="$(tc-getCC)" \ |
| 55 |
CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
| 56 |
- LDFLAGS="${LDFLAGS}" \ |
| 57 |
- XOBJS="$(use elibc_uclibc && echo strverscmp.o)" |
| 58 |
+ LDFLAGS="${LDFLAGS}" |
| 59 |
} |
| 60 |
|
| 61 |
src_install() { |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.106 app-text/tree/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/ChangeLog?rev=1.106&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/ChangeLog?rev=1.106&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/ChangeLog?r1=1.105&r2=1.106 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v |
| 74 |
retrieving revision 1.105 |
| 75 |
retrieving revision 1.106 |
| 76 |
diff -u -r1.105 -r1.106 |
| 77 |
--- ChangeLog 1 Feb 2013 14:53:14 -0000 1.105 |
| 78 |
+++ ChangeLog 28 Jul 2013 11:08:58 -0000 1.106 |
| 79 |
@@ -1,6 +1,9 @@ |
| 80 |
# ChangeLog for app-text/tree |
| 81 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.105 2013/02/01 14:53:14 jlec Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.106 2013/07/28 11:08:58 grobian Exp $ |
| 84 |
+ |
| 85 |
+ 28 Jul 2013; Fabian Groffen <grobian@g.o> tree-1.6.0-r1.ebuild: |
| 86 |
+ Fix compilation on non-glibc platforms, bug #433972 |
| 87 |
|
| 88 |
01 Feb 2013; Justin Lecher <jlec@g.o> tree-1.6.0-r1.ebuild, |
| 89 |
metadata.xml: |
Archives