From nobody Mon Dec 20 05:47:28 2021 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 2073F190AD23; Mon, 20 Dec 2021 05:47:29 +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 4JHTBS62Dpz4sKx; Mon, 20 Dec 2021 05:47:28 +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 AB1B611080; Mon, 20 Dec 2021 05:47:28 +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 1BK5lSGE073583; Mon, 20 Dec 2021 05:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BK5lSWA073582; Mon, 20 Dec 2021 05:47:28 GMT (envelope-from git) Date: Mon, 20 Dec 2021 05:47:28 GMT Message-Id: <202112200547.1BK5lSWA073582@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 4f5918121c63 - main - devel/electron13: adjust GN args when DEBUG option is ON/OFF 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f5918121c63e237055c6fa5412b8972a6f96c5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639979248; 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=aWdqEbPe54pVX9V/YpAxuO8K4LAlZvULvSIbyaS6RKY=; b=pFDMzaCApw/hXmAan+nc6pGVCTCrEeA/qHatOPUdMfTZ/9IRtRvPvZRx/nhHauHKhsINqZ CiN6KWg7NXAf+WLjFbbzCU1VsWuGJxEZjgQthocIIw+zY2BkmHYjStTiM5HbUCXOFuGiX6 NW8mKpZz35rRedK8kh2FCpXDXek2ka7vMeBWQRxw8BQxaPOaH1dB+xXByotsc+6lLl/Nih m8bHTYQ7hDY4NaYfZ3uM4lUyhE4ipvl7dB1o+ew82tRrR5aP9XPv3DZhgUCuHvTaZYEYXq jmixFPEWyr/VjPCUCFujQ8JnzoeaTfCzreDYNftm2BTPjZzA4C8/LEYuIaAvgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639979248; a=rsa-sha256; cv=none; b=qBjjaww+AVdwtvhRdRX4brTSDfkCUM5zoD6kjmkkEQIFDTAkaSSpa+RZPkNmS8hEyJqCAg ZRwW6A0YfrLBsn61obh5bOrkvyyB0j9mchLydB/A61y5Bbx7E5tOi/2PChQuGlibkQaNz1 zaQZ6VCoggY0U7UWSiLfCaxpUlw2Us1HRVwV+DUvc/dWsjco1E74tKmrgPe+tYJ+PLO+u3 QrpwHdyP9/Q/xci0UKIUgkz6+luz21xsjaG9Zm8xTajl4N7YIjdSyBXhEFrNFdrB3p4d3s hy16Dkhe3KxJ3vMBbRbD7HNWU+ip+fDo94UjfuXLNo6YMA5ETTDRMMJjuiO3Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f5918121c63e237055c6fa5412b8972a6f96c5a commit 4f5918121c63e237055c6fa5412b8972a6f96c5a Author: Hiroki Tagato AuthorDate: 2021-12-20 05:46:01 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-20 05:46:01 +0000 devel/electron13: adjust GN args when DEBUG option is ON/OFF While here, remove BROKEN on i386. It builds fine on i386 now. --- devel/electron13/Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/devel/electron13/Makefile b/devel/electron13/Makefile index ab0af69b4f01..2f7e7c1a9435 100644 --- a/devel/electron13/Makefile +++ b/devel/electron13/Makefile @@ -1,7 +1,7 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts @@ -17,8 +17,6 @@ COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS LICENSE= MIT LICENSE_FILE= ${WRKSRC}/electron/LICENSE -BROKEN_i386= LLVM ERROR: out of memory - FETCH_DEPENDS= yarn-node14>0:www/yarn-node14 EXTRACT_DEPENDS= yarn-node14>0:www/yarn-node14 PATCH_DEPENDS= git:devel/git @@ -107,8 +105,15 @@ ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false -DEBUG_VARS= BUILDTYPE=Testing -DEBUG_VARS_OFF= BUILDTYPE=Release +DEBUG_VARS= BUILDTYPE=Debug \ + GN_FILE=testing.gn \ + GN_ARGS+=is_debug=true \ + GN_BOOTSTRAP_FLAGS+=--debug +DEBUG_VARS_OFF= BUILDTYPE=Release \ + GN_FILE=release.gn \ + GN_ARGS+=blink_symbol_level=0 \ + GN_ARGS+=is_debug=false \ + GN_ARGS+=symbol_level=0 DIST_IMPLIES= DRIVER DRIVER_ALL_TARGET= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true @@ -241,8 +246,8 @@ do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/Release/gn gen out/${BUILDTYPE} \ - --args='import("//electron/build/args/${BUILDTYPE:tl}.gn") ${GN_ARGS}' + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \ + --args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}' # Setup nodejs dependency ${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node