Index: head/devel/tinygo/Makefile =================================================================== --- head/devel/tinygo/Makefile (revision 545533) +++ head/devel/tinygo/Makefile (revision 545534) @@ -1,92 +1,92 @@ # $FreeBSD$ PORTNAME= tinygo DISTVERSIONPREFIX= v -DISTVERSION= 0.14.0 +DISTVERSION= 0.14.1 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org COMMENT= Go compiler for small places LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake \ ninja:devel/ninja TEST_DEPENDS= qemu-system-arm:emulators/qemu USES= gmake go:modules,run USE_GITHUB= yes GH_ACCOUNT= tinygo-org GH_TUPLE= \ blakesmith:ar:8bd4349a67f2:blakesmith_ar/vendor/github.com/blakesmith/ar \ bugst:go-serial:v1.0.0:bugst_go_serial/vendor/go.bug.st/serial \ chromedp:cdproto:4da64dd111ac:chromedp_cdproto/vendor/github.com/chromedp/cdproto \ chromedp:chromedp:v0.5.3:chromedp_chromedp/vendor/github.com/chromedp/chromedp \ creack:goselect:v0.1.1:creack_goselect/vendor/github.com/creack/goselect \ gobwas:httphead:2c6c146eadee:gobwas_httphead/vendor/github.com/gobwas/httphead \ gobwas:pool:v0.2.0:gobwas_pool/vendor/github.com/gobwas/pool \ gobwas:ws:v1.0.2:gobwas_ws/vendor/github.com/gobwas/ws \ golang:sys:b77594299b42:golang_sys/vendor/golang.org/x/sys \ golang:tools:b320d3a0f5a2:golang_tools/vendor/golang.org/x/tools \ google:shlex:c34317bd91bf:google_shlex/vendor/github.com/google/shlex \ knq:sysutil:15668db23d08:knq_sysutil/vendor/github.com/knq/sysutil \ mailru:easyjson:v0.7.0:mailru_easyjson/vendor/github.com/mailru/easyjson \ marcinbor85:gohex:343a4b548892:marcinbor85_gohex/vendor/github.com/marcinbor85/gohex \ tinygo-org:go-llvm:345b2947b59d:tinygo_org_go_llvm/vendor/tinygo.org/x/go-llvm # Device files and runtime are distributed as submodules GH_TUPLE+= ARM-software:CMSIS:9fe411cef1ce:cmsis/lib/CMSIS \ CraneStation:wasi-libc:a280fead2ae7:wasi_libc/lib/wasi-libc \ NordicSemiconductor:nrfx:3ab39a9d457b:nrfx/lib/nrfx \ avr-rust:avr-mcu:6624554c02b2:avr/lib/avr \ keith-packard:picolibc:80528c684b10:picolibc/lib/picolibc \ llvm-mirror:compiler-rt:5bc79797e1f9:compiler_rt/lib/compiler-rt \ tinygo-org:cmsis-svd:a155cfd832c9:cmsis_svd/lib/cmsis-svd # Bundled LLVM GH_TUPLE+= llvm:llvm-project:llvmorg-10.0.1:llvm/llvm-project OPTIONS_DEFINE= AVR QEMU SIMAVR AVR_DESC= AVR based processors support QEMU_DESC= Install emulators/qemu for Cortex-M targets SIMAVR_DESC= Install devel/simavr for AVR targets AVR_RUN_DEPENDS= ${LOCALBASE}/avr/include/stdint.h:devel/avr-libc \ avr-gcc:devel/avr-gcc \ avrdude:devel/avrdude AVR_VARS_OFF= AVR=0 QEMU_RUN_DEPENDS= qemu-system-arm:emulators/qemu SIMAVR_RUN_DEPENDS= simavr:devel/simavr do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ HOME=${WRKDIR} \ ${GMAKE} llvm-build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ GO=${GO_CMD} \ HOME=${WRKDIR} \ PATH=${WRKSRC}/llvm-build/bin:$$PATH \ ${GMAKE} release do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/tinygo cd ${WRKSRC}/build/release/tinygo && \ ${MKDIR} ${STAGEDIR}${PREFIX}/tinygo/bin && \ ${INSTALL_PROGRAM} bin/tinygo ${STAGEDIR}${PREFIX}/tinygo/bin && \ ${COPYTREE_SHARE} "lib pkg src targets" ${STAGEDIR}${PREFIX}/tinygo ${RLN} ${STAGEDIR}${PREFIX}/tinygo/bin/tinygo ${STAGEDIR}${PREFIX}/bin do-test: cd ${WRKSRC} && ${SETENV} \ AVR=${AVR} \ GOCACHE=${WRKDIR}/.gocache \ PATH=${WRKSRC}/llvm-build/bin:$$PATH \ RISCV=0 \ TINYGO=${WRKSRC}/build/tinygo \ ${GMAKE} test smoketest .include Index: head/devel/tinygo/distinfo =================================================================== --- head/devel/tinygo/distinfo (revision 545533) +++ head/devel/tinygo/distinfo (revision 545534) @@ -1,49 +1,49 @@ -TIMESTAMP = 1596631349 -SHA256 (tinygo-org-tinygo-v0.14.0_GH0.tar.gz) = 77d834f1d53c1b3cc2e97e7cb3a820abc31567faa1ded48cf7bfdfd72d8da1eb -SIZE (tinygo-org-tinygo-v0.14.0_GH0.tar.gz) = 517688 +TIMESTAMP = 1597925221 +SHA256 (tinygo-org-tinygo-v0.14.1_GH0.tar.gz) = 2def83190542b529b1be476294298ec29bd6bfdf36edcb2658d93ced813781d6 +SIZE (tinygo-org-tinygo-v0.14.1_GH0.tar.gz) = 518324 SHA256 (blakesmith-ar-8bd4349a67f2_GH0.tar.gz) = 51d0ca71a5f31d283eb43142fadd036c9df909ebe5e5d7af031f6b9b91c65a67 SIZE (blakesmith-ar-8bd4349a67f2_GH0.tar.gz) = 4057 SHA256 (bugst-go-serial-v1.0.0_GH0.tar.gz) = 90bb0f44d59b04aa43d2f65c876c5c2b08bd5b85cfa019dc85afdab42cd12423 SIZE (bugst-go-serial-v1.0.0_GH0.tar.gz) = 23774 SHA256 (chromedp-cdproto-4da64dd111ac_GH0.tar.gz) = ff16a1374c4f17fdd67fa7cb99a45881ab520cdfeb1a020fa70d7ef09e752e21 SIZE (chromedp-cdproto-4da64dd111ac_GH0.tar.gz) = 340717 SHA256 (chromedp-chromedp-v0.5.3_GH0.tar.gz) = 9db5edc619eeeeae32cda333288f19ae1d8e253ec5def4fb3aa2526666ed3ab7 SIZE (chromedp-chromedp-v0.5.3_GH0.tar.gz) = 90079 SHA256 (creack-goselect-v0.1.1_GH0.tar.gz) = 2387f34f5e9d3a506aab94e30c4500c91529fda2c49aa3890523d3827306caf2 SIZE (creack-goselect-v0.1.1_GH0.tar.gz) = 7404 SHA256 (gobwas-httphead-2c6c146eadee_GH0.tar.gz) = 3c53d16746cb6f420a3f3f5bf1bb62afcd3f67df78b974bf9180ba488a9dd7bf SIZE (gobwas-httphead-2c6c146eadee_GH0.tar.gz) = 17105 SHA256 (gobwas-pool-v0.2.0_GH0.tar.gz) = 6c4f7ab93586a9a8ca28dc3dcf7cb5bfeaf8580274d7077897800c3b00c6fa2a SIZE (gobwas-pool-v0.2.0_GH0.tar.gz) = 7309 SHA256 (gobwas-ws-v1.0.2_GH0.tar.gz) = 955f8d943c3b6c29daf04f980818ad7a1a75e03d483cb2cef885148d44203a32 SIZE (gobwas-ws-v1.0.2_GH0.tar.gz) = 69975 SHA256 (golang-sys-b77594299b42_GH0.tar.gz) = 484bf05a828f18a9ea48f32b64322d6cc8e716b5cbfd455be72f445db8495b82 SIZE (golang-sys-b77594299b42_GH0.tar.gz) = 1534631 SHA256 (golang-tools-b320d3a0f5a2_GH0.tar.gz) = a1d365d8926dd0bf2378c9a6da587a439fd94ed9e2156b9e1732ac6a027fadc7 SIZE (golang-tools-b320d3a0f5a2_GH0.tar.gz) = 2352360 SHA256 (google-shlex-c34317bd91bf_GH0.tar.gz) = fefaae49749c42aaaf9864fc0a04326a8cc263a42ebfb18b907419b9cfc9f4f1 SIZE (google-shlex-c34317bd91bf_GH0.tar.gz) = 7234 SHA256 (knq-sysutil-15668db23d08_GH0.tar.gz) = 06ca09ec6374a8544d92e4d5b539ac2920873fc47628a4933a5cc76c113eacd0 SIZE (knq-sysutil-15668db23d08_GH0.tar.gz) = 2432 SHA256 (mailru-easyjson-v0.7.0_GH0.tar.gz) = 20e8ea95e5bd594b386c6edb5c57080929f6270018b9d29e4c86f6723ca50df7 SIZE (mailru-easyjson-v0.7.0_GH0.tar.gz) = 72804 SHA256 (marcinbor85-gohex-343a4b548892_GH0.tar.gz) = b3386e22809ebda802b3e0e295d2cd325d6e7c20f69cc551454b5faad606b7d7 SIZE (marcinbor85-gohex-343a4b548892_GH0.tar.gz) = 7608 SHA256 (tinygo-org-go-llvm-345b2947b59d_GH0.tar.gz) = defb2224ba5fedf31606b88213b6984c2fed0508d0a49fec9e7c2fca62b1ce65 SIZE (tinygo-org-go-llvm-345b2947b59d_GH0.tar.gz) = 32462 SHA256 (ARM-software-CMSIS-9fe411cef1ce_GH0.tar.gz) = cf743b2a8a50919c864946c8843d5fc7ed4be36ac15b8a07a1bdf9562efcc6c4 SIZE (ARM-software-CMSIS-9fe411cef1ce_GH0.tar.gz) = 97355967 SHA256 (CraneStation-wasi-libc-a280fead2ae7_GH0.tar.gz) = da6b83af3b93a13dd8a43b862e2a805f21b83e4878ea02dadeb2bea09bcd9933 SIZE (CraneStation-wasi-libc-a280fead2ae7_GH0.tar.gz) = 1210154 SHA256 (NordicSemiconductor-nrfx-3ab39a9d457b_GH0.tar.gz) = 516dbe156dcf3080d5b9df628ffe95fb6b4430973e0151eeb2fc66bd40070b24 SIZE (NordicSemiconductor-nrfx-3ab39a9d457b_GH0.tar.gz) = 943309 SHA256 (avr-rust-avr-mcu-6624554c02b2_GH0.tar.gz) = 6a879dad1c9e33ad1f55d3e2dd20dc797195e32c78963680d639e75bf2eb3171 SIZE (avr-rust-avr-mcu-6624554c02b2_GH0.tar.gz) = 3480381 SHA256 (keith-packard-picolibc-80528c684b10_GH0.tar.gz) = 8d3b46f0f4fa7345d778e291f27b7137d12ab317c4b9ee50434ee11aa61a281c SIZE (keith-packard-picolibc-80528c684b10_GH0.tar.gz) = 4524240 SHA256 (llvm-mirror-compiler-rt-5bc79797e1f9_GH0.tar.gz) = b978a63ffdcc8e25aa668c6b3d45f5fd1fb21852301db1aa797ac2aa5f8586b8 SIZE (llvm-mirror-compiler-rt-5bc79797e1f9_GH0.tar.gz) = 3269533 SHA256 (tinygo-org-cmsis-svd-a155cfd832c9_GH0.tar.gz) = 216bace74466eea11fc0da731e5270aaf104e930390eefa27dba81cd68c8e5e1 SIZE (tinygo-org-cmsis-svd-a155cfd832c9_GH0.tar.gz) = 53439301 SHA256 (llvm-llvm-project-llvmorg-10.0.1_GH0.tar.gz) = c7ccb735c37b4ec470f66a6c35fbae4f029c0f88038f6977180b1a8ddc255637 SIZE (llvm-llvm-project-llvmorg-10.0.1_GH0.tar.gz) = 120880730 Index: head/devel/tinygo/files/patch-Makefile =================================================================== --- head/devel/tinygo/files/patch-Makefile (revision 545533) +++ head/devel/tinygo/files/patch-Makefile (revision 545534) @@ -1,52 +1,52 @@ --- Makefile.orig 2020-04-13 15:48:30 UTC +++ Makefile @@ -40,7 +40,7 @@ MD5SUM = md5sum TINYGO ?= tinygo # Use CCACHE for LLVM if possible -ifneq (, $(shell command -v ccache 2> /dev/null)) +ifneq (, $(CCACHE_DIR)) LLVM_OPTION += '-DLLVM_CCACHE_BUILD=ON' 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-avr: - $(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/ + $(GO) build -mod=vendor -o ./build/gen-device-avr ./tools/gen-device-avr/ ./build/gen-device-avr lib/avr/packs/atmega src/device/avr/ ./build/gen-device-avr lib/avr/packs/tiny src/device/avr/ @GO111MODULE=off $(GO) fmt ./src/device/avr build/gen-device-svd: ./tools/gen-device-svd/*.go - $(GO) build -o $@ ./tools/gen-device-svd/ + $(GO) build -mod=vendor -o $@ ./tools/gen-device-svd/ 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 .PHONY: wasi-libc wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a: - cd lib/wasi-libc && make -j4 WASM_CC=$(CLANG) WASM_AR=$(LLVM_AR) WASM_NM=$(LLVM_NM) + cd lib/wasi-libc && gmake WASM_CC=$(CLANG) WASM_AR=$(LLVM_AR) WASM_NM=$(LLVM_NM) # 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 -o build/tinygo$(EXE) -tags byollvm . -+ CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -o build/tinygo$(EXE) -tags byollvm -mod=vendor . +- 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) -tags byollvm -mod=vendor . test: wasi-libc -- CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -tags byollvm ./cgo ./compileopts ./interp ./transform . -+ CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -tags byollvm -mod=vendor ./cgo ./compileopts ./interp ./transform . +- 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 -tags byollvm -mod=vendor ./cgo ./compileopts ./interp ./transform . tinygo-test: cd tests/tinygotest && tinygo test @@ -345,4 +345,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