From nobody Fri Jun 03 13:56:04 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 32A581B597EA; Fri, 3 Jun 2022 13:56:06 +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 4LF4D60FCPz3DR7; Fri, 3 Jun 2022 13:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654264566; 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=lx7G03SZfsnLRyzpf/+jUxmGcQYW8avTbNVyrA7xDW8=; b=Mmj9dniYjXMxp5alSdAjnUtWk8hPL1URWUml1Op2JO6KybPEplTbr8NgMOK2eREAklfIfD ILfPhO4v1y0jwkCOveIyYEd31FyEYeNoq+AjCpHRV+c1th2lyiJO1L36PHsUdf053sXG/9 sRxWt2/w2vuvwsLtvO7NEe8rEMWR9h8EE66Ej7jjR4ey1u0izF40JMjLzf51WsaNMVwDNJ y1v30cEi115F0awjmWXs3cFgiECE3SZMhsfospawa24SfbAnYjzAeyp2n++fWPeCTxyrjA PPboZ3JVuDJJ/r4Hyup0ffDtncUV4VbFPs7N6b7eF2w9tvbsvHZJVjdOw05QHw== 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 3B04E206D; Fri, 3 Jun 2022 13:56:05 +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 253Du4ot088630; Fri, 3 Jun 2022 13:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253Du4d3088629; Fri, 3 Jun 2022 13:56:04 GMT (envelope-from git) Date: Fri, 3 Jun 2022 13:56:04 GMT Message-Id: <202206031356.253Du4d3088629@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: 95d5bef07d00 - main - www/deno: Fix build on aarch64 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: 95d5bef07d00345908a610defeda46cbfd7a4c25 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654264566; 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=lx7G03SZfsnLRyzpf/+jUxmGcQYW8avTbNVyrA7xDW8=; b=lV8IpeNrlJ86lVBzDlQYOK7iubpzRpXfhVLGkTSABMFa6IM+QJ1dMCCvahhK5u50g4CPc5 ufnAt01L3C75E7ddVs9JyE+kYlAPfu3ZeE9pHaHiv7YV2Ma1TUnaUmuNdN3tm8mf4udFTo yln+WS6HzQ3KFBEeQVpNVldUfiNUHzwK79xsOtpuscGp4zY1pDc+nw4ynaJHrULRc/dHRi Z8W8BXFcRf95ODe4ERItsDCcz/FePdhjm1CmVwY1FDn26tiUHd/aNwL3Clv1WH76MsRkVR Dtf3jYh7nKJ1XEsI3pieVYRBlY8c8p20+op+eM6A5xc+W/L2xTAKMrVomqfUyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654264566; a=rsa-sha256; cv=none; b=eRszq6Vx9gImsNoZRtik4lXVBw3udwrzwOk/GtOTc4fe5mCMHQFpeN37XuikqcJIlI513j c/zTR/r8DjTCxlXeJVx0CBre4V0H92zgdI12JEkKPAgNzoZZl82EbrgRT1d5/+Hl1EcgTn QBPQsFmFVX/FIpO88evkAAIAsWZZKzkZX/bKkOZ6NkcXAFcRDgx+wgeNDiD+16lU/8oENF rStqqlbffJxeui1ovbg9xXNguSNTk6OmSWSjNUlpfoCkj/sfblupw1p4WdPfwF4mOCMeEO 0ID2Jy9OjRR87xFhDMNzo/3ggwMROVizBMn3qnVoo+GcAjzs4l8RHXhZsu5dMw== 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=95d5bef07d00345908a610defeda46cbfd7a4c25 commit 95d5bef07d00345908a610defeda46cbfd7a4c25 Author: Mikael Urankar AuthorDate: 2022-06-03 13:40:26 +0000 Commit: Mikael Urankar CommitDate: 2022-06-03 13:56:02 +0000 www/deno: Fix build on aarch64 - Remove file-compilation-dir as it causes build failure on aarch64 While here: - drop binutils dependency, we can use llvm-ar instead - bump python version to 3.7 --- www/deno/Makefile | 7 +++---- .../patch-cargo-crates_v8_build_config_compiler_BUILD.gn | 11 +++++++---- .../patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/www/deno/Makefile b/www/deno/Makefile index d7147985c3e8..eb9182d5f892 100644 --- a/www/deno/Makefile +++ b/www/deno/Makefile @@ -1,6 +1,7 @@ PORTNAME= deno DISTVERSIONPREFIX= v DISTVERSION= 1.22.1 +PORTREVIONS= 1 CATEGORIES= www MAINTAINER= mikael@FreeBSD.org @@ -11,11 +12,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BROKEN_i386= cargo:warning=c/freebsd.c:31:10: error: conflicting types for 'get_cpu_speed' -BUILD_DEPENDS= binutils>0:devel/binutils \ - gn:devel/gn \ +BUILD_DEPENDS= gn:devel/gn \ libunwind>0:devel/libunwind -USES= cargo cpe gmake gnome ninja:build pkgconfig:build python:3.6+,build +USES= cargo cpe gmake gnome ninja:build pkgconfig:build python:3.7+,build USE_GITHUB= yes GH_ACCOUNT= denoland @@ -531,7 +531,6 @@ CARGO_ENV+= RUSTC_BOOTSTRAP=1 post-patch: ${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ - ${WRKSRC}/cargo-crates/v8-${V8_VERS}/build/toolchain/gcc_toolchain.gni \ ${WRKSRC}/cargo-crates/v8-${V8_VERS}/buildtools/third_party/libc++/BUILD.gn do-install: diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn index 63790742d0cf..b5b40dfe4d36 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.43.1/build/config/compiler/BUILD.gn.orig 2021-02-25 20:45:34 UTC -+++ cargo-crates/v8-0.43.1/build/config/compiler/BUILD.gn +--- cargo-crates/v8-0.43.1/build/config/compiler/BUILD.gn.orig 1973-11-29 22:33:09.000000000 +0100 ++++ cargo-crates/v8-0.43.1/build/config/compiler/BUILD.gn 2022-05-31 15:40:38.996239000 +0200 @@ -137,7 +137,7 @@ declare_args() { # # TODO(crbug.com/1131993): Enabling this when 'is_android' is true breaks @@ -45,9 +45,12 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1265,7 +1265,7 @@ config("compiler_deterministic") { +@@ -1263,9 +1263,9 @@ config("compiler_deterministic") { + } else { + # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= # and -fcoverage-compilation-dir=. - cflags += [ "-ffile-compilation-dir=." ] +- cflags += [ "-ffile-compilation-dir=." ] ++# cflags += [ "-ffile-compilation-dir=." ] } - if (!is_win) { + if (!is_win && !is_bsd) { diff --git a/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni b/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni index a5841a6cbae7..540ba445509e 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni +++ b/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni @@ -29,7 +29,7 @@ + cxx = "c++" + ld = cxx + readelf = "readelf" -+ ar = "${prefix}/ar" ++ ar = "llvm-ar" + nm = "${prefix}nm" + } else { + prefix = rebase_path("$clang_base_path/bin", root_build_dir)