From owner-svn-src-projects@FreeBSD.ORG  Wed Mar 25 06:04:40 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E56FCD5D;
 Wed, 25 Mar 2015 06:04:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 D152E929;
 Wed, 25 Mar 2015 06:04:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2P64eQH057367;
 Wed, 25 Mar 2015 06:04:40 GMT (envelope-from rpaulo@FreeBSD.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2P64elr057366;
 Wed, 25 Mar 2015 06:04:40 GMT (envelope-from rpaulo@FreeBSD.org)
Message-Id: <201503250604.t2P64elr057366@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to
 rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 25 Mar 2015 06:04:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r280486 - projects/lua-bootloader/sys/boot/i386/loader
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Mar 2015 06:04:41 -0000

Author: rpaulo
Date: Wed Mar 25 06:04:39 2015
New Revision: 280486
URL: https://svnweb.freebsd.org/changeset/base/280486

Log:
  Add some glue to i386/loader to build with Lua support.

Modified:
  projects/lua-bootloader/sys/boot/i386/loader/Makefile

Modified: projects/lua-bootloader/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/i386/loader/Makefile	Wed Mar 25 06:03:34 2015	(r280485)
+++ projects/lua-bootloader/sys/boot/i386/loader/Makefile	Wed Mar 25 06:04:39 2015	(r280486)
@@ -48,6 +48,11 @@ LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 .endif
 
+.if ${MK_LUA} != "no"
+BOOT_LUA=	yes
+LIBLUA=		${.OBJDIR}/../../liblua/liblua.a
+.endif
+
 .if defined(LOADER_BZIP2_SUPPORT)
 CFLAGS+=	-DLOADER_BZIP2_SUPPORT
 .endif
@@ -124,8 +129,10 @@ FILES+= menu.rc
 # XXX crt0.o needs to be first for pxeboot(8) to work
 OBJS=	${BTXCRT}
 
-DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
+DPADD=	${LIBFICL} ${LIBLUA} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} \
+	${LIBSTAND}
+LDADD=	${LIBFICL} ${LIBLUA} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} \
+	${LIBSTAND}
 
 .include <bsd.prog.mk>