Date: Friday, September 18, 2020 @ 17:01:57 Author: anatolik Revision: 710701
archrelease: copy trunk to community-x86_64 Added: tinygo/repos/community-x86_64/PKGBUILD (from rev 710700, tinygo/trunk/PKGBUILD) tinygo/repos/community-x86_64/disable_static_llvm.patch (from rev 710700, tinygo/trunk/disable_static_llvm.patch) Deleted: tinygo/repos/community-x86_64/PKGBUILD tinygo/repos/community-x86_64/disable_static_llvm.patch ---------------------------+ PKGBUILD | 132 ++++++++++++++++++++++---------------------- disable_static_llvm.patch | 82 +++++++++++++-------------- 2 files changed, 109 insertions(+), 105 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-09-18 17:01:33 UTC (rev 710700) +++ PKGBUILD 2020-09-18 17:01:57 UTC (rev 710701) @@ -1,64 +0,0 @@ -# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> - -pkgname=tinygo -pkgver=0.14.1 -pkgrel=1 -pkgdesc='Go compiler for small places. Microcontrollers, WebAssembly, and command-line tools. Based on LLVM.' -arch=(x86_64) -url='https://github.com/tinygo-org/tinygo' -license=(BSD) -options=(!strip) -depends=(llvm-libs clang lld) -makedepends=(go llvm git) -# use git as we need to fetch submodules -source=(git+https://github.com/tinygo-org/tinygo#tag=v$pkgver - git+https://github.com/NordicSemiconductor/nrfx - git+https://github.com/ARM-software/CMSIS - git+https://github.com/avr-rust/avr-mcu - git+https://github.com/tinygo-org/cmsis-svd - git+https://github.com/llvm-mirror/compiler-rt - git+https://github.com/CraneStation/wasi-libc - disable_static_llvm.patch) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '2d2229c964480f4939e3794107cff6dded26215c6dae66e33e8f8e606d5a13c4') - -prepare() { - cd tinygo - - git submodule init - git config -f .gitmodules 'submodule.lib/nrfx.url' "$srcdir/nrfx" - git config -f .gitmodules 'submodule.lib/CMSIS.url' "$srcdir/CMSIS" - git config -f .gitmodules 'submodule.lib/avr.url' "$srcdir/avr-mcu" - git config -f .gitmodules 'submodule.lib/cmsis-svd.url' "$srcdir/cmsis-svd" - git config -f .gitmodules 'submodule.lib/compiler-rt.url' "$srcdir/compiler-rt" - git config -f .gitmodules 'submodule.lib/wasi-libc.url' "$srcdir/wasi-libc" - git submodule sync - git submodule update - - patch -p1 < ../disable_static_llvm.patch -} - -build() { - cd tinygo - make build/release -} - -check() { - cd tinygo - # it reqreires a lot of dependencies. todo enable the tests - # make test tinygo-test smoketest -} - -package() { - cd tinygo - - install -d "$pkgdir"/usr/bin "$pkgdir"/usr/lib/tinygo - mv build/release/tinygo/* "$pkgdir"/usr/lib/tinygo - ln -s /usr/lib/tinygo/bin/tinygo "$pkgdir"/usr/bin/tinygo -} Copied: tinygo/repos/community-x86_64/PKGBUILD (from rev 710700, tinygo/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-09-18 17:01:57 UTC (rev 710701) @@ -0,0 +1,68 @@ +# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> + +pkgname=tinygo +pkgver=0.15.0 +pkgrel=1 +pkgdesc='Go compiler for small places. Microcontrollers, WebAssembly, and command-line tools. Based on LLVM.' +arch=(x86_64) +url='https://github.com/tinygo-org/tinygo' +license=(BSD) +options=(!strip) +depends=(llvm-libs clang lld) +makedepends=(go llvm git) +# use git as we need to fetch submodules +source=(git+https://github.com/tinygo-org/tinygo#tag=v$pkgver + git+https://github.com/NordicSemiconductor/nrfx + git+https://github.com/ARM-software/CMSIS + git+https://github.com/avr-rust/avr-mcu + git+https://github.com/tinygo-org/cmsis-svd + git+https://github.com/llvm-mirror/compiler-rt#branch=release_80 + git+https://github.com/CraneStation/wasi-libc + git+https://github.com/keith-packard/picolibc + disable_static_llvm.patch) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '7b97ed67a503b7d36b9318acb55442c6c03ba38f5d15c971c90f59a51dbf41ff') + +prepare() { + cd tinygo + + git submodule init + git config -f .gitmodules 'submodule.lib/nrfx.url' "$srcdir/nrfx" + git config -f .gitmodules 'submodule.lib/CMSIS.url' "$srcdir/CMSIS" + git config -f .gitmodules 'submodule.lib/avr.url' "$srcdir/avr-mcu" + git config -f .gitmodules 'submodule.lib/cmsis-svd.url' "$srcdir/cmsis-svd" + git config -f .gitmodules 'submodule.lib/compiler-rt.url' "$srcdir/compiler-rt" + git config -f .gitmodules 'submodule.lib/wasi-libc.url' "$srcdir/wasi-libc" + git config -f .gitmodules 'submodule.lib/picolibc.url' "$srcdir/picolibc" + + git submodule sync + git submodule update + + patch -p1 < ../disable_static_llvm.patch +} + +build() { + cd tinygo + make build/release +} + +check() { + cd tinygo + # it reqreires a lot of dependencies. todo enable the tests + # make test tinygo-test smoketest +} + +package() { + cd tinygo + + install -d "$pkgdir"/usr/bin "$pkgdir"/usr/lib/tinygo + mv build/release/tinygo/* "$pkgdir"/usr/lib/tinygo + ln -s /usr/lib/tinygo/bin/tinygo "$pkgdir"/usr/bin/tinygo +} Deleted: disable_static_llvm.patch =================================================================== --- disable_static_llvm.patch 2020-09-18 17:01:33 UTC (rev 710700) +++ disable_static_llvm.patch 2020-09-18 17:01:57 UTC (rev 710701) @@ -1,41 +0,0 @@ -commit f095d57e88216f7d7a3211c08923075b80a73a25 -Author: Anatol Pomozov <anatol.pomo...@gmail.com> -Date: Fri Aug 21 08:51:00 2020 -0700 - - Arch linux build changes - -diff --git a/Makefile b/Makefile -index 425a0cf..b0a9e91 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,7 @@ LLD_SRC ?= $(LLVM_PROJECTDIR)/lld - ifneq (, $(shell command -v llvm-build/bin/clang 2> /dev/null)) - CLANG ?= $(abspath llvm-build/bin/clang) - else -- CLANG ?= clang-10 -+ CLANG ?= clang - endif - ifneq (, $(shell command -v llvm-build/bin/llvm-ar 2> /dev/null)) - LLVM_AR ?= $(abspath llvm-build/bin/llvm-ar) -@@ -178,11 +178,10 @@ lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a: - - # Build the Go compiler. - tinygo: -- @if [ ! -f "$(LLVM_BUILDDIR)/bin/llvm-config" ]; then echo "Fetch and build LLVM first by running:"; echo " make llvm-source"; echo " make $(LLVM_BUILDDIR)"; exit 1; fi -- CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags byollvm . -+ CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) . - - test: wasi-libc -- CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -buildmode exe -tags byollvm ./cgo ./compileopts ./interp ./transform . -+ CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -buildmode exe ./cgo ./compileopts ./interp ./transform . - - tinygo-test: - cd tests/tinygotest && tinygo test -@@ -361,7 +360,6 @@ build/release: tinygo gen-device wasi-libc - @mkdir -p build/release/tinygo/pkg/armv7em-none-eabi - @echo copying source files - @cp -p build/tinygo$(EXE) build/release/tinygo/bin -- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include - @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS - @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS - @cp -rp lib/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt/lib Copied: tinygo/repos/community-x86_64/disable_static_llvm.patch (from rev 710700, tinygo/trunk/disable_static_llvm.patch) =================================================================== --- disable_static_llvm.patch (rev 0) +++ disable_static_llvm.patch 2020-09-18 17:01:57 UTC (rev 710701) @@ -0,0 +1,41 @@ +commit c790eb9c8395b996267677fa0fdb8914b4426d16 +Author: Anatol Pomozov <anatol.pomo...@gmail.com> +Date: Fri Aug 21 08:51:00 2020 -0700 + + Arch linux build changes + +diff --git a/Makefile b/Makefile +index e59799c..569108e 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ LLD_SRC ?= $(LLVM_PROJECTDIR)/lld + ifneq (, $(shell command -v llvm-build/bin/clang 2> /dev/null)) + CLANG ?= $(abspath llvm-build/bin/clang) + else +- CLANG ?= clang-10 ++ CLANG ?= clang + endif + ifneq (, $(shell command -v llvm-build/bin/llvm-ar 2> /dev/null)) + LLVM_AR ?= $(abspath llvm-build/bin/llvm-ar) +@@ -184,11 +184,10 @@ lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a: + + # Build the Go compiler. + tinygo: +- @if [ ! -f "$(LLVM_BUILDDIR)/bin/llvm-config" ]; then echo "Fetch and build LLVM first by running:"; echo " make llvm-source"; echo " make $(LLVM_BUILDDIR)"; exit 1; fi +- CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags byollvm -ldflags="-X main.gitSha1=`git rev-parse --short HEAD`" . ++ CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) -ldflags="-X main.gitSha1=`git rev-parse --short HEAD`" . + + test: wasi-libc +- CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -buildmode exe -tags byollvm ./cgo ./compileopts ./interp ./transform . ++ CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -buildmode exe ./cgo ./compileopts ./interp ./transform . + + # Test known-working standard library packages. + # TODO: do this in one command, parallelize, and only show failing tests (no +@@ -392,7 +391,6 @@ build/release: tinygo gen-device wasi-libc + @mkdir -p build/release/tinygo/pkg/armv7em-none-eabi + @echo copying source files + @cp -p build/tinygo$(EXE) build/release/tinygo/bin +- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include + @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS + @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS + @cp -rp lib/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt/lib