From nobody Fri Jul 29 18:51:14 2022 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 4Lvc6q06Hdz4Y2Yg; Fri, 29 Jul 2022 18:51:15 +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 4Lvc6p6FY7z41RP; Fri, 29 Jul 2022 18:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120674; 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=vvk9nFEHj3MDQHQRu2NWo8gnLrp8Jh3fLmKbsflpDCk=; b=LUDfPNKkm+cmbR9kg4BgcRsBQXWl5rixMlgMHHR3WRYGlSdcgnIfhH/Wdh6mpGrAg3Jmt/ Y0K9H0jKfzG0aHOnhmYkloYXGdH1yxe70uOG3tHaODNn6fgdYSHtq5Z8Y+lffFSTwk5RIC dq4NLeNkskiBa10RaDc6aXfKjtfHC685vk+BX8lANJiKhBcGSQxp6IPsCtVKlG2VH4IQza wdN2Hi6lS53/Aql3as8VPJaneLc6SPLqSAf61jJHVW1vAzgpuehqKz6mFHDEEvnDL7oenC YGDbSvxjCS+uZC286vbcF2HDBoS4itIHZ03yQi5U4vWh4Eg2F+K9aHCOFEFROQ== 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 4Lvc6p57ngzmBJ; Fri, 29 Jul 2022 18:51:14 +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 26TIpEf0034838; Fri, 29 Jul 2022 18:51:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TIpESd034837; Fri, 29 Jul 2022 18:51:14 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:51:14 GMT Message-Id: <202207291851.26TIpESd034837@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: 2b58d08a515a - main - net-im/signal-desktop: Simplify handling of esbuild 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b58d08a515aa8aea6b37e0d41b433840c619514 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120674; 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=vvk9nFEHj3MDQHQRu2NWo8gnLrp8Jh3fLmKbsflpDCk=; b=pAN1EDMccPYLT5WCHc9Rz//PG12WBddR3aa2xR/obvG6Q8Ga7YIIUl/yhxoU6gliyRIw9B TR4Iqq3PbZCM6iNWI+X5vQmhZzovhhlBOy2/YGCFfWp0boSYz19wvraH+DYmDQWjqSoYWc dSc9jx9xWo/X+Z1svjxmeWmQg06RZc8AQYt7cvJjsFmDUXSjPenQ1U97KSHW9gxYQ4I5Qo QO8ifZ2nyPuES0+TnCYcDzv2VnS/9AtEvaEtTEZoFlyQaxJL3gKpUC//WUnJeJcTOJAVd0 N+idZv19SaPnK+MAxYDV051edhrmTznRFNerJuNYENxwJ5FQFTNkwyb34gktqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120674; a=rsa-sha256; cv=none; b=L/h5nOg/h3Ej3JoGLViGCkbK4wVqVl6G6gQEvKY6U9wqiebfWCtxMAwNYJf4Xv5xwyJI9E eLj0BQAQlNNdx0z7MWvetyK5u27AkUP1IBKRA7wOQMPeVNrsojOEqXS++MCl6w5SoXixst VOaiEl9BZqsxnc7pzwB2qV9S0m9Xw/+nMWkXZWq3tZClhPpYQ+24aMYR+1QDFtntfj37aF 6I0Cqj8er5du+8HRA6sNSBsrZuNIZUQMZAGllPsNMMma4Avm36nZf3/1B6J3nTeSix5Dpl YzviykCJGB3KidzJ52IrmsMeTJ3PFnRKmeSokfUFTIER0nsDUvcwTrdsarlzYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b58d08a515aa8aea6b37e0d41b433840c619514 commit 2b58d08a515aa8aea6b37e0d41b433840c619514 Author: Mikael Urankar AuthorDate: 2022-07-27 17:41:27 +0000 Commit: Mikael Urankar CommitDate: 2022-07-29 18:51:09 +0000 net-im/signal-desktop: Simplify handling of esbuild npm is inconsistent between archs: the path and binary name is different on aarch64 and amd64. Pass the binary path in ESBUILD_BINARY_PATH It fixes the build on aarch64 --- net-im/signal-desktop/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 50b1d4b80dad..adaf0007cd5b 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -79,6 +79,8 @@ MAKE_ENV+= ELECTRON_SKIP_BINARY_DOWNLOAD=1 # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 +MAKE_ENV+= ESBUILD_BINARY_PATH=${WRKDIR}/esbuild-freebsd-64/package/bin/esbuild + _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 19 @@ -88,8 +90,8 @@ NPM_RINGRTC_DIR= npm-ringrtc-2.20.11-3e05d7ec7b1878df69e0d7b215b693d82b3b3791 NPM_SQLITE3_DIR= npm-better-sqlite3-7.5.0-3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d NPM_PLAYWRITE_DIR= npm-playwright-core-1.17.1-a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022-integrity NPM_ESBUILD_VERS= 0.14.28 -NPM_ESBUILD_DIR= npm-esbuild-freebsd-64-${NPM_ESBUILD_VERS}-3579fd41f4c090d52e1a9134743e591c6aea49d7-integrity +ESBUILD_ARCH= ${ARCH:S/aarch64/arm/:S/amd64//} NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} APP_OUT_DIR= linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked @@ -132,11 +134,8 @@ do-build: # patch-package can't patch sqlite3 on aarch64, patch the yarn cache instead cd ${WRKDIR}/.cache/yarn/v6 && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff - ${MKDIR} ${WRKDIR}/esbuild-freebsd-64-${NPM_ESBUILD_VERS} \ - ${WRKDIR}/.cache/yarn/v6/${NPM_ESBUILD_DIR}/node_modules/esbuild/lib/downloaded-esbuild-freebsd-64-esbuild - ${TAR} -xf ${WRKDIR}/yarn-cache/esbuild-freebsd-64-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64-${NPM_ESBUILD_VERS} - ${CP} ${WRKDIR}/esbuild-freebsd-64-${NPM_ESBUILD_VERS}/package/bin/esbuild \ - ${WRKDIR}/.cache/yarn/v6/${NPM_ESBUILD_DIR}/node_modules/esbuild/lib/downloaded-esbuild-freebsd-64-esbuild + ${MKDIR} ${WRKDIR}/esbuild-freebsd-64 + ${TAR} -xf ${WRKDIR}/yarn-cache/esbuild-freebsd-${ESBUILD_ARCH}64-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64 # # For online build # ${RM} ${WRKDIR}/.npmrc