On Tue, Jun 13, 2023 at 07:59:55PM +0200, Matthias Schmidt wrote:
> Hi Sebastien,
>
> * Sebastien Marie wrote:
> > Hi,
> >
> > Could you test the following patch in ports/lang/luajit ?
> >
> > I don't bump REVISION on purpose for testing.
> >
> > The patches are enough to make the "testsuite" to pass, but as it is just
> > running luajit -e "print('hello world')" I am unsure that it is enough.
> >
> > Some real testing would be welcome.
> >
> > To test:
> > $ cd /usr/ports/lang/luajit
> > $ patch -p0 < luajit.diff
> > $ make && make repackage
> > $ make reinstall
> >
> > If SIGILL still occurs, please report the egdb backtrace.
>
> I followed your steps above and verified that the new luajit package is
> installed. Before:
>
> $ luajit51 -e "print('hello world')"
> Illegal instruction (core dumped)
>
> With your patch:
>
> $ luajit51 -e "print('hello world')"
> hello world
>
> However, neovim still fails
>
It is failing in a patched function...
Now, looking at editors/neovim, some points:
- neovim links statically to luajit, so neovim will need rebuild too
- neovim uses a specific luajit version, and embedded it (it is not using the
lang/luajit version)
So the simplest for now will be to mark neovim as NOBTCFI, and revisit it later.
Patch below. I added a comment to explain why I annotated it.
Matthias, could you test to rebuild neovim with the following patch ?
Comments or OK ?
--
Sebastien Marie
diff /home/semarie/repos/openbsd/ports
commit - 9f14fba0ea9f3f2b2e52790dfd19c7cfd4dd39fb
path + /home/semarie/repos/openbsd/ports
blob - ff693f4e30e625251cbb4dbf649d75c00343efdd
file + editors/neovim/Makefile
--- editors/neovim/Makefile
+++ editors/neovim/Makefile
@@ -15,6 +15,9 @@ CATEGORIES = editors devel
GH_PROJECT = neovim
GH_TAGNAME = v0.9.1
+# embedded luajit
+USE_NOBTCFI = Yes
+
CATEGORIES = editors devel
HOMEPAGE = https://neovim.io
MAINTAINER = Edd Barrett <e...@openbsd.org>
