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

[Anatol Pomozov]

    Date: Friday, October 16, 2020 @ 16:13:55
  Author: anatolik
Revision: 724718

LLVM 11 rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-16 16:03:14 UTC (rev 724717)
+++ PKGBUILD	2020-10-16 16:13:55 UTC (rev 724718)
@@ -2,7 +2,7 @@
 
 pkgname=tinygo
 pkgver=0.15.0
-pkgrel=1
+pkgrel=2
 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'
@@ -19,7 +19,8 @@
         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)
+        disable_static_llvm.patch
+        llvm11.patch::https://github.com/tinygo-org/tinygo/commit/b40f250530769330cec4a2ae0a9ba6e0c6ce058a.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -28,7 +29,8 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            '7b97ed67a503b7d36b9318acb55442c6c03ba38f5d15c971c90f59a51dbf41ff')
+            '7648bd3b4b78174d912908d35bff6f2b0fe5dfdf78e4aa2d3824b929fb244335'
+            'e1071587cd170c8e5c52d60fa9b21952385ccc714e218f88f729977e1aef82c5')
 
 prepare() {
   cd tinygo
@@ -46,6 +48,8 @@
   git submodule update
 
   patch -p1 < ../disable_static_llvm.patch
+
+  patch -p1 < ../llvm11.patch # https://github.com/tinygo-org/tinygo/issues/1435
 }
 
 build() {

Modified: disable_static_llvm.patch
===================================================================
--- disable_static_llvm.patch	2020-10-16 16:03:14 UTC (rev 724717)
+++ disable_static_llvm.patch	2020-10-16 16:13:55 UTC (rev 724718)
@@ -1,11 +1,11 @@
-commit c790eb9c8395b996267677fa0fdb8914b4426d16
+commit 12ab9514299c32c235139148824cba704e7d5e27
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
-Date:   Fri Aug 21 08:51:00 2020 -0700
+Date:   Fri Oct 16 09:05:27 2020 -0700
 
     Arch linux build changes
 
 diff --git a/Makefile b/Makefile
-index e59799c..569108e 100644
+index e59799c..f3fb3bf 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,7 +12,7 @@ LLD_SRC ?= $(LLVM_PROJECTDIR)/lld
@@ -23,7 +23,7 @@
  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`" .
++	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags llvm11 -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 .