From nobody Wed Aug 09 13:04:26 2023 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 4RLVd6755nz4pxMP; Wed, 9 Aug 2023 13:04:26 +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 4RLVd66gJgz4Dwv; Wed, 9 Aug 2023 13:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586266; 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=XxaU6P3xkdmU47YSz9EbPpvGo4ljaKsuEm4lLTG6S0A=; b=YfJH5DBNsgmIpcyXHNcu6mC6FcAYjkhcfnlC+mg1cq39FUzrYw3KAQgIYqYpScnt6ggXtW ENbbX4bNsfPOUQ61YAi2a7plKSlkDNoUoyaNIv7yLG/A2MEejt51274lW2YYBK5judxJBX tD2Y3jf1s4luSN5c+NbaGFclc7gLRpAafuxTZVB6GWJ2uHIYevK7Wv31RUm+kHVK757y9X 8z4CacZVbsIrnTNZi8Yt6NpBK5st3LP93p8hd99WIEtC4YZsAi7Tm4oF/j4gT+1ySmF15K tqk6GwtPA4bx/TXgOX3tJXbL7zaszT38D05h84DaRM/eqz4cMc/CecDZsyHrIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586266; 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=XxaU6P3xkdmU47YSz9EbPpvGo4ljaKsuEm4lLTG6S0A=; b=vpuBTfKJck8FBN28Jl5JSbcwI/uGRRg/+6B2phcamwuE2WNyhCO5eX4Yes5HuBhC3JzcD0 CzWJFbleUAIt9NRfh+16tyRnglQ4BQjuv6ad3LXd4vR5UrxiBhhMpI2dgGIDCzWrcjLU/B O2qCDMqDZR45CZZ1xSqGKI7T7+oD2F0oTJB6GfjlNCAF4jnd0Dmb+TAEJYm78EsCvpcDYM wFg5nieeVIGyRb+NJoHT3tUsVhza4+V+uubqBsvfsCpYZg+bRqPI7FJj29Vwmu6m2a9214 2c/A3Z9TirevkeDPSbwTuxUciOTXC1bi0fwbqTootnNdSePovmy/3MECwtVs6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691586266; a=rsa-sha256; cv=none; b=KE97C+FjE6Q+HWSy6u57KWSwIKghNRaERdxRwXWToNHDM1vb3kB9fuqa63+XNU6ujtQnxY KqrfcNYBkfqLfPHHBX2SgMAf/KT2HwyyJs6lL7ylE3VjyesaeM0NtyQSadqCg3gQog96Fb ypdU09abIn4pMbR9LhGUOX0u7wcIZHim4UH6JlAujXaaUwBx2bTbUcNRwOvT5B1ABJnlt/ yhsKVRZgt+q3eAvM3EC67xch8+yuOYyUau0CvtJ3qZbWGlnqMn7r+MFwYcyxQTEtRFVoBo 9B+lY20yGwjLpZ474oHSPoNitt6CazY7K2Y/12LKlWacOWofHwWaexmkhFfwDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLVd65mRDz2Xh; Wed, 9 Aug 2023 13:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379D4QjS089775; Wed, 9 Aug 2023 13:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379D4QQ8089772; Wed, 9 Aug 2023 13:04:26 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:04:26 GMT Message-Id: <202308091304.379D4QQ8089772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: fed755e222a5 - main - devel/msbuild: Avoid MSB1008 build error 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fed755e222a5c6fba13458265e0c0378de139046 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=fed755e222a5c6fba13458265e0c0378de139046 commit fed755e222a5c6fba13458265e0c0378de139046 Author: Marcin Cieślak AuthorDate: 2023-08-05 23:55:13 +0000 Commit: Robert Clausecker CommitDate: 2023-08-09 13:01:14 +0000 devel/msbuild: Avoid MSB1008 build error The following error: ============= MSBuild command ============= /big/ports/usr/ports/devel/msbuild/work/msbuild-0.06/build/../artifacts/mono-msbuild/msbuild "/big/ports/usr/ports/devel/msbuild/work/msbuild-0.06/build/Toolset.proj" /t:restore /m /clp:Summary /warnaserror /v:minimal /bl:"/big/ports/usr/ports/devel/msbuild/work/msbuild-0.06/build/../artifacts/Release-MONO/log/Toolset.binlog" =========================================== Microsoft (R) Build Engine version 15.8.38.37692 (xplat-master/3c930fa8 Tue May 8 12:36:23 EDT 2018) for Mono Copyright (C) Microsoft Corporation. All rights reserved. MSBUILD : error MSB1008: Only one project can be specified. Switch: /m can be fixed by making sure the /m is given the parameter (number of CPUs to use in parallel). MSBuild does not seem to parallelize builds currently, but this fixes the error. PR: 272961 Approved by: portmgr (build fix blanket) --- devel/msbuild/Makefile | 9 +++++++-- devel/msbuild/files/patch-Directory.Build.rsp | 6 ++++++ devel/msbuild/files/patch-build_build.sh | 13 +++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/devel/msbuild/Makefile b/devel/msbuild/Makefile old mode 100644 new mode 100755 index 202008202cc7..3dbbaace866c --- a/devel/msbuild/Makefile +++ b/devel/msbuild/Makefile @@ -15,17 +15,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash:shells/bash +USES= mono:nuget shebangfix + NUGET_FEEDS= DOTNET_CORE NUGET ROSLYN ROSLYN_TOOLS SYMREADER_CONVERTER NUGET_LAYOUT= dotnet -USES= mono:nuget shebangfix USE_GITHUB= yes GH_ACCOUNT= mono GH_TAGNAME= 0.06 SHEBANG_FILES= *.sh artifacts/mono-msbuild/msbuild build.sh build/*.sh MAKE_ENV= GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d -MAKE_JOBS_UNSAFE=MSBuild has not implemented concurrent builds on non Windows platforms ALL_TARGET= all-mono TEST_TARGET= test-mono @@ -33,6 +33,11 @@ post-extract: ${MKDIR} ${WRKSRC}/artifacts ${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild +pre-configure: + ${REINPLACE_CMD} -e s/%%MAKE_JOBS_NUMBER%%/${MAKE_JOBS_NUMBER}/ \ + ${WRKSRC}/build/build.sh \ + ${WRKSRC}/Directory.Build.rsp + do-build: (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build) diff --git a/devel/msbuild/files/patch-Directory.Build.rsp b/devel/msbuild/files/patch-Directory.Build.rsp new file mode 100644 index 000000000000..f842758065a3 --- /dev/null +++ b/devel/msbuild/files/patch-Directory.Build.rsp @@ -0,0 +1,6 @@ +--- Directory.Build.rsp.orig 2018-05-02 18:19:31 UTC ++++ Directory.Build.rsp +@@ -1 +1 @@ +-/verbosity:minimal /m /clp:Summary +\ No newline at end of file ++/verbosity:minimal /m:%%MAKE_JOBS_NUMBER%% /clp:Summary diff --git a/devel/msbuild/files/patch-build_build.sh b/devel/msbuild/files/patch-build_build.sh index 3d3055138ea2..065406ac069b 100644 --- a/devel/msbuild/files/patch-build_build.sh +++ b/devel/msbuild/files/patch-build_build.sh @@ -1,4 +1,4 @@ ---- build/build.sh.orig 2018-06-25 18:50:41 UTC +--- build/build.sh.orig 2023-08-06 19:14:14 UTC +++ build/build.sh @@ -151,7 +151,7 @@ function ExitIfError { then @@ -9,12 +9,21 @@ then StopProcesses fi +@@ -297,7 +297,7 @@ function InstallRepoToolset { + if [ ! -d "$RepoToolsetBuildProj" ] + then + ToolsetProj="$ScriptRoot/Toolset.proj" +- CallMSBuild $(QQ $ToolsetProj) /t:restore /m /clp:Summary /warnaserror /v:$verbosity $logCmd $properties ++ CallMSBuild $(QQ $ToolsetProj) /t:restore /m:%%MAKE_JOBS_NUMBER%% /clp:Summary /warnaserror /v:$verbosity $logCmd $properties + fi + } + @@ -343,7 +343,7 @@ function Build { local logCmd=$(GetLogCmd Build) - commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=$dotnetBuildFromSource" -+ commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true" ++ commonMSBuildArgs="/m:%%MAKE_JOBS_NUMBER%% /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true" # Only enable warnaserror on CI runs. if $ci