From owner-svn-ports-branches@freebsd.org Sat Nov 12 08:52:00 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88517C3DC8F; Sat, 12 Nov 2016 08:52:00 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 567E51BD5; Sat, 12 Nov 2016 08:52:00 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAC8px3i019993; Sat, 12 Nov 2016 08:51:59 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAC8pxjv019992; Sat, 12 Nov 2016 08:51:59 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201611120851.uAC8pxjv019992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 12 Nov 2016 08:51:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425925 - branches/2016Q4/games/tome4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Nov 2016 08:52:00 -0000 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 + 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 +.include