From owner-svn-src-projects@FreeBSD.ORG Wed Apr 1 17:36:52 2015 Return-Path: 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 DAFB7F54; Wed, 1 Apr 2015 17:36:51 +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 C59B7EC1; Wed, 1 Apr 2015 17:36:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t31Hap7N000988; Wed, 1 Apr 2015 17:36:51 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t31HaoLL000984; Wed, 1 Apr 2015 17:36:50 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201504011736.t31HaoLL000984@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Wed, 1 Apr 2015 17:36:50 +0000 (UTC) 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 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2015 17:36:52 -0000 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 +.include -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 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