From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 04:20:23 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D3F55C9689; Wed, 7 Apr 2021 04:20:23 +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 4FFWQZ5cJqz3nWS; Wed, 7 Apr 2021 04:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C560D18D1D; Wed, 7 Apr 2021 04:20:18 +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 1374KICr023865; Wed, 7 Apr 2021 04:20:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1374KIXE023859; Wed, 7 Apr 2021 04:20:18 GMT (envelope-from git) Date: Wed, 7 Apr 2021 04:20:18 GMT Message-Id: <202104070420.1374KIXE023859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 7b1d905b03cc - main - sysutils/fluxengine: Unbreak build with devel/samurai (D29353) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 04:20:23 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca commit 7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca Author: Tobias Kortkamp AuthorDate: 2021-04-07 03:53:17 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-07 04:20:01 +0000 sysutils/fluxengine: Unbreak build with devel/samurai (D29353) It does not like the extra whitespace which might be a bug in samurai but for now just remove it and fix the build. MKNINJA .obj/build.ninja ninja: .obj/build.ninja:6:5: expected name PR: 254678 --- sysutils/fluxengine/files/patch-mkninja.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sysutils/fluxengine/files/patch-mkninja.sh b/sysutils/fluxengine/files/patch-mkninja.sh new file mode 100644 index 000000000000..41cdc6e254b3 --- /dev/null +++ b/sysutils/fluxengine/files/patch-mkninja.sh @@ -0,0 +1,17 @@ +Fix ninja generator + +devel/samurai does not like the extra whitespace: + +ninja: .obj/build.ninja:6:5: expected name + +--- mkninja.sh.orig 2021-03-31 12:47:37 UTC ++++ mkninja.sh +@@ -7,7 +7,7 @@ rule cxx + description = CXX \$in + depfile = \$out.d + deps = gcc +- ++ + rule library + command = $AR \$out \$in + description = AR \$in