r2191.85452cfa

4 files changed, 55 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c906e419df0..2d1dc104cb1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = ion-git
 	pkgdesc = The Ion Shell. Compatible with Redox and Linux. (Git version)
-	pkgver = r1869.9bc52a5
+	pkgver = r2191.85452cfa
 	pkgrel = 1
 	url = https://gitlab.redox-os.org/redox-os/ion
-	install = ion-git.install
+	install = ion.install
 	arch = x86_64
 	arch = i686
 	license = MIT
+	makedepends = cargo
 	makedepends = git
-	makedepends = rust
+	depends = gcc-libs
+	depends = glibc
 	provides = ion
 	conflicts = ion
+	options = !lto
 	source = git+https://gitlab.redox-os.org/redox-os/ion.git
-	sha512sums = SKIP
+	sha256sums = SKIP
 
 pkgname = ion-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 24b7ef651637..dd83b3005a82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,62 @@
-# Maintainer: Luca Weiss <luca (at) z3ntu (dot) xyz>
+# Maintainer:
+# Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
 
-_pkgname=ion
-pkgname=ion-git
-pkgver=r1869.9bc52a5
+_pkgname="ion"
+pkgname="$_pkgname-git"
+pkgver=r2191.85452cfa
 pkgrel=1
 pkgdesc="The Ion Shell. Compatible with Redox and Linux. (Git version)"
-arch=("x86_64" "i686")
 url="https://gitlab.redox-os.org/redox-os/ion"
 license=('MIT')
-makedepends=('git' 'rust')
+arch=("x86_64" "i686")
+
+depends=(
+  'gcc-libs'
+  'glibc'
+)
+makedepends=(
+  'cargo'
+  'git'
+)
+
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-install=ion-git.install
+
+options=('!lto')
+
+install="$_pkgname.install"
+
+_pkgsrc="$_pkgname"
 source=('git+https://gitlab.redox-os.org/redox-os/ion.git')
-sha512sums=('SKIP')
+sha256sums=('SKIP')
+
+_cargo_env() {
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
+}
+
+prepare() {
+  _cargo_env
+
+  cd "$_pkgsrc"
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
 
 pkgver() {
-  cd $_pkgname
+  cd "$_pkgsrc"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd $_pkgname
-  RUSTUP=0 make
+  _cargo_env
+
+  cd "$_pkgsrc"
+  cargo build --frozen --release
 }
 
 package() {
-  cd $_pkgname
-  make install prefix="$pkgdir"/usr
+  _cargo_env
+
+  install -Dm755 "$_pkgsrc/$CARGO_TARGET_DIR/release/ion" -t "$pkgdir/usr/bin/"
+  install -Dm644 "$_pkgsrc/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
diff --git a/ion-git.install b/ion.install
index 5113df6f145e..f9ba7e681383 100644
--- a/ion-git.install
+++ b/ion.install
@@ -9,5 +9,3 @@ post_upgrade() {
 pre_remove() {
   sed -ri '\|^/usr/bin/ion$|d' etc/shells
 }
-
-# vim:set ts=2 sw=2 et: