From nobody Sat Feb 10 10:50:47 2024 X-Original-To: dev-commits-ports-main@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 4TX6vX0JGZz59RjH; Sat, 10 Feb 2024 10:50:48 +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 4TX6vW6rF2z4jpH; Sat, 10 Feb 2024 10:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707562248; 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=g5Scatm3+9V2+0SF58b5JA2oiWWlVWT1n/C4p/YrJhM=; b=ABsTlF7+/c6UOc1Mghm0sS4KK9sIIl2dpUlIjAjlKmltPcyimPpn8qLl7xgeezaSFhnTnt jij/6qufmVVTIurhngKJMmbLWOdAOWryxKTinaOeiBkDRCXuTxLYsmBSwEjGqN4yIbCBi8 Ci8OEqpeThF6M5pYuurzNHMfn5ukhU4cbOW2LtEKXvhtmphv+f8w/rMHf/nAExhV62gE6c jm6VTaeDdbevbYwq5ThPfRzHIn+QNn7x8XkWcqXpqXR650KGsn0jC6MVd3OGZVqHsbIW2d NQZLz99GxXB66vcncOx9JqWWOz8bW1q+7UkC0LBlxm48nb5vUt3M+1ME6N9bUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707562248; a=rsa-sha256; cv=none; b=RVDjgXr5i1g01LDENVb92Lae+ZNnhzxvXciKlWEbYsY1X8s9+4s0uYcUXDdJuYrBjqEZ95 8TSZ5S5Jt6QNAQEqk40Nm0ywNyfCYZLziVdCib1d4gIlWNtF0HPcglB1m3NNn7Q8kAsi5a p7MCrITBUAKAyJuLkh9yvq3u1mWfGGqurOQeY8bVhVwHGkTLB2ZFFK/l3EUWXxpLacUq0l ZizudwsXjcZ/fw0hEzmkksOgRDQtMJRaW/mg+oAgKsHQb6sn8JJX6iaWgwvscxVTSdTRI/ 7Ynyrn5IMPLLq9aadSjF7+Gyzx9qQEGEyqCBDptlkdc0ZL1l/6+LaE8UzOJV2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707562248; 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=g5Scatm3+9V2+0SF58b5JA2oiWWlVWT1n/C4p/YrJhM=; b=FMrUKwuFzHyWqx0w1Gua37k//NGf9WiGxbddUcrBdfAJQhpm3XWXiYjH7ySCTEd++E03oL xilKSQvI+E+YzFSKsNE6kbmizba2aqhdx6knyZrz73jjYslAT5f/OORwEv/3ji11t2mQ4L i39+5/MylLQHG43pPSmxssodoFWOoNYRdhQLypUkeLh8Z1reJzd7YiZBqVYjZgaRUiYyMv F0ETXdPjPs6Sr/eT/z+VtBnVymEKCILXXznyfPAwPbkME536m8FN6Kx6eYexOtTOTAhq3N uqOyQDnsKQJZNzj73VDP0h3tFG+XD7qmgzyTiDPVjHFSNub+zl5D04JiGqIiLg== 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 4TX6vW5v30z1CqP; Sat, 10 Feb 2024 10:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41AAolJ4071978; Sat, 10 Feb 2024 10:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41AAol0m071975; Sat, 10 Feb 2024 10:50:47 GMT (envelope-from git) Date: Sat, 10 Feb 2024 10:50:47 GMT Message-Id: <202402101050.41AAol0m071975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: bfbfda09669c - main - www/onlyoffice-documentserver: Fix build on aarch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfbfda09669c6bfd3309ca3d508c4eeccd55fcc8 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfbfda09669c6bfd3309ca3d508c4eeccd55fcc8 commit bfbfda09669c6bfd3309ca3d508c4eeccd55fcc8 Author: Mikael Urankar AuthorDate: 2024-02-10 10:50:33 +0000 Commit: Mikael Urankar CommitDate: 2024-02-10 10:50:33 +0000 www/onlyoffice-documentserver: Fix build on aarch64 --- www/onlyoffice-documentserver/Makefile | 13 ++++++++++++- .../files/extra-patch-pkg-fetch_lib-es5_build.js | 9 +++++++-- .../files/patch-document-server-package_Makefile | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 9a7379657084..1cf9c135bd32 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -110,6 +110,17 @@ DOS2UNIX_FILES= document-server-package/common/documentserver/nginx/includes/htt CONFLICTS_BUILD=devel/googletest +.include +.if ${ARCH} == aarch64 +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ + cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ + c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ + ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ + nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ + ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} +.endif + post-extract: @${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8_89 @@ -238,4 +249,4 @@ create-caches-tarball: cd ${WRKDIR} && \ ${TAR} czf ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz .npm .pkg-cache -.include +.include diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js index b45253b02607..e8cc8e840655 100644 --- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js +++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js @@ -13,7 +13,7 @@ // production binaries do NOT take NODE_OPTIONS from end-users args.push('--without-node-options'); // The dtrace and etw support was removed in https://github.com/nodejs/node/commit/aa3a572e6bee116cde69508dc29478b40f40551a -@@ -115,7 +109,9 @@ function getConfigureArgs(major, targetPlatform) { +@@ -115,7 +109,14 @@ function getConfigureArgs(major, targetPlatform) { // bundled npm package manager args.push('--without-npm'); // Small ICU @@ -21,10 +21,15 @@ + args.push('--with-intl=system-icu'); + args.push('--shared-openssl'); + args.push('--openssl-use-def-ca-store'); ++ args.push('--shared-brotli'); ++ args.push('--shared-cares'); ++ args.push('--shared-libuv'); ++ args.push('--shared-nghttp2'); ++ args.push('--shared-zlib'); // Workaround for nodejs/node#39313 // All supported macOS versions have zlib as a system library if (targetPlatform === 'macos') { -@@ -433,4 +429,4 @@ exports.default = build; +@@ -433,4 +434,4 @@ exports.default = build; }); } exports.default = build; diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile index 091c7e43df5c..c760d9de5b5b 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile @@ -26,7 +26,7 @@ + DS_FILES := /var/db/$(DS_PREFIX) + DS_EXAMLE := /usr/local/www/$(DS_PREFIX)-example + DEV_NULL := /dev/null -+ PKG_TARGET := node18-freebsd-x64 ++ PKG_TARGET := node18 + endif ifeq ($(UNAME_S),Darwin) PLATFORM := mac