Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Nov 2016 08:51:59 +0000 (UTC)
From:      Matthew Seaman <matthew@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r425925 - branches/2016Q4/games/tome4
Message-ID:  <201611120851.uAC8pxjv019992@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: matthew
Date: Sat Nov 12 08:51:59 2016
New Revision: 425925
URL: https://svnweb.freebsd.org/changeset/ports/425925

Log:
  MFH: r425910 r425913
  
  Use the portable vesion of luajit when building on aarch64
  
  PR:		214411
  Submitted by:	lifanov@mail.lifanov.com (maintainer)
  
  Fix build from command-line: use-before-defined of ${ARCH}
  
  Curiously, test bulding with poudriere worked fine.
  
  PR:		214411
  Reported by:	FreshPorts sanity checking
  
  Approved by:	ports-secteam (junovitch)

Modified:
  branches/2016Q4/games/tome4/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/games/tome4/Makefile
==============================================================================
--- branches/2016Q4/games/tome4/Makefile	Sat Nov 12 08:51:34 2016	(r425924)
+++ branches/2016Q4/games/tome4/Makefile	Sat Nov 12 08:51:59 2016	(r425925)
@@ -33,9 +33,17 @@ USE_CSTD=	gnu89
 SUB_FILES=	tome4
 MAKE_JOBS_UNSAFE=yes
 
+LUA_TYPE=
+
+.include <bsd.port.pre.mk>
+
 pre-build:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/premake4.lua
+.if ${ARCH} == aarch64
+	(cd ${WRKSRC} && premake4 --lua=default gmake)
+.else
 	(cd ${WRKSRC} && premake4 gmake)
+.endif
 	@${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make
 
 do-install:
@@ -46,4 +54,4 @@ do-install:
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



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