From nobody Sat Jun 25 12:56:33 2022 X-Original-To: dev-commits-ports-all@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 CC60287A8DD; Sat, 25 Jun 2022 12:56:33 +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 4LVYsF599Fz3th3; Sat, 25 Jun 2022 12:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656161793; 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=MGwGBR4A/X7zpeelAbp7siLk2FeZJfwAoBvqS01N5BM=; b=N/v/clj3wpTdyznqljteOKYjMP4iqpHUziS4uASZPEkFyf4mpmmgjYxz5Tby20JqZgTaPj tqY5Dfa7i5q+qj5c+tAfSKxfvYY+jygmCNxMpgRbALSBKcrzRo6GZcDfSNNECF7xwhQdx1 4GqOqYsYOCGsKS6o998sUTARXxr0ZNus1byuLKK0z9EzAXzfo3BnSYQXMGHusf8kHB2Zzt +vYCn3MXLL8qVtPi1vMamZsBQIlOh6u+bntUZvsBvwDQ0xZ1H254XfFDlqsfK1PzCLAUNt 6+SYIVItGCz898kSl54XwulRjvNM6H3taGnIR4GZ2IsXG9TOgmdLG96CDyJYHQ== 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 9242224CAD; Sat, 25 Jun 2022 12:56:33 +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 25PCuXbD000179; Sat, 25 Jun 2022 12:56:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PCuXjs000178; Sat, 25 Jun 2022 12:56:33 GMT (envelope-from git) Date: Sat, 25 Jun 2022 12:56:33 GMT Message-Id: <202206251256.25PCuXjs000178@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: c52e986cb0d3 - main - devel/gitaly: fix build on FreeBSD 13.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c52e986cb0d3d1d86af52cb8077a5d7a793ef1f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656161793; 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=MGwGBR4A/X7zpeelAbp7siLk2FeZJfwAoBvqS01N5BM=; b=jQGFAipzKDAMg1v6V0ei1p8qN6JtscD7aXMSzJjWc6oiMuU2mc/K63z2WmAfLd2gSKELoz mcDwKJi+FxXKnvzSwBpG9EvO5RT4VHQs8YLbvEH7iDDW9CXzLkFEsywbZUDDG9+WgC8EBl bT26RsMV2b8UgTBlPBIkDBk0rYJ2VeICwNLHsSkjKxwJLIU/RZ7cV2cXgj63I8RlPbxvzI OfoqR+4TKvnqxUeTwDImCBMkJUFrSkyB322mMU1I81aDY7d2ZRoijcSehMc/5rdqd6pJeo xLD3f/u/MqlVLGH2Xm1AYGM9vtdAg1fYGvT9UeIhTFLRubMvqJbKZelSz4+vzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656161793; a=rsa-sha256; cv=none; b=MVVJeVP5AvOiJGthDBbH8fmsN1+E8VFg6i3Bn9wCohkJuERu6OBlo8oepSPP+caEQnlCwE mxvBunFST7tbmMspP5SAykDkGyYVipptQigHW41BnJOeVoHRKsqB5boFJzxzMb1vdcmvEu cQVYYqdmD4YkCEere43Mu/KIyn9tqr6GyP1CEG9Am5RsFkaBJSYg4Z/uv8PMMtpPXWdpVO l/9iW3nMx1S9MXWBjISFp+zhl4oHN9THW4Yue+k6of269r41MCDETg6lFnxwb+F+XNhzXz 3tmJc+p005ceksNws6B2ugUiYxclZ+LzS07MALuKTq4Z9HaYh5TIleFMCX6NGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c52e986cb0d3d1d86af52cb8077a5d7a793ef1f5 commit c52e986cb0d3d1d86af52cb8077a5d7a793ef1f5 Author: Matthias Fechner AuthorDate: 2022-06-25 12:55:53 +0000 Commit: Matthias Fechner CommitDate: 2022-06-25 12:55:53 +0000 devel/gitaly: fix build on FreeBSD 13.0 FreeBSD 13.0 seems to not have sha1sum binary, use sha1 instead. --- devel/gitaly/files/patch-Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 5f3b12f9b285..cf5e2865e049 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -17,6 +17,15 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE +@@ -548,7 +547,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU + @ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the + @ # GNU build-id from the empty string and causing guaranteed collisions. + ${Q}GO_BUILD_ID=$$(go tool buildid "$<" || openssl rand -hex 32) && \ +- GNU_BUILD_ID=$$(echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1) && \ ++ GNU_BUILD_ID=$$(echo $$GO_BUILD_ID | sha1 | cut -d' ' -f1) && \ + if test "${OS}" = "Linux"; then \ + go run "${SOURCE_DIR}"/tools/replace-buildid \ + -input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \ @@ -560,22 +559,11 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}