public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-lang/terra/
@ 2015-04-24  0:20 Christoph Junghans
  0 siblings, 0 replies; 4+ messages in thread
From: Christoph Junghans @ 2015-04-24  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b35c23f20c86094faac92f2420fe2727d21a4f35
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 00:19:45 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 00:20:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b35c23f2

initial commit

thx to @zdevito for the nice intro to it

Package-Manager: portage-2.2.18

 dev-lang/terra/ChangeLog               |  9 +++++++++
 dev-lang/terra/metadata.xml            |  8 ++++++++
 dev-lang/terra/terra-2015.03.12.ebuild | 36 ++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/dev-lang/terra/ChangeLog b/dev-lang/terra/ChangeLog
new file mode 100644
index 0000000..32af2a2
--- /dev/null
+++ b/dev-lang/terra/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-lang/terra
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*terra-2015.03.12 (24 Apr 2015)
+
+  24 Apr 2015; Christoph Junghans <ottxor@gentoo.org> +metadata.xml,
+  +terra-2015.03.12.ebuild:
+  initial commit  thx to @zdevito for the nice intro to it

diff --git a/dev-lang/terra/metadata.xml b/dev-lang/terra/metadata.xml
new file mode 100644
index 0000000..745b9e1
--- /dev/null
+++ b/dev-lang/terra/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/dev-lang/terra/terra-2015.03.12.ebuild b/dev-lang/terra/terra-2015.03.12.ebuild
new file mode 100644
index 0000000..5faa4cc
--- /dev/null
+++ b/dev-lang/terra/terra-2015.03.12.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+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"
+IUSE="test"
+
+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
+	cd include || die
+	doheader terra.h *.t
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/terra/
@ 2017-03-26 14:45 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2017-03-26 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     40f779503260e9e625ed064c2220c19beae24d82
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 08:49:08 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 08:49:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=40f77950

dev-lang/terra: Add missing SLOT operator

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-lang/terra/terra-2015.03.12.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-lang/terra/terra-2015.03.12.ebuild b/dev-lang/terra/terra-2015.03.12.ebuild
index 4e0180642..ca3bb80df 100644
--- a/dev-lang/terra/terra-2015.03.12.ebuild
+++ b/dev-lang/terra/terra-2015.03.12.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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
+SRC_URI="
+	https://github.com/zdevito/terra/archive/release-${PV//./-}.tar.gz -> ${P}.tar.gz
 	http://luajit.org/download/${LUAJIT}"
 
 LICENSE="MIT"
@@ -15,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-DEPEND="sys-devel/clang
+DEPEND="
+	sys-devel/clang:0=
 	dev-lang/luajit:2"
 RDEPEND="${DEPEND}"
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/terra/
@ 2018-06-21 19:47 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2018-06-21 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     7157aeaf5196b89db42b5ad32a1f5f8ea5b30c56
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 18:50:00 2018 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:50:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7157aeaf

dev-lang/terra: Fix deps

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/terra/terra-2015.03.12.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-lang/terra/terra-2015.03.12.ebuild b/dev-lang/terra/terra-2015.03.12.ebuild
index ca3bb80df..99421ed5d 100644
--- a/dev-lang/terra/terra-2015.03.12.ebuild
+++ b/dev-lang/terra/terra-2015.03.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 DEPEND="
-	sys-devel/clang:0=
+	sys-devel/clang:=
 	dev-lang/luajit:2"
 RDEPEND="${DEPEND}"
 
@@ -32,6 +32,5 @@ src_install() {
 	dobin terra
 	dolib.so libterra.so
 	dodoc README.md
-	cd include || die
-	doheader terra.h *.t
+	doheader include/{terra.h,*.t}
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/terra/
@ 2021-02-13 10:27 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-02-13 10:27 UTC (permalink / raw
  To: gentoo-commits

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}
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-02-13 10:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-26 14:45 [gentoo-commits] proj/sci:master commit in: dev-lang/terra/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2021-02-13 10:27 Andrew Ammerlaan
2018-06-21 19:47 Justin Lecher
2015-04-24  0:20 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox