commit: da49c265e320a1fa1af3d04461825f7406cfc79f
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Feb 13 10:27:43 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Feb 13 10:27:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=da49c265
dev-lang/terra: depend on lua correctly
This fails to find llvm so no keywords yet
Upstream says to just set DCMAKE_PREFIX_PATH but
it isn't working for some reason
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
dev-lang/terra/metadata.xml | 3 +++
dev-lang/terra/terra-1.0.0_beta2.ebuild | 46 +++++++++++++++++++++++++++++++++
dev-lang/terra/terra-2015.03.12.ebuild | 35 -------------------------
3 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/dev-lang/terra/metadata.xml b/dev-lang/terra/metadata.xml
index 684a4dc29..5f4b89aee 100644
--- a/dev-lang/terra/metadata.xml
+++ b/dev-lang/terra/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="github">zdevito/terra</remote-id>
</upstream>
+ <use>
+ <flag name="cuda">Enable CUDA</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-lang/terra/terra-1.0.0_beta2.ebuild
b/dev-lang/terra/terra-1.0.0_beta2.ebuild
new file mode 100644
index 000000000..d9b087cf9
--- /dev/null
+++ b/dev-lang/terra/terra-1.0.0_beta2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV//_/-}"
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake llvm lua-single
+
+DESCRIPTION="A low-level counterpart to Lua"
+HOMEPAGE="http://terralang.org/";
+SRC_URI="https://github.com/zdevito/terra/archive/release-${MY_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="cuda"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="${LUA_DEPS}
+ cuda? ( dev-util/nvidia-cuda-toolkit )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-devel/clang:*
+ sys-devel/llvm:=
+ dev-lang/luajit:=
+"
+
+S="${WORKDIR}/${PN}-release-${MY_PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
+ -DTERRA_ENABLE_CUDA="$(usex cuda ON OFF)"
+ -DTERRA_STATIC_LINK_LLVM=OFF
+ -DTERRA_SLIB_INCLUDE_LLVM=OFF
+ -DTERRA_STATIC_LINK_LUAJIT=OFF
+ -DTERRA_SLIB_INCLUDE_LUAJIT=OFF
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-lang/terra/terra-2015.03.12.ebuild
b/dev-lang/terra/terra-2015.03.12.ebuild
deleted file mode 100644
index 789db273c..000000000
--- a/dev-lang/terra/terra-2015.03.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A low-level counterpart to Lua"
-HOMEPAGE="http://terralang.org/";
-#cannot be unbundled easily, because needs to compiled with clang
-LUAJIT="LuaJIT-2.0.3.tar.gz"
-SRC_URI="
- https://github.com/zdevito/terra/archive/release-${PV//./-}.tar.gz ->
${P}.tar.gz
- http://luajit.org/download/${LUAJIT}";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- sys-devel/clang:=
- dev-lang/luajit:2"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack "${P}.tar.gz"
- mv "${PN}"-* "${S}" || die
- ln -s "${DISTDIR}/${LUAJIT}" "${S}/build" || die
-}
-
-src_install() {
- cd release || die
- dobin terra
- dolib.so libterra.so
- dodoc README.md
- doheader include/{terra.h,*.t}
-}
