diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-07-28 11:09:03 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-07-28 11:09:03 +0000 |
| commit | 43494b83a5427948bdb8dcf501db49aa8c4a6123 (patch) | |
| tree | 3d589591502378b2a0970b6b9642e6efdd7109bd /app-text | |
| parent | sys-kernel/aufs-sources: Bump to latest genpatches (diff) | |
| download | historical-43494b83a5427948bdb8dcf501db49aa8c4a6123.tar.gz historical-43494b83a5427948bdb8dcf501db49aa8c4a6123.tar.bz2 historical-43494b83a5427948bdb8dcf501db49aa8c4a6123.zip | |
Fix compilation on non-glibc platforms, bug #433972
Package-Manager: portage-2.2.01.22124-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/tree/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/tree/Manifest | 12 | ||||
| -rw-r--r-- | app-text/tree/tree-1.6.0-r1.ebuild | 11 |
3 files changed, 17 insertions, 11 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/Manifest b/app-text/tree/Manifest index 41fdc7ef9fdb..6d518bfacd78 100644 --- a/app-text/tree/Manifest +++ b/app-text/tree/Manifest @@ -3,13 +3,13 @@ Hash: SHA256 AUX tree.bashcomp 958 SHA256 38a958c745e76fef4265f22f33504efe356a2b17405abeb22519f94321d4749c SHA512 7d1848cd8aed3d048a63a46334deeb22e7cfd538d24c330cb4623eaaf865fda7b10876f0e798f30ad77bacbd2fc02d7f103a36e16235ca5a077a876ae18daf45 WHIRLPOOL 67a1e3c583a79f398aaa31b3b3a202d569554f7833263012d0a6518e9854e01c03bd478ddc463ae10f582dbd44379eaf8e58b84c53061d716e0df154ab5d31d7 DIST tree-1.6.0.tgz 42706 SHA256 4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591 SHA512 2a72de62b14f194dd4902901facbf44551d6fa6a5f00bb5461ee2c99de277744d8c8032d931513a9f339bfbd98f86bf20acb64b8ea684a1e90544a242272010f WHIRLPOOL df02831a356f361fea0e0c028fdd421bf89ac1388c75451ca720b0ad1a2bf796e06689086d13dd5ac92e1309ca334243a7ea4d1a522ad199936096a85d3e9227 -EBUILD tree-1.6.0-r1.ebuild 1082 SHA256 438dfdcc724b41ec3d7a4610ba756aa082867796a48f568d873c9f76de559026 SHA512 78a380b991733fb57c7df5a92b76cb129a1990ef427f3321ab1787b5e939bc8ff809e55b98a682bcb1d4133ca093406cac2cc71c09b45f900e0a3aee6157fe3d WHIRLPOOL bc62735ae0c8b2e633d6c02fb59c1e7338289ab072867c2e5b9ed6204b7be6bdc549208970d8d6f09ca8f7111f6e02abf8f2dbac4d9f3a60715799a7d02c581d -MISC ChangeLog 11237 SHA256 0117b4f74a739b9830251f8e45091f9702be11320103ef0dea34ca7b0c164ed6 SHA512 02c0719aea97466f3c89e41926a47aa55100967c044812eca6e3e6b7a9f9ecc563ae512da846274a91da8e81cec8c176c4cce8501fdce4f158bca26132682872 WHIRLPOOL d7bf313955401bc59cd72b2e10c320a9dbd3f247540248d174fbd0d8bd43e5157908fb4d331ffbd9d6de5888354676be619892af0882ba18458b14b73d8d3138 +EBUILD tree-1.6.0-r1.ebuild 1187 SHA256 c71a8150d2265d939a7af3bc8af85e29c05cb08420bc9e632250ce11d16100eb SHA512 05070b531a3f569d250a92b5a15e977dedef8515c7884e6e490334b361410a85202521b005c850eefd6ea431b09796018e5519d91ce6e2c82010d822d567555f WHIRLPOOL aa62604320e9cdfb868d1ba0a185de6480005641880b220e0811672cb889dae3a3378b351dccc0875388f61a6b3638a8d42e89e55404fd78adeb77d599aa6b5f +MISC ChangeLog 11368 SHA256 3a138e8fbb91c3d91f9b81d1b0f0df11a90ac460ee5096c0759af1216ec106aa SHA512 b35b2cd551d46312c54d53eb706036114b04fffd1af71d913f26db206298c977f28217e55a82af8a27e550caf634e76ed128afa147bc7274b37efe3bee7caf97 WHIRLPOOL 79a9ab7caf4cffe059320f034cac231bbcfbe0ad185e8a0f8f7eb485234d7979e728be61e664cd744a195bc1cb9b1b1c5186acecb587adcc397a34703d2d4df5 MISC metadata.xml 244 SHA256 41220ab3f22cf0e50bcb5abb783fe559de379413a148334adab505ea062d1a73 SHA512 4a86b58648cd3625603de28c2c0d75902533a9abc2cf8972a4c4862049869f0048841920bc610fe8a020a776fef1122285dabd94055a145cff710af11a39747a WHIRLPOOL cf153dc9a7c17db8d947b92fbc0e05fb997be1957b4164692d78d02a4e34333ad79f3addfc928eafea551b13bd87576b6409c9e1db0433f25939c4c43be1c16f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (SunOS) -iEYEAREIAAYFAlEL1tsACgkQgAnW8HDreRaffwCfdTZv7X0T65z2G+JDdA3MQCbd -+PsAn0SahbwfaWlEKUpIbNfNVzJX07BM -=m0MQ +iEYEAREIAAYFAlH0+8wACgkQX3X2B8XHTokX0gCfeSFDywsJfGq1aLbnDCkmUhLT +frgAn3TkQ0LYJmGjthYB0pX2lDPRJ2vp +=sOMb -----END PGP SIGNATURE----- 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() { |