From owner-svn-src-head@freebsd.org Fri Aug 14 02:22:20 2020 Return-Path: Delivered-To: svn-src-head@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 7F9E83B2043; Fri, 14 Aug 2020 02:22:20 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BSRzJ2pnGz475M; Fri, 14 Aug 2020 02:22:20 +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 3FED726CE6; Fri, 14 Aug 2020 02:22:20 +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 07E2MKf6080916; Fri, 14 Aug 2020 02:22:20 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07E2MJu5080914; Fri, 14 Aug 2020 02:22:19 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008140222.07E2MJu5080914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 14 Aug 2020 02:22:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364226 - in head: lib/liblua libexec/flua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: lib/liblua libexec/flua X-SVN-Commit-Revision: 364226 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2020 02:22:20 -0000 Author: kevans Date: Fri Aug 14 02:22:19 2020 New Revision: 364226 URL: https://svnweb.freebsd.org/changeset/base/364226 Log: flua: don't allow dlopen, et al., for bootstrap flua There are some logistics issues that need to be sorted out here before we can actually allow this to work. Modified: head/lib/liblua/luaconf.h head/libexec/flua/Makefile Modified: head/lib/liblua/luaconf.h ============================================================================== --- head/lib/liblua/luaconf.h Fri Aug 14 00:55:48 2020 (r364225) +++ head/lib/liblua/luaconf.h Fri Aug 14 02:22:19 2020 (r364226) @@ -75,7 +75,9 @@ /* Local modifications: need io.popen */ #ifdef __FreeBSD__ #define LUA_USE_POSIX +#ifndef BOOTSTRAPPING #define LUA_USE_DLOPEN +#endif #endif /* Modified: head/libexec/flua/Makefile ============================================================================== --- head/libexec/flua/Makefile Fri Aug 14 00:55:48 2020 (r364225) +++ head/libexec/flua/Makefile Fri Aug 14 02:22:19 2020 (r364226) @@ -30,6 +30,10 @@ CFLAGS+= -DLUA_PROGNAME="\"${PROG}\"" CFLAGS+= -DLUA_USE_READLINE CFLAGS+= -I${SRCTOP}/lib/libedit -I${SRCTOP}/contrib/libedit LIBADD+= edit +LDFLAGS+= -Wl,-E +.else +# We don't support dynamic libs on bootstrap builds. +CFLAGS+= -DBOOTSTRAPPING .endif UCLSRC?= ${SRCTOP}/contrib/libucl @@ -37,7 +41,5 @@ UCLSRC?= ${SRCTOP}/contrib/libucl SRCS+= lua_ucl.c CFLAGS+= -I${UCLSRC}/include -I${UCLSRC}/src -I${UCLSRC}/uthash LIBADD+= ucl - -LDFLAGS+= -Wl,-E .include