From nobody Wed Jan 18 09:28:46 2023 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 4NxgRz2Fltz2sgqQ; Wed, 18 Jan 2023 09:28:47 +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 4NxgRz1YVNz3y4q; Wed, 18 Jan 2023 09:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674034127; 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=kTTMh2nsEholI4+b3OhqHvgWgnB7O8bma6NLHc+Vx9I=; b=VWhEx7DgfRx15+70lPnw2IX5v9t6z2ATlfqTPKjAb3xHtcbENrDNXRjikYBoDWtOu7QBsw Tt5Vzj7dBE3mXxKi12xtJAnQG665PE7hyZ1Vmfot3QxWmx5mjsAIbOCPVYCCoeGYwjSMkL WrkrftA5GM4yZ1s5mlGgjf7fNZY7w2r6T5+iFIjrrLzq7j6n6yxsOqVIDwAeGNl888HOSZ wuThI0ktMSmb6AeFtE+iu1iQ/9Coq5njAQ7cWn/+i5cRwYo+kNlIT3yDbXya6rUIcIDOcp RyA446j4bKkWK31R/3T5KmtobrcWL8Q7n6brgM06mc4GiP1A+pJjliPtSxrYNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674034127; 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=kTTMh2nsEholI4+b3OhqHvgWgnB7O8bma6NLHc+Vx9I=; b=SpBpKiB75QRITp98ZXpTDdu5xd2yEA2Xw+LhZ/AJ6TLUxOestNOcTs7+B7eo/nAb5XcRqS RBu8xaPKm0iG2LxwvWWluKUViB9SEdV5SiniTL2IPaGPFZ525PUI83Z3SKCW5RlA7x/RXQ yynLgGVsI95TWufQVaK4eaPgjEri/CgGhuGzhSWHcmNmBVxpnqG1k9PBEoDPUuYZngbjTK yNN+KIo0EltJs0OqkpjAkqW0sIUGDdVd8K0/ibHARy6a0cJGedrgEfQlZZf4JfwsCGBd2b ouEjjhS/X7wCNNcTJSe0h3y2qfyZf3xrsAz036p54UvTsyeXowADDFmOvZ36hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674034127; a=rsa-sha256; cv=none; b=p8kRvPguJqQCi7/CZHnKd37yPjoNQgaq2rIeu/dXOlrk1t1iQY8JEJFH1aKQBMlNhY9k7Z U2da0bCaOyZk9Ntl6FtAMjpuE1NnXF6/0EbEMmCkB6eELPNR4qafAa5EzwjvSonRp+a6YA uxXactdG2DhyCiaAcj8zsqx9RtYDJMLtepUaCstnR1al7i+bDp6vtZnkFEcLbE2JlGr9GS HmR8/YWe5rRf7sa9D5aN+fP3CgbxUchJlaHMNi9MTa58HWjUlYPIY7pl0QwIHK1jLuc2S5 0/x88T+REcN0G5YhCsPhL8Os97fKVjSCBEENuxj7YDlErfTvlw7PcDCFUM4ubg== 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 4NxgRz0Vzxz15D0; Wed, 18 Jan 2023 09:28:47 +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 30I9SkYF038684; Wed, 18 Jan 2023 09:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30I9SkKG038683; Wed, 18 Jan 2023 09:28:46 GMT (envelope-from git) Date: Wed, 18 Jan 2023 09:28:46 GMT Message-Id: <202301180928.30I9SkKG038683@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: 36accb2aa9ec - main - misc/xplr: allow using the bundled luajit on powerpc 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: 36accb2aa9ec00038261cb8f00e9cd0f39dfde93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=36accb2aa9ec00038261cb8f00e9cd0f39dfde93 commit 36accb2aa9ec00038261cb8f00e9cd0f39dfde93 Author: Piotr Kubaj AuthorDate: 2023-01-18 09:26:59 +0000 Commit: Piotr Kubaj CommitDate: 2023-01-18 09:28:45 +0000 misc/xplr: allow using the bundled luajit on powerpc Requires merging the upstream patch that adds compatibility with clang. --- misc/xplr/Makefile | 12 +++++++----- ...ajit-src-210.4.3+resty8384278_luajit2_src_lj__arch.h | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile index 1b02b7d41562..0b761f3caf88 100644 --- a/misc/xplr/Makefile +++ b/misc/xplr/Makefile @@ -11,7 +11,7 @@ WWW= https://xplr.dev LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo desktop-file-utils gmake +USES= cargo compiler desktop-file-utils gmake USE_GITHUB= yes GH_ACCOUNT= sayanarijit @@ -186,9 +186,11 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-Cargo.toml LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty .endif -.if ${ARCH} == powerpc -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Cargo.toml -LIB_DEPENDS= libluajit-5.1.so:lang/luajit +.include + +.if ${ARCH} == powerpc && ${COMPILER_VERSION} < 140 +BUILD_DEPENDS+= as:devel/binutils +CFLAGS+= -fno-integrated-as .endif post-install: @@ -219,4 +221,4 @@ post-install-EXAMPLES-on: ${INSTALL_DATA} ${_EXAMPLES} \ ${STAGEDIR}${EXAMPLESDIR} -.include +.include diff --git a/misc/xplr/files/patch-cargo-crates_luajit-src-210.4.3+resty8384278_luajit2_src_lj__arch.h b/misc/xplr/files/patch-cargo-crates_luajit-src-210.4.3+resty8384278_luajit2_src_lj__arch.h new file mode 100644 index 000000000000..15b5ed053bf4 --- /dev/null +++ b/misc/xplr/files/patch-cargo-crates_luajit-src-210.4.3+resty8384278_luajit2_src_lj__arch.h @@ -0,0 +1,17 @@ +--- cargo-crates/luajit-src-210.4.3+resty8384278/luajit2/src/lj_arch.h.orig 2023-01-17 22:53:47 UTC ++++ cargo-crates/luajit-src-210.4.3+resty8384278/luajit2/src/lj_arch.h +@@ -499,8 +499,14 @@ + #endif + #endif + #elif !LJ_TARGET_PS3 ++#if __clang__ ++#if ((__clang_major__ < 3) || ((__clang_major__ == 3) && __clang_minor__ < 5)) ++#error "Need at least Clang 3.5 or newer" ++#endif ++#else + #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) + #error "Need at least GCC 4.3 or newer" ++#endif + #endif + #endif + #endif