From owner-dev-commits-src-branches@freebsd.org Sun Jan 24 03:43:51 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 4420D4E9DB4; Sun, 24 Jan 2021 03:43:51 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNf470x7Mz3tTG; Sun, 24 Jan 2021 03:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 117E61CF27; Sun, 24 Jan 2021 03:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10O3hole067633; Sun, 24 Jan 2021 03:43:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10O3hoXi067632; Sun, 24 Jan 2021 03:43:50 GMT (envelope-from git) Date: Sun, 24 Jan 2021 03:43:50 GMT Message-Id: <202101240343.10O3hoXi067632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6a61f08108fe - stable/12 - flua: support "require" for binary objects in the base system MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6a61f08108fe863efdb1170125c69d39ec171b30 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2021 03:43:51 -0000 The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6a61f08108fe863efdb1170125c69d39ec171b30 commit 6a61f08108fe863efdb1170125c69d39ec171b30 Author: Ed Maste AuthorDate: 2020-08-13 23:13:05 +0000 Commit: Kyle Evans CommitDate: 2021-01-24 03:43:24 +0000 flua: support "require" for binary objects in the base system Export symbols from flua, and enable dlopen. (cherry picked from commit 3bd8419597b44dc3da2b1e6ffc2c7ee9cf4aa195) --- lib/liblua/luaconf.h | 1 + libexec/flua/Makefile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/liblua/luaconf.h b/lib/liblua/luaconf.h index db6f3222f101..6226e8ab1e84 100644 --- a/lib/liblua/luaconf.h +++ b/lib/liblua/luaconf.h @@ -75,6 +75,7 @@ /* Local modifications: need io.popen */ #ifdef __FreeBSD__ #define LUA_USE_POSIX +#define LUA_USE_DLOPEN #endif /* diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 4b5c4ee55416..373f93cbf176 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -32,4 +32,6 @@ CFLAGS+= -I${SRCTOP}/lib/libedit -I${SRCTOP}/contrib/libedit LIBADD+= edit .endif +LDFLAGS+= -Wl,-E + .include