From owner-svn-ports-all@freebsd.org Sun Nov 15 13:05:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 714182E8693; Sun, 15 Nov 2020 13:05:43 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CYsrl2lRPz3rsV; Sun, 15 Nov 2020 13:05:43 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 510B91C149; Sun, 15 Nov 2020 13:05:43 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AFD5hKK018454; Sun, 15 Nov 2020 13:05:43 GMT (envelope-from dmgk@FreeBSD.org) Received: (from dmgk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AFD5gi1018452; Sun, 15 Nov 2020 13:05:42 GMT (envelope-from dmgk@FreeBSD.org) Message-Id: <202011151305.0AFD5gi1018452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dmgk set sender to dmgk@FreeBSD.org using -f From: Dmitri Goutnik Date: Sun, 15 Nov 2020 13:05:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r555207 - in branches/2020Q4/devel/tinygo: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dmgk X-SVN-Commit-Paths: in branches/2020Q4/devel/tinygo: . files X-SVN-Commit-Revision: 555207 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 13:05:43 -0000 Author: dmgk Date: Sun Nov 15 13:05:42 2020 New Revision: 555207 URL: https://svnweb.freebsd.org/changeset/ports/555207 Log: MFH: r555206 devel/tinygo: Unbreak with go1.15.5 - unbreak with go 1.15.5 - drop maintainership Approved by: portmgr (build fix blanket) Modified: branches/2020Q4/devel/tinygo/Makefile branches/2020Q4/devel/tinygo/files/patch-Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/devel/tinygo/Makefile ============================================================================== --- branches/2020Q4/devel/tinygo/Makefile Sun Nov 15 13:03:30 2020 (r555206) +++ branches/2020Q4/devel/tinygo/Makefile Sun Nov 15 13:05:42 2020 (r555207) @@ -3,9 +3,10 @@ PORTNAME= tinygo DISTVERSIONPREFIX= v DISTVERSION= 0.14.1 +PORTREVISION= 1 CATEGORIES= devel -MAINTAINER= dmgk@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Go compiler for small places LICENSE= BSD3CLAUSE Modified: branches/2020Q4/devel/tinygo/files/patch-Makefile ============================================================================== --- branches/2020Q4/devel/tinygo/files/patch-Makefile Sun Nov 15 13:03:30 2020 (r555206) +++ branches/2020Q4/devel/tinygo/files/patch-Makefile Sun Nov 15 13:05:42 2020 (r555207) @@ -1,4 +1,4 @@ ---- Makefile.orig 2020-04-13 15:48:30 UTC +--- Makefile.orig 2020-08-19 06:37:16 UTC +++ Makefile @@ -40,7 +40,7 @@ MD5SUM = md5sum TINYGO ?= tinygo @@ -9,8 +9,17 @@ LLVM_OPTION += '-DLLVM_CCACHE_BUILD=ON' endif +@@ -104,7 +104,7 @@ LLD_LIBS = $(START_GROUP) -llldCOFF -llldCommon -llldC + ifneq ("$(wildcard $(LLVM_BUILDDIR)/bin/llvm-config*)","") + CGO_CPPFLAGS=$(shell $(LLVM_BUILDDIR)/bin/llvm-config --cppflags) -I$(abspath $(LLVM_BUILDDIR))/tools/clang/include -I$(abspath $(CLANG_SRC))/include -I$(abspath $(LLD_SRC))/include + CGO_CXXFLAGS=-std=c++14 +- CGO_LDFLAGS+=$(LIBCLANG_PATH) -std=c++14 -L$(abspath $(LLVM_BUILDDIR)/lib) $(CLANG_LIBS) $(LLD_LIBS) $(shell $(LLVM_BUILDDIR)/bin/llvm-config --ldflags --libs --system-libs $(LLVM_COMPONENTS)) -lstdc++ $(CGO_LDFLAGS_EXTRA) ++ CGO_LDFLAGS+=$(LIBCLANG_PATH) -L$(abspath $(LLVM_BUILDDIR)/lib) $(CLANG_LIBS) $(LLD_LIBS) $(shell $(LLVM_BUILDDIR)/bin/llvm-config --ldflags --libs --system-libs $(LLVM_COMPONENTS)) -lstdc++ $(CGO_LDFLAGS_EXTRA) + endif + + @@ -121,13 +121,13 @@ fmt-check: - gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive gen-device-stm32 + gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive gen-device-stm32 gen-device-kendryte gen-device-nxp gen-device-avr: - $(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/ @@ -25,7 +34,7 @@ gen-device-nrf: build/gen-device-svd ./build/gen-device-svd -source=https://github.com/NordicSemiconductor/nrfx/tree/master/mdk lib/nrfx/mdk/ src/device/nrf/ -@@ -165,16 +165,16 @@ $(LLVM_BUILDDIR): $(LLVM_BUILDDIR)/build.ninja +@@ -173,16 +173,16 @@ $(LLVM_BUILDDIR): $(LLVM_BUILDDIR)/build.ninja .PHONY: wasi-libc wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a: @@ -45,8 +54,11 @@ tinygo-test: cd tests/tinygotest && tinygo test -@@ -345,4 +345,3 @@ release: tinygo gen-device wasi-libc +@@ -383,7 +383,6 @@ build/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 +- + release: build/release + tar -czf build/release.tar.gz -C build/release tinygo +