Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Jan 2023 23:16:38 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cfd258bf065b - main - lang/luajit-devel: allow using clang on powerpc by merging an upstream commit
Message-ID:  <202301182316.30INGcil027225@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cfd258bf065b12df3c82173cef168626d40f81a5

commit cfd258bf065b12df3c82173cef168626d40f81a5
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-01-18 22:55:24 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-01-18 23:16:07 +0000

    lang/luajit-devel: allow using clang on powerpc by merging an upstream commit
---
 lang/luajit-devel/Makefile | 14 +++++++++-----
 lang/luajit-devel/distinfo |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lang/luajit-devel/Makefile b/lang/luajit-devel/Makefile
index 4311ced9f36f..e1872ebc460c 100644
--- a/lang/luajit-devel/Makefile
+++ b/lang/luajit-devel/Makefile
@@ -4,6 +4,9 @@ CATEGORIES=	lang
 PKGNAMESUFFIX=	-devel
 DISTNAME=	LuaJIT-${DISTVERSION}
 
+PATCH_SITES=	https://github.com/LuaJIT/LuaJIT/commit/
+PATCHFILES=	a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch:-p1
+
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Just-In-Time Compiler for Lua
 WWW=		https://luajit.org/luajit.html
@@ -16,7 +19,7 @@ IGNORE_riscv64=		fails to compile: lj_arch.h:73:2: No support for this architect
 
 CONFLICTS_INSTALL=	luajit luajit-openresty
 
-USES=		cpe gmake
+USES=		compiler cpe gmake
 USE_LDCONFIG=	yes
 MAKE_ARGS=	CC=${CC} CCOPT= CCOPT_x86= Q=
 
@@ -28,10 +31,11 @@ LUAJIT_SOVERSION=	2.1.0
 
 PLIST_SUB+=	VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION}
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*}
-USE_GCC=yes
+.if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} < 140
+BUILD_DEPENDS+=	as:devel/binutils
+CFLAGS+=	-fno-integrated-as
 .endif
 
 post-install:
@@ -39,4 +43,4 @@ post-install:
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/luajit-devel/distinfo b/lang/luajit-devel/distinfo
index c3647443f762..21ff3906e8a7 100644
--- a/lang/luajit-devel/distinfo
+++ b/lang/luajit-devel/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1672157314
+TIMESTAMP = 1674081862
 SHA256 (LuaJIT-LuaJIT-2.1.0.20221221-a04480e_GH0.tar.gz) = 613cb1adf3b31cfce8e1057ce37aad431322b88ce80fc5bb5824285d130aeb6b
 SIZE (LuaJIT-LuaJIT-2.1.0.20221221-a04480e_GH0.tar.gz) = 1074259
+SHA256 (a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch) = 172ee031fa64644b91c74b8488f976b39215bd128e5217eb93791729bd20916a
+SIZE (a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch) = 831



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301182316.30INGcil027225>