Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Apr 2015 17:36:50 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r280963 - in projects/lua-bootloader/sys/boot: liblua userboot userboot/liblua userboot/userboot
Message-ID:  <201504011736.t31HaoLL000984@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rpaulo
Date: Wed Apr  1 17:36:49 2015
New Revision: 280963
URL: https://svnweb.freebsd.org/changeset/base/280963

Log:
  Add Lua support to userboot.

Added:
  projects/lua-bootloader/sys/boot/userboot/liblua/
  projects/lua-bootloader/sys/boot/userboot/liblua/Makefile   (contents, props changed)
Modified:
  projects/lua-bootloader/sys/boot/liblua/Makefile
  projects/lua-bootloader/sys/boot/userboot/Makefile
  projects/lua-bootloader/sys/boot/userboot/userboot/Makefile

Modified: projects/lua-bootloader/sys/boot/liblua/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/liblua/Makefile	Wed Apr  1 17:19:55 2015	(r280962)
+++ projects/lua-bootloader/sys/boot/liblua/Makefile	Wed Apr  1 17:36:49 2015	(r280963)
@@ -1,8 +1,13 @@
 # $FreeBSD$
 
-LUA_PATH=	${.CURDIR}/../../contrib/lua
+LUA_PATH?=	${.CURDIR}/../../contrib/lua
 .PATH:		${LUA_PATH}/src
 
+LIBLUA_PATH?=	${.CURDIR}/../liblua
+.PATH:		${LIBLUA_PATH}
+
+COMMON_PATH?=	${.CURDIR}/../common
+
 LIB=		lua
 INTERNALLIB=
 
@@ -20,7 +25,7 @@ WARNS=	3
 
 CFLAGS+= -ffreestanding -nostdlib
 CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE
-CFLAGS+= -I${.CURDIR}/../liblua -I${LUA_PATH} -I${.CURDIR}/../common
+CFLAGS+= -I${LIBLUA_PATH} -I${LUA_PATH} -I${COMMON_PATH}
 
 .if ${MACHINE_CPUARCH} == "i386" || \
     (${MACHINE_CPUARCH} == "amd64" && defined(LUA32))

Modified: projects/lua-bootloader/sys/boot/userboot/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/userboot/Makefile	Wed Apr  1 17:19:55 2015	(r280962)
+++ projects/lua-bootloader/sys/boot/userboot/Makefile	Wed Apr  1 17:36:49 2015	(r280963)
@@ -1,8 +1,19 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
+.include <src.opts.mk>
 
-SUBDIR=		ficl libstand test zfs userboot
+SUBDIR=		libstand
+
+.if ${MK_FORTH} != "no"
+SUBDIR+=	ficl
+.endif
+
+.if ${MK_LUA} != "no"
+SUBDIR+=	liblua
+.endif
+
+SUBDIR+=	test zfs userboot
 
 .include <bsd.subdir.mk>
 

Added: projects/lua-bootloader/sys/boot/userboot/liblua/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/lua-bootloader/sys/boot/userboot/liblua/Makefile	Wed Apr  1 17:36:49 2015	(r280963)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+LUA_PATH=	${.CURDIR}/../../../contrib/lua
+LIBLUA_PATH=	${.CURDIR}/../../liblua
+COMMON_PATH=	${.CURDIR}/../../common
+
+.include "${LIBLUA_PATH}/Makefile"

Modified: projects/lua-bootloader/sys/boot/userboot/userboot/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/userboot/userboot/Makefile	Wed Apr  1 17:19:55 2015	(r280962)
+++ projects/lua-bootloader/sys/boot/userboot/userboot/Makefile	Wed Apr  1 17:36:49 2015	(r280963)
@@ -50,6 +50,13 @@ CFLAGS+=	-DBF_DICTSIZE=15000
 LIBFICL=	${.OBJDIR}/../ficl/libficl.a
 .endif
 
+.if ${MK_LUA} != "no"
+BOOT_LUA=	yes
+CFLAGS+=        -DBOOT_LUA -I${.CURDIR}/../../liblua \
+		-I${.CURDIR}/../../../contrib/lua
+LIBLUA=		${.OBJDIR}/../liblua/liblua.a
+.endif
+
 LIBSTAND=	${.OBJDIR}/../libstand/libstand.a
 
 .if ${MK_ZFS} != "no"
@@ -62,7 +69,7 @@ LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} 
-LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
+DPADD+=		${LIBLUA} ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} 
+LDADD+=		${LIBLUA} ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
 
 .include <bsd.lib.mk>



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