pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tinygo: try to adapt to go module changes in pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Jun 6 11:10:28 2024 +0200
Changeset:	0aef43df0432023de7e70cb2f81e40d29ca43541

Modified Files:
	tinygo/Makefile

Log Message:
tinygo: try to adapt to go module changes in pkgsrc

go-module.mk now sublty changes the default behaviour of EXTRACT_ONLY
from DISTFILES to DEFAULT_DISTFILES. For packages that use both Go
modules and extra distfiles, we now have to manually wrangle EXTRACT_ONLY
in the package's Makefile since go-module.mk no longer sets things up
in the normal pkgsrc way.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0aef43df0432023de7e70cb2f81e40d29ca43541

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tinygo/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diffs:
diff --git a/tinygo/Makefile b/tinygo/Makefile
index 9c3f3f398a..48973d15fc 100644
--- a/tinygo/Makefile
+++ b/tinygo/Makefile
@@ -24,10 +24,9 @@ HOMEPAGE=	https://github.com/tinygo-org/tinygo/
 COMMENT=	Go compiler for small places
 LICENSE=	modified-bsd AND apache-2.0
 
-DISTFILES=				${DEFAULT_DISTFILES}
-DISTFILES+=				musl-1.2.4.tar.gz
+TINYGO_DISTFILES+=			musl-1.2.4.tar.gz
 SITES.musl-1.2.4.tar.gz=		https://www.musl-libc.org/releases/
-DISTFILES+=				esp-17.0.1_20240419.tar.gz
+TINYGO_DISTFILES+=			esp-17.0.1_20240419.tar.gz
 SITES.esp-17.0.1_20240419.tar.gz=	https://github.com/espressif/llvm-project/archive/refs/tags/
 
 DEPENDS+=	binaryen-[0-9]*:../../devel/binaryen
@@ -43,6 +42,10 @@ CHECK_INTERPRETER_SKIP+=	tinygo/lib/macos-minimal-sdk/generate-stubs.py
 CHECK_INTERPRETER_SKIP+=	tinygo/lib/picolibc/newlib/libc/string/uniset
 CHECK_INTERPRETER_SKIP+=	tinygo/lib/picolibc/newlib/libc/tinystdio/make-dtoa-data
 
+GO_MODULE_EXTRACT=	go.bug.st_serial_@v_v1.6.0.zip
+DISTFILES=		${DEFAULT_DISTFILES} ${TINYGO_DISTFILES}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES} ${TINYGO_DISTFILES} ${GO_MODULE_EXTRACT}
+
 .include "go-modules.mk"
 
 post-extract:


Home | Main Index | Thread Index | Old Index