From nobody Fri Oct 14 18:02:31 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 4MpvP35F4jz4fyCd; Fri, 14 Oct 2022 18:02:31 +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 4MpvP34rjdz3RGF; Fri, 14 Oct 2022 18:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665770551; 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=NElw8b8wylZ6DQ/XxgVPxf5+L5+CLauALPiCJL7P310=; b=n0w4TtTQmFlxB19UITme1dLtL5D1HP3EIEzXwf0PkKhhKeH84sU9ULDzvPD7lattXJq5Vb EpqAFTbVBZ87WQKZd4nMLUGLE7WuNfylBS+8zzhXuMj/8P5Yd6LZFLCeu0k27/0Q0IObBU A15wk8SjPVfEUGKROegaYNIpXgKRZE919Lhdog+YG9gU8Vffs2zWioy+L2Qne6zqXZk26Z n0VvSr9YOSIhPoM+mrj7m+SawHACEAe0idTKNlz54FZQnGdWkmVw7AVhLG46ZYhYZC28e0 dCSPt3n95ClkiMCifq1L+lMe+X2DAIPUbk8dTIQWFk4zrozaEF9Lul4RLA0Keg== 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 4MpvP33mYqzrqP; Fri, 14 Oct 2022 18:02:31 +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 29EI2Vao088953; Fri, 14 Oct 2022 18:02:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EI2VGr088952; Fri, 14 Oct 2022 18:02:31 GMT (envelope-from git) Date: Fri, 14 Oct 2022 18:02:31 GMT Message-Id: <202210141802.29EI2VGr088952@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a6b06460a563 - main - Uses/luajit.mk: Set a path to the luajit headers 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: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6b06460a563185c4d13db874052ae989f8cb556 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665770551; 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=NElw8b8wylZ6DQ/XxgVPxf5+L5+CLauALPiCJL7P310=; b=XjxivWG7itlgiZvhbMqK486XYObBREL9DUHKCVSKW1l31LpmTtC+MKegsVcEJGdcypF2by kxzPHTYXgA6MtU8YD4JX9KMNixykJkNbF5cId8T/EdEHHtluNRTD0MLo9cKG0w+KelH9kh rDsL2BASjhlXRwf2p6Z3NkccWp6Cto3nN/iDb1hVtFvLypkc0lkFqyML33UXXOLKt+I92X kw2JTNClNGQLFzArS+uVwr5GJqsUGA/SXmrUlUI9nHF6hmH4xJyICwkOrUrjp6+8lxpWNB yCPdQDWmy0mAcMOIO+lWsl1gkYITYT109U0PBeAqCZhxrJt0pSxLfChGK9JxFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665770551; a=rsa-sha256; cv=none; b=xpPWpzpCyLBb/y+tBYvgmiBd0w1by2exsmY1gJ1yYG8tuY7SFPN1KudAS7W05GmNLVt3OO EJKDdf/x6J23yG4/NBAVj5FPAHNsnwjQnp3tQzzKENSzGOMSHFm0Tnz+qc+X4vjTGkarMA oRuAU8gJXMybMdE3cNpD1+euUceU1gIn1pJdLfxmmsflafx9xP1d7P8GMqDweYYbnDaMBH /ZMWt0REKrKEsFJ7qBjWLwUIn2OvaSSRnWKlC/KCS46YtM7x/s9N1LpX8ak84DIZzXi/8R Sjl+2wSTIZFquInoz/+OeLXi/HFvczU1UNswM2awClwTBdZkNEEQXHn1G+6V3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6b06460a563185c4d13db874052ae989f8cb556 commit a6b06460a563185c4d13db874052ae989f8cb556 Author: Adam Weinberger AuthorDate: 2022-10-14 18:02:19 +0000 Commit: Adam Weinberger CommitDate: 2022-10-14 18:02:27 +0000 Uses/luajit.mk: Set a path to the luajit headers --- Mk/Uses/luajit.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk index c2be165d1353..452370b55de6 100644 --- a/Mk/Uses/luajit.mk +++ b/Mk/Uses/luajit.mk @@ -3,6 +3,10 @@ # Usage: USES= luajit[:version] # MAINTAINER: adamw@FreeBSD.org +# After bsd.port.options.mk or bsd.port.pre.mk, the following are set: +# LUAJIT_VER: The selected luajit version +# LUAJIT_INCDIR: The path to luajit's header files + .if !defined(_INCLUDE_USES_LUAJIT_MK) _INCLUDE_USES_LUAJIT_MK=yes @@ -22,6 +26,12 @@ IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${V IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER} .endif +.if ${LUAJIT_VER} == luajit +LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-2.0 +.else +LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-2.1 +.endif + LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER} .endif