From owner-svn-src-stable-12@freebsd.org Mon Apr 6 04:06:16 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4030A27FDEC; Mon, 6 Apr 2020 04:06:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48wcRD0WKgz4S72; Mon, 6 Apr 2020 04:06:16 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C74C21E30; Mon, 6 Apr 2020 04:06:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03646FRT004755; Mon, 6 Apr 2020 04:06:15 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03646FTc004754; Mon, 6 Apr 2020 04:06:15 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202004060406.03646FTc004754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 6 Apr 2020 04:06:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359646 - stable/12/libexec/flua X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/12/libexec/flua X-SVN-Commit-Revision: 359646 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2020 04:06:16 -0000 Author: kevans Date: Mon Apr 6 04:06:15 2020 New Revision: 359646 URL: https://svnweb.freebsd.org/changeset/base/359646 Log: MFC r359453, r359455 r359453: flua: enable readline bits, courtesy of libedit This is a nicer experience when attempting to run ad-hoc lua bits in the flua REPL. r359455: flua: follow-up to r359453, don't bother with libedit in bootstrap The bootstrap flua should not be used for REPL-like activities; exclude it to save the dependency on libedit and not waste time with it. PR: 245121 Modified: stable/12/libexec/flua/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/flua/Makefile ============================================================================== --- stable/12/libexec/flua/Makefile Mon Apr 6 01:28:03 2020 (r359645) +++ stable/12/libexec/flua/Makefile Mon Apr 6 04:06:15 2020 (r359646) @@ -35,4 +35,12 @@ SRCS+= lfs.c lposix.c CFLAGS+= -I${.CURDIR} -I${.CURDIR}/modules -I${LUASRC} CFLAGS+= -DLUA_PROGNAME="\"${PROG}\"" +# readline bits; these aren't needed if we're building a bootstrap flua, as we +# don't expect that one to see any REPL usage. +.if !defined(BOOTSTRAPPING) +CFLAGS+= -DLUA_USE_READLINE +CFLAGS+= -I${SRCTOP}/lib/libedit -I${SRCTOP}/contrib/libedit +LIBADD+= edit +.endif + .include