[arch-commits] Commit in tinygo/trunk (PKGBUILD disable_static_llvm.patch)

Anatol Pomozov anatolik at archlinux.org
Fri Sep 18 17:01:33 UTC 2020


    Date: Friday, September 18, 2020 @ 17:01:33
  Author: anatolik
Revision: 710700

upgpkg: tinygo 0.15.0-1

Modified:
  tinygo/trunk/PKGBUILD
  tinygo/trunk/disable_static_llvm.patch

---------------------------+
 PKGBUILD                  |   10 +++++++---
 disable_static_llvm.patch |   16 ++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-18 16:55:50 UTC (rev 710699)
+++ PKGBUILD	2020-09-18 17:01:33 UTC (rev 710700)
@@ -1,7 +1,7 @@
 # Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
 
 pkgname=tinygo
-pkgver=0.14.1
+pkgver=0.15.0
 pkgrel=1
 pkgdesc='Go compiler for small places. Microcontrollers, WebAssembly, and command-line tools. Based on LLVM.'
 arch=(x86_64)
@@ -16,8 +16,9 @@
         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/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'
@@ -26,7 +27,8 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            '2d2229c964480f4939e3794107cff6dded26215c6dae66e33e8f8e606d5a13c4')
+            'SKIP'
+            '7b97ed67a503b7d36b9318acb55442c6c03ba38f5d15c971c90f59a51dbf41ff')
 
 prepare() {
   cd tinygo
@@ -38,6 +40,8 @@
   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
 

Modified: disable_static_llvm.patch
===================================================================
--- disable_static_llvm.patch	2020-09-18 16:55:50 UTC (rev 710699)
+++ disable_static_llvm.patch	2020-09-18 17:01:33 UTC (rev 710700)
@@ -1,4 +1,4 @@
-commit f095d57e88216f7d7a3211c08923075b80a73a25
+commit c790eb9c8395b996267677fa0fdb8914b4426d16
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Fri Aug 21 08:51:00 2020 -0700
 
@@ -5,7 +5,7 @@
     Arch linux build changes
 
 diff --git a/Makefile b/Makefile
-index 425a0cf..b0a9e91 100644
+index e59799c..569108e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,7 +12,7 @@ LLD_SRC ?= $(LLVM_PROJECTDIR)/lld
@@ -17,21 +17,21 @@
  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:
+@@ -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 .
-+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) .
+-	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 .
  
- tinygo-test:
- 	cd tests/tinygotest && tinygo test
-@@ -361,7 +360,6 @@ build/release: tinygo gen-device wasi-libc
+ # 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


More information about the arch-commits mailing list