From nobody Tue Jun 14 15:24:04 2022 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 0C54885B7E5; Tue, 14 Jun 2022 15:24:05 +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 4LMsfX6fCjz4pZN; Tue, 14 Jun 2022 15:24:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655220244; 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=7852HJJRRKrnuqIO4nfqfC2B25QgwUEfMxZ9UBG8rFE=; b=s8Zg8qRaB6tLcbU0vo51b2ecgb0HEBY7v9n45TSTLbbQp07X2AAirXUVBR4pCF3C0JH0WJ WZV1ylke8XhDUFzA/Y1ppGL3cpTE393IZZ6IE3KViAtIfMTbQrcW9MJ+BeArFEHhxPfa9J 11EAy+OM6iu1HjPx4YtshxJUqWhuIOMfsR2irb8CLpcihOD+ZZvH2y07zkWlPih4Azyz4Z YB+o6YocuWqtM6K1Jpe9ii/hM37fb7mbkRCk8BlLwzVjnpdTPcZ1S4e32qeuDr8O9TRf10 N/ewV09fMCbbyirLLugPOebUnLCjLb/RMjpi7S39APecP0cnBQ3+ME1qiX8KkA== 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 BA3C94E02; Tue, 14 Jun 2022 15:24:04 +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 25EFO4Bm030437; Tue, 14 Jun 2022 15:24:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25EFO4J3030436; Tue, 14 Jun 2022 15:24:04 GMT (envelope-from git) Date: Tue, 14 Jun 2022 15:24:04 GMT Message-Id: <202206141524.25EFO4J3030436@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 8261cd9789e7 - main - devel/efl: Add an option to use luajit-openresty as LUA interpreter. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8261cd9789e735901760b1ba7f2c7327e294bd58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655220244; 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=7852HJJRRKrnuqIO4nfqfC2B25QgwUEfMxZ9UBG8rFE=; b=bBttQvCDP0BgXQseoDhLsC3DWnw0fDC70f7brAO53hbBu+TDcIhhfzb4SwSEjL55b0ephf jmPwf94+KgWFFzWIktLxCayqiSaKStfKFTERl1jvEXa8zMTDl84PoW2RGK+ybre3mxuRTu 2IzWQh+LwJmqxndzBEaVCsmFenq6zRlW7x2ad3Oj8CC7eBVVccEiWOIHreTbt8wWrn3qGq Q1Gp055Q46rES3ruymkhv3AxUwM+WvuUiNwqscJfAry7vo7FbDpcEw5HSlR+LrKr82PNlx QGP9saCeZSQIU7iL41QrdWWcNJS5cR14IPMSJHIECpEdiXIrgvd9Xj0NOpEVGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655220244; a=rsa-sha256; cv=none; b=Q2YbxSyWakn5/jXirBtsbphwsJsJKr1EM7UL8VbKGERhwrUxKOWU9vi3sxVpB7u7KSn7CN 9Mm4SR3ZR+cPTQDzTD7IHZCgP7EcHpmNyJDquvRq5R5kTFtjsad/Zfx+HI+uj3unwb6fAz wCPwLd4FUXW6bPMfke2R44Bu6MDap9SyJnKFV1ssvcTnFh+qduWGbaFKFvoa5ze41dEG9O UYOKZy/GOQ6fDCYJmU5EBodh1nKlxDmujlXcwGoeHptZUWWIetaXFtqK1zKasIPCaD2Qga WxN/17UAmLkfQRGPFoTl2/pgYYHfxvOmtww1pIh1bpVSceiaSxo8kRmIM7Sjow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8261cd9789e735901760b1ba7f2c7327e294bd58 commit 8261cd9789e735901760b1ba7f2c7327e294bd58 Author: Volodymyr Kostyrko AuthorDate: 2022-06-14 15:19:18 +0000 Commit: Gleb Popov CommitDate: 2022-06-14 15:23:55 +0000 devel/efl: Add an option to use luajit-openresty as LUA interpreter. PR: 264313 Tested by: arrowd --- devel/efl/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/devel/efl/Makefile b/devel/efl/Makefile index 3d61dc86552b..0bb75f4ca6e4 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -53,11 +53,12 @@ OPTIONS_GROUP_WAYLAND= WAYLAND OPTIONS_SINGLE= CRYPTO ENGINE LUAL OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SINGLE_ENGINE= OPENGL OPENGLES NONE -OPTIONS_SINGLE_LUAL= LUAJIT LUALANG +OPTIONS_SINGLE_LUAL= LUAJIT LUAJIT_OR LUALANG OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SCIM XIM \ OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGLES LUAJIT CXX OPTIONS_DEFAULT_aarch64= LUALANG -OPTIONS_EXCLUDE_aarch64= LUAJIT +OPTIONS_EXCLUDE_aarch64= LUAJIT LUAJIT_OR +OPTIONS_EXCLUDE_powerpc64= LUAJIT OPTIONS_SUB= yes HARFBUZZ_DESC= OpenType text shaping engine @@ -74,6 +75,7 @@ HEIF_DESC= HEIF image format support LUAL_DESC= LUA LUALANG_DESC= Use Lua LUAJIT_DESC= Use Luajit +LUAJIT_OR_DESC= Use Luajit from OpenResty fork (experimental) OPENGLES_DESC= 2D/3D rendering support via OpenGL ES NONE_DESC= No acceleration, software only LUA_DESC= Lua Bindings @@ -167,11 +169,16 @@ WEBP_LIB_DEPENDS= libwebp.so:graphics/webp LUAJIT_BUILD_DEPENDS= luajit:lang/luajit LUAJIT_RUN_DEPENDS= luajit:lang/luajit LUAJIT_MESON_ON= -Dlua-interpreter=luajit -LUAJIT_PREVENTS= LUALANG +LUAJIT_PREVENTS= LUALANG LUAJIT_OR + +LUAJIT_OR_BUILD_DEPENDS= luajit:lang/luajit-openresty +LUAJIT_OR_RUN_DEPENDS= luajit:lang/luajit-openresty +LUAJIT_OR_MESON_ON= -Dlua-interpreter=luajit +LUAJIT_OR_PREVENTS= LUALANG LUAJIT LUALANG_USES= lua:51,build,run LUALANG_MESON_ON= -Dlua-interpreter=lua -LUALANG_PREVENTS= LUAJIT +LUALANG_PREVENTS= LUAJIT LUAJIT_OR OPENGL_USES= gl OPENGL_USE= GL=gl @@ -319,11 +326,6 @@ USE_GL= egl LIB_DEPENDS+= libunwind.so:devel/libunwind .endif -.if ${ARCH:Mpowerpc64*} -LUAJIT_BUILD_DEPENDS= luajit:lang/luajit-openresty -LUAJIT_RUN_DEPENDS= luajit:lang/luajit-openresty -.endif - post-install: #@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb @for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \