From nobody Wed Dec 1 17:33:15 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 C469918ADD93; Wed, 1 Dec 2021 17:33: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 4J45lb34KLz4mlX; Wed, 1 Dec 2021 17:33:15 +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 41DA96259; Wed, 1 Dec 2021 17:33:15 +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 1B1HXF0g053320; Wed, 1 Dec 2021 17:33:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B1HXFQR053319; Wed, 1 Dec 2021 17:33:15 GMT (envelope-from git) Date: Wed, 1 Dec 2021 17:33:15 GMT Message-Id: <202112011733.1B1HXFQR053319@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: 3f266e2df137 - main - www/firefox: 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: 3f266e2df137fcd6ad7923178beec6a4ec8e1d95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638379995; 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=L1PYGYO9zcgcOvSR+6/7lfS/uuB7gwhhl8Jp4PExWTE=; b=pNR+5Zewg7JeXT2fhHFUHXfOwmWAnS+JgG/gfW9yEG/O/zj+nzk1Y2MiA+VDQb0r3Il3pf 7DUeB9fGwG9kHvEjp+8NbaV+q32EPldWIKT44H0KSF3/s7C+XzikZPhWe4OgA/OO5hI1i8 +D6fZy+6G1qXIHP4Nhm8NqZeL7I49+zquhFNu870FgYihTj/wB7e6CDALG1MBneRvTEViq FRGzJMNEzlvThUmePzFw0/JoCqEZDAC1LxuDlMUCI4C+bXsbPbKLDApkfi0ue9v7WOzOvC 5zdMj+QQqsc/x5+oFFORDtQzHKqSLtzCD+X4v5foqfRC3qseb1OsXAx35oMxuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638379995; a=rsa-sha256; cv=none; b=X/Q/HLINUq53Pk74J2lvENwnaCVHQTj9sF7ctEu8wkqD/4gy9OImr7JzuebSPbW8idYPs2 4PyYRbX1Ye30RhNIIAIhdfv4Th5ZP9Txuez+kFSnYp6PhYBYqxPKEMH+qJ3Ge/kneMM94z Nv0eCTa6LflueUMiFhib1RA1sNIuSQ7jy7Li1JldZzBvm9JjEp9gAUd4eLQoBhF/bKLQ2b v7bOfjhlyDM7NEkUhKp0Phaqu/TjIcU4dulh0dVUOdnCh08h0JFj9gP+BG2Ud+b1Op02HC 4wwpuI/lWOsoeCZCfuPTkVXQtlguCOo1drsEx4O9TwITRe35XrexlPg5U607XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f266e2df137fcd6ad7923178beec6a4ec8e1d95 commit 3f266e2df137fcd6ad7923178beec6a4ec8e1d95 Author: Piotr Kubaj AuthorDate: 2021-12-01 17:25:27 +0000 Commit: Piotr Kubaj CommitDate: 2021-12-01 17:25:27 +0000 www/firefox: fix build on powerpc64 WASM is not supported on big-endian. --- www/firefox/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ab6318e47579..daba88d04a94 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -24,10 +24,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ - zip:archivers/zip \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ - ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} + zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr @@ -43,11 +40,21 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ - --enable-official-branding \ - --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot + --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" +.include + +.if ${ARCH} == powerpc64 +MOZ_OPTIONS+= --without-wasm-sandboxed-libraries +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ + ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} +MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot +.endif + post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \