Date: Sat, 25 Jun 2022 12:56:33 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c52e986cb0d3 - main - devel/gitaly: fix build on FreeBSD 13.0 Message-ID: <202206251256.25PCuXjs000178@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c52e986cb0d3d1d86af52cb8077a5d7a793ef1f5 commit c52e986cb0d3d1d86af52cb8077a5d7a793ef1f5 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2022-06-25 12:55:53 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206251256.25PCuXjs000178>