From nobody Wed Aug 03 21:35:43 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LylXJ30sPz4XqcK; Wed, 3 Aug 2022 21:35:44 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LylXH6lbHz3Stn; Wed, 3 Aug 2022 21:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659562543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akf89okyCtq/Xu2RpM1nUQ9c1o8b8+0vjZT1J6rNa5s=; b=BH5R6TNlcrQ3bzN2VtzeY0mr8eVHujZNaOBqxp7z4sS1JaZ96lCNWqlt5HO6AJrtIsvvZ9 8ojWUs6mZ7dXaB/K1oiN37GLQjjQbs6gwtPXzFYQPUn157XM962nlmeNFi1CoxkuKcEhvw HYi0HYY80+FCFLnEFrNHF+QdB13fL+nVuMUuGcTuyKSRDysBUI07h2fQ9JqBsTAI+iEVBD GOJJrsztmAhMJMbhAEzoC/FXXKmPU7D5HiM/4gho+RerGB2kWiD+7RfWXYx5cc2Tvu8UVe X3JGxwUz0aFDK0gyI6MjTu9/yvhKhcFQhAxgwnDVEL4HfykeQrFf1xEWNGSmaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LylXH5cw0z15Pc; Wed, 3 Aug 2022 21:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 273LZhKK026311; Wed, 3 Aug 2022 21:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273LZhrc026310; Wed, 3 Aug 2022 21:35:43 GMT (envelope-from git) Date: Wed, 3 Aug 2022 21:35:43 GMT Message-Id: <202208032135.273LZhrc026310@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: b42522214dcc - main - Mk/Uses/go.mk: Fix go-post-extract for legacy mode builds List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42522214dcc52b9a932af5661d38d426a5b8adb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659562543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akf89okyCtq/Xu2RpM1nUQ9c1o8b8+0vjZT1J6rNa5s=; b=Tszfx0McVbIM4qBY6stOWCfmxFchiFusRWZYHwRwmzWIe037DysADAE9E0DpMQu7rPnzpI FD4xV+bbr6nylsh9iI5joDeJzXG5YSfa5m+HaoX4k34bs0l97DuYxn4gNH816ZWjeChL9I 550PCDuSoVbia42f7REPtp8q7UFY7U8gtl1Fn4x9FZPzt8zNQqCBA0KlsABiJ2j39s4OLe WHJuDHrYRb6YxK67duwd27mlr6BqZzFXx7Z5RI9g3QpW9KgWjgXqlH2Gqobhu82GfQmigt LdyElWmx2hm1OF5DJBQNEhvvHMee8dSXXtmibhxH2DM2MxqRS8wrkxVzlh6sbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659562543; a=rsa-sha256; cv=none; b=gfAYPWBzHovlt3HP2bliGnHU9GU050OQenaLBWFNFsyS96KIT5GE5HvXSCDfwDv3DnXu/4 nRGfhsWxC95eX61VM9OMhLQaBTyhblvCut76joAbCBBnlKYs2K967FlPmVKQQyyy4d2OXB uYHME6zww4m32LfFUPNlYM42dIMyG9ESxxOssoJz7lKqOEzp0LueZpbi+L6t7hfgmym0ls lVaj2QMWO38S3N1BHGxJoRvttXj82lzatux8cV/UIEbdfl4N6Am6JMgO5CvgNcYNlQ1yKQ ohyv+RdqURJF1WwbUJkxL7lKeMPaPEmWDP00OqXcUs+fdgi/oh7dIoJyo69Gvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=b42522214dcc52b9a932af5661d38d426a5b8adb commit b42522214dcc52b9a932af5661d38d426a5b8adb Author: Dmitri Goutnik AuthorDate: 2022-08-03 20:24:51 +0000 Commit: Dmitri Goutnik CommitDate: 2022-08-03 21:35:13 +0000 Mk/Uses/go.mk: Fix go-post-extract for legacy mode builds USES=go may set Go version for legacy (pre-module) builds too. --- Mk/Uses/go.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index ecb6d61c7f9b..91ac5740cf95 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -190,12 +190,7 @@ go-post-fetch: . endif _USES_extract+= 800:go-post-extract -. if empty(go_ARGS) -# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module. -go-post-extract: - @${MKDIR} ${GO_WRKSRC:H} - @${LN} -sf ${WRKSRC} ${GO_WRKSRC} -. elif ${go_ARGS:Mmodules} && defined(GO_MODULE) +. if ${go_ARGS:Mmodules} && defined(GO_MODULE) # Module-aware build mode. Although not strictly necessary (all build dependencies should be # already in MODCACHE), vendor them so we can patch them if needed. go-post-extract: @@ -203,6 +198,11 @@ go-post-extract: @(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e) @${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies"; @(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e) +. else +# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module. +go-post-extract: + @${MKDIR} ${GO_WRKSRC:H} + @${LN} -sf ${WRKSRC} ${GO_WRKSRC} . endif . if !target(do-build) && empty(go_ARGS:Mno_targets)