Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Apr 2021 04:20:18 GMT
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7b1d905b03cc - main - sysutils/fluxengine: Unbreak build with devel/samurai (D29353)
Message-ID:  <202104070420.1374KIXE023859@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca

commit 7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:53:17 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104070420.1374KIXE023859>