Date: Wednesday, April 15, 2020 @ 18:29:38 Author: anatolik Revision: 614978
upgpkg: tinygo 0.13.0-1 This release requires LLVM 10 Modified: tinygo/trunk/PKGBUILD tinygo/trunk/disable_static_llvm.patch ---------------------------+ PKGBUILD | 4 +-- disable_static_llvm.patch | 51 +++++++++++++------------------------------- 2 files changed, 18 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-15 17:15:59 UTC (rev 614977) +++ PKGBUILD 2020-04-15 18:29:38 UTC (rev 614978) @@ -1,7 +1,7 @@ # Maintainer: Anatol Pomozov <[email protected]> pkgname=tinygo -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=1 pkgdesc='Go compiler for small places. Microcontrollers, WebAssembly, and command-line tools. Based on LLVM.' arch=(x86_64) @@ -26,7 +26,7 @@ 'SKIP' 'SKIP' 'SKIP' - 'e56a93e3517c37e75f5278b8b2bf27f6297cb119ba9cb8d3a678627e204b07a6') + '02c67add4b961490c887c14ba6a6210ed6b180cf81d713e78bd4fe3eb1a35f7a') prepare() { cd tinygo Modified: disable_static_llvm.patch =================================================================== --- disable_static_llvm.patch 2020-04-15 17:15:59 UTC (rev 614977) +++ disable_static_llvm.patch 2020-04-15 18:29:38 UTC (rev 614978) @@ -1,22 +1,18 @@ diff --git a/Makefile b/Makefile -index 81bbfac..6630a36 100644 +index bacd9b5..62f1d1d 100644 --- a/Makefile +++ b/Makefile -@@ -8,9 +8,9 @@ CLANG_SRC ?= llvm-project/clang - LLD_SRC ?= llvm-project/lld +@@ -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) +@@ -170,11 +170,10 @@ lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a: - # Default tool selection. --CLANG ?= clang-9 --LLVM_AR ?= llvm-ar-9 --LLVM_NM ?= llvm-nm-9 -+CLANG ?= clang -+LLVM_AR ?= llvm-ar -+LLVM_NM ?= llvm-nm - - # Go binary and GOROOT to select - GO ?= go -@@ -153,11 +152,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 @@ -29,7 +25,7 @@ tinygo-test: cd tests/tinygotest && tinygo test -@@ -289,7 +287,6 @@ release: tinygo gen-device wasi-libc +@@ -323,7 +322,6 @@ 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 @@ -37,23 +33,8 @@ @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 -@@ -302,4 +299,3 @@ release: tinygo gen-device wasi-libc - ./build/tinygo build-builtins -target=armv6m-none-eabi -o build/release/tinygo/pkg/armv6m-none-eabi/compiler-rt.a - ./build/tinygo build-builtins -target=armv7m-none-eabi -o build/release/tinygo/pkg/armv7m-none-eabi/compiler-rt.a - ./build/tinygo build-builtins -target=armv7em-none-eabi -o build/release/tinygo/pkg/armv7em-none-eabi/compiler-rt.a +@@ -345,4 +343,3 @@ release: tinygo gen-device wasi-libc + ./build/tinygo build-library -target=armv6m-none-eabi -o build/release/tinygo/pkg/armv6m-none-eabi/picolibc.a picolibc + ./build/tinygo build-library -target=armv7m-none-eabi -o build/release/tinygo/pkg/armv7m-none-eabi/picolibc.a picolibc + ./build/tinygo build-library -target=armv7em-none-eabi -o build/release/tinygo/pkg/armv7em-none-eabi/picolibc.a picolibc - tar -czf build/release.tar.gz -C build/release tinygo -diff --git a/builder/config.go b/builder/config.go -index 8bb3a11..5010842 100644 ---- a/builder/config.go -+++ b/builder/config.go -@@ -25,8 +25,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) { - if err != nil { - return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err) - } -- if major != 1 || (minor != 11 && minor != 12 && minor != 13) { -- return nil, fmt.Errorf("requires go version 1.11, 1.12, or 1.13, got go%d.%d", major, minor) -+ if major != 1 || (minor != 11 && minor != 12 && minor != 13 && minor != 14) { -+ return nil, fmt.Errorf("requires go version 1.11, 1.12, or 1.13, or 1.14, got go%d.%d", major, minor) - } - clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT")) - return &compileopts.Config{
