2 files changed, 24 insertions(+), 112 deletions(-)

D testing/sagemath/APKBUILD
M testing/vlang/APKBUILD

@@ 1,81 0,0 @@
-# Maintainer: Jakob Meier <comcloudway@ccw.icu>
-
-pkgname=sagemath
-pkgver=9.8
-pkgrel=0
-pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
-arch="x86_64"
-url='http://www.sagemath.org'
-license="GPL"
-depends="python3 imagemagick texlive-full"
-subpackages="$pkgname-dev $pkgname-doc"
-# not all of these are required,
-# but using the alpine prebuild binaries safes on build-time
-# BUG: it seems as if the process keeps hanging
-makedepends="
-autoconf
-automake
-bc
-binutils
-curl-dev
-cddlib cddlib-dev
-ecl ecl-dev
-flint flint-dev
-gc-dev gc
-gcc
-gengetopt gengetopt-dev
-gf2x gf2x-dev
-gfortran
-libgivaro-dev
-glpk glpk-dev
-gsl gsl-dev
-imagemagick
-iml iml-dev
-libatomic_ops libatomic_ops-dev
-libtool
-m4
-libm4ri-dev
-libm4rie-dev
-make
-mpc
-mpfr mpfr-dev
-openblas openblas-dev
-pari pari-dev
-pcre pcre-dev
-perl
-primecount primecount-dev
-primesieve primesieve-dev
-python3
-qhull qhull-dev
-readline readline-dev
-R R-dev R-mathlib
-suitesparse suitesparse-dev
-tar
-which
-zeromq zeromq-dev
-"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/refs/tags/$pkgver.beta1.tar.gz"
-builddir="$srcdir/sage-$pkgver.beta1"
-
-prepare(){
-  default_prepare
-
-  make configure
-
-  ./configure
-}
-
-check() {
-  make check
-}
-
-build() {
-  make -j8
-}
-
-package() {
-  install -Dm755 sage $pkgdir/usr/bin/
-}
-sha512sums="
-2c7270fe4c70b529a3a58cb39b859d9e6960d0793c7a68317f084d9aca4aea295a60a41ef6d3ee32ee22a7b849aa55d121fc6be5be0dba50fdc69d61caef37c1  sagemath-9.8.tar.gz
-"

@@ 1,47 1,42 @@
 # Contributor: Jakob Meier <comcloudway@ccw.icu>
 # Maintainer: Jakob Meier <comcloudway@ccw.icu>
+
+_v_commit_sha=d1f57ead713c8e5254d8cef22991e6409dc1f06b
+_vc_commit_sha=1f7f0244f352d41122bb306446d98ae3de4e6b02
+
 pkgname=vlang
-pkgver=0.3.2
+pkgver=0.3.3
 pkgrel=0
 pkgdesc="Simple, fast, safe, compiled language for developing maintainable software."
 url="https://vlang.io"
-arch="all"
+arch="x86_64 aarch64"
 license="MIT"
-depends="gc-dev"
-makedepends="tcc clang libexecinfo"
+depends=""
+makedepends="gcc gc-dev"
 checkdepends=""
 subpackages=""
-source="vlang-$pkgver.tar.gz::https://github.com/vlang/v/archive/refs/tags/$pkgver.tar.gz
-vc.c::https://github.com/vlang/vc/raw/master/v.c
-tcc.tar.gz::https://github.com/vlang/tccbin/archive/refs/heads/master.tar.gz
-explicit_cast.patch"
-builddir="$srcdir/v-$pkgver"
+source="
+v-$pkgver.zip::https://github.com/vlang/v/archive/$_v_commit_sha.zip
+vc-$pkgver.zip::https://github.com/vlang/vc/archive/$_vc_commit_sha.zip"
+builddir="$srcdir/v-$_v_commit_sha"
 
 build() {
-	mkdir vc;
-	cp $srcdir/vc.c vc/v.c
-	
-	cp $srcdir/tccbin-master -r thirdparty/tcc
-	
-	# disable `v up`
-	# as seen in AUR package
-    echo "println('v up is disabled')" > cmd/tools/vup.v
+	mv "../vc-$_vc_commit_sha" ./vc
 
 	# cannot rely on prebuild tcc libgc.a
 	# needs gc-dev
+	mkdir -p thirdparty/tcc/lib
 	ln -s /usr/lib/libgc.a thirdparty/tcc/lib/libgc.a
 
-	echo building v using c
-	tcc -std=gnu11 -w -o v1 vc/v.c -bt10 -lm -lexecinfo -lpthread
-	echo building stage 2
-	./v1 -no-parallel -o v2 cmd/v
-	echo building v staging
-	./v2 -o v -cc tcc cmd/v
+	#ln -s /usr/bin/tcc thirdparty/tcc/tcc.exe
 
-	echo cleaning old files
-	rm -rf v1 v2 vc/
-
-	echo finalizing install
+	echo building v from c
+	cc -std=gnu11 -w -o v1 vc/v.c -lm -lpthread 
+	echo building stage 2
+	./v1 -no-parallel -o v2 -prod cmd/v
+	echo building staging version
+	./v2 -o v -prod cmd/v
+	rm -rf v1 v2
 	./v run ./cmd/tools/detect_tcc.v
 
 	echo building tools


@@ 70,8 65,6 @@ package() {
     touch $pkgdir/usr/lib/vlang/cmd/tools/.disable_autorecompilation
 }
 sha512sums="
-80fbdb05e7859c45f803a0a42bd313d988671af3b624e237ead10478485fd2a7ec849f9c77cbe7e08135c1611cbfdbd62345cf2db4c8b1e1fe22f7549de3b244  vlang-0.3.3.tar.gz
-c8714a149d03e73e909dd298c1aae6a34190acc64d4988fb388dbd03d2d58882ca1bc09c0a4a85557ca511306426d9aae356506d2ee118caf08e0a4899cfe089  vc.c
-ee9f916092bafd1dfc782354291443261fd33bad7fe9663422211f36cb75b59b54f85a5b8a68ce5d7c222ef13cbb3379434b13e4af3f89a78fdadbab9425a22b  tcc.tar.gz
-474cfbe8952640d49a80a8278dcedfb0a7ecca01ea83aa5acb7514530b8ac5efa08ecbd9d572608069855c1936e1de51fbbb11b7fd262980612269d4979a89fe  explicit_cast.patch
+81481854928f31c2cfc3c49acaa9b579712bbfa66cf2a31c5a2df2af47511b9fb62576844cdf1bcf1512b8cea58d4d637ad44110d2a73a0b55b6f41efa984b25  v-0.3.3.zip
+8eab18f5d01a417c0cdbfd995fdd570ca92fd2ce245eda08762de0021487fff1c6084c91fcc7fcdfd37aa618d2f71c0222df6f434b014fe3b71d284795762b0b  vc-0.3.3.zip
 "