diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-05-09 11:21:27 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-05-09 11:21:27 +0000 |
| commit | c4ee9217c9d6606ca355a7a3f9f477214bc486a1 (patch) | |
| tree | 1f99385dd79fa71a242a3bce565a4f11da3d20bf /sci-libs/torch | |
| parent | Pruned old ebuilds, changed describtion. (diff) | |
| download | gentoo-2-c4ee9217c9d6606ca355a7a3f9f477214bc486a1.tar.gz gentoo-2-c4ee9217c9d6606ca355a7a3f9f477214bc486a1.tar.bz2 gentoo-2-c4ee9217c9d6606ca355a7a3f9f477214bc486a1.zip | |
Don't add -malign-double on amd64, keyworded ~amd64.
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'sci-libs/torch')
| -rw-r--r-- | sci-libs/torch/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/torch/Manifest | 14 | ||||
| -rw-r--r-- | sci-libs/torch/torch-3.ebuild | 14 |
3 files changed, 15 insertions, 20 deletions
diff --git a/sci-libs/torch/ChangeLog b/sci-libs/torch/ChangeLog index 0461589f94aa..ec37bd671686 100644 --- a/sci-libs/torch/ChangeLog +++ b/sci-libs/torch/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/torch -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/torch/ChangeLog,v 1.2 2004/12/29 10:10:59 swegener Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/torch/ChangeLog,v 1.3 2005/05/09 11:21:27 herbs Exp $ + + 09 May 2005; Herbie Hopkins <herbs@gentoo.org> torch-3.ebuild: + Don't add -malign-double on amd64, keyworded ~amd64. *torch-3 (28 Dec 2004) diff --git a/sci-libs/torch/Manifest b/sci-libs/torch/Manifest index dd8606895a13..f20852e93721 100644 --- a/sci-libs/torch/Manifest +++ b/sci-libs/torch/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 2f0660761deb097e79387ace1d5b0346 ChangeLog 597 -MD5 e9b62c17ec2d94d1639353563f5b9183 torch-3.ebuild 1933 +MD5 38fdea42b270b930f2980dfce76c2487 ChangeLog 718 +MD5 abcccef07aee9e38f3b1bbdc11ad4e3b torch-3.ebuild 2050 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 MD5 b783f0f266b5452761370caf0b78e7f3 files/digest-torch-3 117 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFB0oK5I1lqEGTUzyQRAlknAKDSYrgMhwJf/E8hzUNBCwQ4hzWT6gCgrJRC -sjzhrmiYTpqwbL+eeY7rQg8= -=PjzA ------END PGP SIGNATURE----- diff --git a/sci-libs/torch/torch-3.ebuild b/sci-libs/torch/torch-3.ebuild index 7266834846b9..582425824a99 100644 --- a/sci-libs/torch/torch-3.ebuild +++ b/sci-libs/torch/torch-3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/torch/torch-3.ebuild,v 1.1 2004/12/29 00:44:27 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/torch/torch-3.ebuild,v 1.2 2005/05/09 11:21:27 herbs Exp $ -inherit toolchain-funcs +inherit toolchain-funcs multilib DESCRIPTION="machine-learning library, written in simple C++" HOMEPAGE="http://www.torch.ch/" @@ -11,7 +11,7 @@ SRC_URI="http://www.torch.ch/archives/Torch${PV}src.tgz LICENSE="BSD" SLOT="0" -KEYWORDS="x86" +KEYWORDS="x86 ~amd64" IUSE="doc debug" DEPEND="virtual/libc" @@ -23,11 +23,13 @@ torch_packages="convolutions datasets decoder distributions gradients kernels ma src_compile() { local shalldebug="OPT" use debug && shalldebug="DBG" + # -malign-double makes no sense on a 64-bit arch + use amd64 || extraflags="-malign-double" cp config/Makefile_options_Linux . sed -i \ -e "s:^PACKAGES.*:PACKAGES = ${torch_packages}:" \ -e "s:^DEBUG.*:DEBUG = ${shalldebug}:" \ - -e "s:^CFLAGS_OPT_FLOAT.*:CFLAGS_OPT_FLOAT = -Wall ${CFLAGS} -ffast-math -malign-double:" \ + -e "s:^CFLAGS_OPT_FLOAT.*:CFLAGS_OPT_FLOAT = -Wall ${CFLAGS} -ffast-math ${extraflags}:" \ Makefile_options_Linux make depend @@ -43,7 +45,7 @@ src_install() { done # prepare the options Makefile sed -i \ - -e 's:^LIBS_DIR.*:LIBS_DIR=/usr/lib:' \ + -e "s:^LIBS_DIR.*:LIBS_DIR=/usr/$(get_libdir):" \ -e 's|^INCS := .*|INCS := -I /usr/include/torch $(MYINCS)|' \ -e '/^INCS +=/c\' \ Makefile_options_Linux |