From nobody Tue Oct 26 18:48:52 2021 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 DDF8A1819722; Tue, 26 Oct 2021 18:48:52 +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 4Hf17S5tpnz4bkT; Tue, 26 Oct 2021 18:48:52 +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 A5FFA21D96; Tue, 26 Oct 2021 18:48:52 +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 19QImqH7031581; Tue, 26 Oct 2021 18:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QImqrt031580; Tue, 26 Oct 2021 18:48:52 GMT (envelope-from git) Date: Tue, 26 Oct 2021 18:48:52 GMT Message-Id: <202110261848.19QImqrt031580@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 981564583497 - main - net/cjdns: fix build on powerpc64* 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9815645834977fe2ada5052d3c81881b7624bed7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9815645834977fe2ada5052d3c81881b7624bed7 commit 9815645834977fe2ada5052d3c81881b7624bed7 Author: Piotr Kubaj AuthorDate: 2021-10-26 18:46:41 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-26 18:46:41 +0000 net/cjdns: fix build on powerpc64* On powerpc64 and powerpc64le systems, os.cpus(), gets defined to []: > cpus = os.cpus() [] It has type object: > typeof cpus 'object' This causes jobs to be 0: > Math.floor((typeof cpus === 'undefined' ? 1 : cpus.length) * 1.25); 0 Change it so that instead of comparing type to undefined, we compare to 0: > Math.floor((os.cpus() == 0 ? 1 : cpus.length) * 1.25); 1 --- net/cjdns/Makefile | 2 -- net/cjdns/files/patch-node__build_builder.js | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net/cjdns/Makefile b/net/cjdns/Makefile index d796f6e75a8b..71b31f5a14d6 100644 --- a/net/cjdns/Makefile +++ b/net/cjdns/Makefile @@ -11,8 +11,6 @@ COMMENT= Routing engine designed for security, scalability, speed LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_powerpc64= fails to install: cjdns-cjdns-v20.3/cjdroute: No such file or directory - BUILD_DEPENDS= node:www/node \ bash:shells/bash diff --git a/net/cjdns/files/patch-node__build_builder.js b/net/cjdns/files/patch-node__build_builder.js new file mode 100644 index 000000000000..e67ae0da7927 --- /dev/null +++ b/net/cjdns/files/patch-node__build_builder.js @@ -0,0 +1,11 @@ +--- node_build/builder.js.orig 2021-10-26 18:19:15 UTC ++++ node_build/builder.js +@@ -779,7 +779,7 @@ module.exports.configure = function ( + // if it returns undefined let's just assume 1 + // workaround, nodejs seems to be broken on openbsd (undefined result after second call) + const cpus = Os.cpus(); +- const jobs = Math.floor((typeof cpus === 'undefined' ? 1 : cpus.length) * 1.25); ++ const jobs = Math.floor((cpus == 0 ? 1 : cpus.length) * 1.25); + + const pctx /*:Builder_PreCtx_t*/ = { + buildStage: (_x,_y)=>{},