diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-07-28 11:08:58 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-07-28 11:08:58 +0000 |
| commit | 31b24f7d56ddba7e28d110f91f18c48e7d6e4438 (patch) | |
| tree | 255c6f29888f2ac75deb3164b3f20520d0df3425 /app-text | |
| parent | sys-kernel/aufs-sources: Bump to latest genpatches (diff) | |
| download | gentoo-2-31b24f7d56ddba7e28d110f91f18c48e7d6e4438.tar.gz gentoo-2-31b24f7d56ddba7e28d110f91f18c48e7d6e4438.tar.bz2 gentoo-2-31b24f7d56ddba7e28d110f91f18c48e7d6e4438.zip | |
Fix compilation on non-glibc platforms, bug #433972
(Portage version: 2.2.01.22124-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/tree/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/tree/tree-1.6.0-r1.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app-text/tree/ChangeLog b/app-text/tree/ChangeLog index 7374b1bdef62..91970fa48214 100644 --- a/app-text/tree/ChangeLog +++ b/app-text/tree/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/tree # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.105 2013/02/01 14:53:14 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.106 2013/07/28 11:08:58 grobian Exp $ + + 28 Jul 2013; Fabian Groffen <grobian@gentoo.org> tree-1.6.0-r1.ebuild: + Fix compilation on non-glibc platforms, bug #433972 01 Feb 2013; Justin Lecher <jlec@gentoo.org> tree-1.6.0-r1.ebuild, metadata.xml: diff --git a/app-text/tree/tree-1.6.0-r1.ebuild b/app-text/tree/tree-1.6.0-r1.ebuild index ff90a7802783..02b2ed452988 100644 --- a/app-text/tree/tree-1.6.0-r1.ebuild +++ b/app-text/tree/tree-1.6.0-r1.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/app-text/tree/tree-1.6.0-r1.ebuild,v 1.12 2013/02/01 14:53:14 jlec Exp $ +# $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 $ EAPI=4 inherit toolchain-funcs flag-o-matic bash-completion-r1 @@ -11,7 +11,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" RDEPEND="!=sci-biology/meme-4.8.1" @@ -22,6 +22,10 @@ src_prepare() { -e 's:LINUX:__linux__:' tree.c \ || die "sed failed" mv doc/tree.1.fr doc/tree.fr.1 + if use !elibc_glibc ; then + # 433972, also previously done only for elibc_uclibc + sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die + fi } src_compile() { @@ -29,8 +33,7 @@ src_compile() { emake \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - XOBJS="$(use elibc_uclibc && echo strverscmp.o)" + LDFLAGS="${LDFLAGS}" } src_install() { |