On Wed, Oct 30, 2019, at 09:38, Edd Barrett wrote:
> Hi Travis,
>
> On Wed, Oct 23, 2019 at 11:02:28AM +0100, Stuart Henderson wrote:
> > So you should be able to do
> >
> > -DUSE_BUNDLED_GPERF=Off \
> > -DUSE_BUNDLED_UNIBILIUM=Off \
> > -DUSE_BUNDLED_LIBTERMKEY=Off \
> > -DUSE_BUNDLED_LIBVTERM=Off \
> > -DUSE_BUNDLED_LIBUV=Off \
> > -DUSE_BUNDLED_MSGPACK=Off \
> > -DUSE_BUNDLED_LUAJIT=Off \
> > -DUSE_BUNDLED_LUAROCKS=Off \
> > -DUSE_BUNDLED_LUV=On
>
> Any joy with Stuart's suggestion? ^
Hey Ed,
I've had limited time to try, but I did dig in a bit. I don't think it's so
simple as above
and I haven't got a successful build yet. Just setting the above makes it not
try
to use any bundled deps at all.
So I've tried to build the deps in pre-configure, which works, but still
haven't got a
successful build.
Here is the hacky WIP diff that does get a partial, but failing build.
diff --git Makefile Makefile
index e9b174a..173bbfe 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT = continuation and extension of Vim
GH_ACCOUNT = neovim
GH_PROJECT = neovim
-GH_TAGNAME = v0.3.8
+GH_TAGNAME = v0.4.2
CATEGORIES = editors devel
HOMEPAGE = https://neovim.io
@@ -14,7 +14,7 @@ MAINTAINER = Edd Barrett <[email protected]>
PERMIT_PACKAGE = Yes
WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey
-WANTLIB += unibilium util uv vterm
+WANTLIB += unibilium>=1.0 util uv vterm>=0.1
COMPILER = base-clang ports-gcc base-gcc
@@ -38,12 +38,28 @@ RUN_DEPENDS += devel/libmpack/lua \
devel/libmpack/main \
devel/desktop-file-utils
-MAKE_FLAGS += USE_BUNDLED_DEPS=OFF
CONFIGURE_ARGS += -DLUA_PRG=${MODLUA_BIN} \
-DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
-DLUA_LIBRARIES=${MODLUA_LIB} \
+ -DUSE_BUNDLED_GPERF=Off \
+ -DUSE_BUNDLED_UNIBILIUM=Off \
+ -DUSE_BUNDLED_LIBTERMKEY=Off \
+ -DUSE_BUNDLED_LIBVTERM=Off \
+ -DUSE_BUNDLED_LIBUV=Off \
+ -DUSE_BUNDLED_MSGPACK=Off \
+ -DUSE_BUNDLED_LUAJIT=Off \
+ -DUSE_BUNDLED_LUAROCKS=Off \
+ -DUSE_BUNDLED_LUV=On \
+ -DLIBLUV_INCLUDE_DIR=${WRKBUILD}/deps/usr/include \
+ -DLIBLUV_LIBRARY=${WRKBUILD}/deps/usr/lib \
-DPREFER_LUA=ON # disables LuaJIT
+pre-configure:
+ mkdir -p ${WRKBUILD}/deps
+ @cd ${WRKBUILD}/deps && \
+ cmake -G 'Ninja' ${CONFIGURE_ARGS} ${WRKSRC}/third-party && \
+ ninja
+
# Tests need gmake
USE_GMAKE = Yes
# `test_startup_utf8.vim' requires either bash or zsh
The failure is here:
FAILED: bin/nvim
: && /home/pobj/neovim-0.4.2/bin/cc -O2 -pipe -Wall -DNDEBUG
-DMIN_LOG_LEVEL=3 -flto=thin -Wl,--no-undefined
src/nvim/CMakeFiles/nvim.dir/auto/msgpack_lua_c_bindings.generated.c.o
src/nvim/CMakeFiles/nvim.dir/__/__/config/auto/pathdef.c.o
src/nvim/CMakeFiles/nvim.dir/api/buffer.c.o
src/nvim/CMakeFiles/nvim.dir/api/private/dispatch.c.o
src/nvim/CMakeFiles/nvim.dir/api/private/handle.c.o
src/nvim/CMakeFiles/nvim.dir/api/private/helpers.c.o
src/nvim/CMakeFiles/nvim.dir/api/tabpage.c.o
src/nvim/CMakeFiles/nvim.dir/api/ui.c.o
src/nvim/CMakeFiles/nvim.dir/api/vim.c.o
src/nvim/CMakeFiles/nvim.dir/api/window.c.o
src/nvim/CMakeFiles/nvim.dir/arabic.c.o src/nvim/CMakeFiles/nvim.dir/aucmd.c.o
src/nvim/CMakeFiles/nvim.dir/buffer.c.o
src/nvim/CMakeFiles/nvim.dir/buffer_updates.c.o
src/nvim/CMakeFiles/nvim.dir/change.c.o
src/nvim/CMakeFiles/nvim.dir/channel.c.o
src/nvim/CMakeFiles/nvim.dir/charset.c.o
src/nvim/CMakeFiles/nvim.dir/context.c.o
src/nvim/CMakeFiles/nvim.dir/cursor.c.o
src/nvim/CMakeFiles/nvim.dir/cursor_shape.c.o
src/nvim/CMakeFiles/nvim.dir/diff.c.o src/nvim/CMakeFiles/nvim.dir/digraph.c.o
src/nvim/CMakeFiles/nvim.dir/edit.c.o src/nvim/CMakeFiles/nvim.dir/eval.c.o
src/nvim/CMakeFiles/nvim.dir/eval/decode.c.o
src/nvim/CMakeFiles/nvim.dir/eval/encode.c.o
src/nvim/CMakeFiles/nvim.dir/eval/executor.c.o
src/nvim/CMakeFiles/nvim.dir/eval/gc.c.o
src/nvim/CMakeFiles/nvim.dir/eval/typval.c.o
src/nvim/CMakeFiles/nvim.dir/event/libuv_process.c.o
src/nvim/CMakeFiles/nvim.dir/event/loop.c.o
src/nvim/CMakeFiles/nvim.dir/event/multiqueue.c.o
src/nvim/CMakeFiles/nvim.dir/event/process.c.o
src/nvim/CMakeFiles/nvim.dir/event/rstream.c.o
src/nvim/CMakeFiles/nvim.dir/event/signal.c.o
src/nvim/CMakeFiles/nvim.dir/event/socket.c.o
src/nvim/CMakeFiles/nvim.dir/event/stream.c.o
src/nvim/CMakeFiles/nvim.dir/event/time.c.o
src/nvim/CMakeFiles/nvim.dir/event/wstream.c.o
src/nvim/CMakeFiles/nvim.dir/ex_cmds.c.o
src/nvim/CMakeFiles/nvim.dir/ex_cmds2.c.o
src/nvim/CMakeFiles/nvim.dir/ex_docmd.c.o
src/nvim/CMakeFiles/nvim.dir/ex_eval.c.o
src/nvim/CMakeFiles/nvim.dir/ex_getln.c.o
src/nvim/CMakeFiles/nvim.dir/file_search.c.o
src/nvim/CMakeFiles/nvim.dir/fileio.c.o src/nvim/CMakeFiles/nvim.dir/fold.c.o
src/nvim/CMakeFiles/nvim.dir/garray.c.o
src/nvim/CMakeFiles/nvim.dir/getchar.c.o
src/nvim/CMakeFiles/nvim.dir/hardcopy.c.o
src/nvim/CMakeFiles/nvim.dir/hashtab.c.o
src/nvim/CMakeFiles/nvim.dir/highlight.c.o
src/nvim/CMakeFiles/nvim.dir/if_cscope.c.o
src/nvim/CMakeFiles/nvim.dir/indent.c.o
src/nvim/CMakeFiles/nvim.dir/indent_c.c.o
src/nvim/CMakeFiles/nvim.dir/keymap.c.o src/nvim/CMakeFiles/nvim.dir/log.c.o
src/nvim/CMakeFiles/nvim.dir/lua/converter.c.o
src/nvim/CMakeFiles/nvim.dir/lua/executor.c.o
src/nvim/CMakeFiles/nvim.dir/main.c.o src/nvim/CMakeFiles/nvim.dir/map.c.o
src/nvim/CMakeFiles/nvim.dir/mark.c.o src/nvim/CMakeFiles/nvim.dir/math.c.o
src/nvim/CMakeFiles/nvim.dir/mbyte.c.o src/nvim/CMakeFiles/nvim.dir/memfile.c.o
src/nvim/CMakeFiles/nvim.dir/memline.c.o
src/nvim/CMakeFiles/nvim.dir/memory.c.o src/nvim/CMakeFiles/nvim.dir/menu.c.o
src/nvim/CMakeFiles/nvim.dir/message.c.o src/nvim/CMakeFiles/nvim.dir/misc1.c.o
src/nvim/CMakeFiles/nvim.dir/mouse.c.o src/nvim/CMakeFiles/nvim.dir/move.c.o
src/nvim/CMakeFiles/nvim.dir/msgpack_rpc/channel.c.o
src/nvim/CMakeFiles/nvim.dir/msgpack_rpc/helpers.c.o
src/nvim/CMakeFiles/nvim.dir/msgpack_rpc/server.c.o
src/nvim/CMakeFiles/nvim.dir/normal.c.o src/nvim/CMakeFiles/nvim.dir/ops.c.o
src/nvim/CMakeFiles/nvim.dir/option.c.o src/nvim/CMakeFiles/nvim.dir/os/dl.c.o
src/nvim/CMakeFiles/nvim.dir/os/env.c.o
src/nvim/CMakeFiles/nvim.dir/os/fileio.c.o
src/nvim/CMakeFiles/nvim.dir/os/fs.c.o
src/nvim/CMakeFiles/nvim.dir/os/input.c.o
src/nvim/CMakeFiles/nvim.dir/os/lang.c.o
src/nvim/CMakeFiles/nvim.dir/os/mem.c.o
src/nvim/CMakeFiles/nvim.dir/os/process.c.o
src/nvim/CMakeFiles/nvim.dir/os/pty_process_unix.c.o
src/nvim/CMakeFiles/nvim.dir/os/shell.c.o
src/nvim/CMakeFiles/nvim.dir/os/signal.c.o
src/nvim/CMakeFiles/nvim.dir/os/stdpaths.c.o
src/nvim/CMakeFiles/nvim.dir/os/time.c.o
src/nvim/CMakeFiles/nvim.dir/os/tty.c.o
src/nvim/CMakeFiles/nvim.dir/os/users.c.o
src/nvim/CMakeFiles/nvim.dir/os_unix.c.o src/nvim/CMakeFiles/nvim.dir/path.c.o
src/nvim/CMakeFiles/nvim.dir/popupmnu.c.o
src/nvim/CMakeFiles/nvim.dir/profile.c.o
src/nvim/CMakeFiles/nvim.dir/quickfix.c.o
src/nvim/CMakeFiles/nvim.dir/rbuffer.c.o
src/nvim/CMakeFiles/nvim.dir/regexp.c.o src/nvim/CMakeFiles/nvim.dir/screen.c.o
src/nvim/CMakeFiles/nvim.dir/search.c.o src/nvim/CMakeFiles/nvim.dir/sha256.c.o
src/nvim/CMakeFiles/nvim.dir/shada.c.o src/nvim/CMakeFiles/nvim.dir/sign.c.o
src/nvim/CMakeFiles/nvim.dir/spell.c.o
src/nvim/CMakeFiles/nvim.dir/spellfile.c.o
src/nvim/CMakeFiles/nvim.dir/state.c.o src/nvim/CMakeFiles/nvim.dir/strings.c.o
src/nvim/CMakeFiles/nvim.dir/syntax.c.o src/nvim/CMakeFiles/nvim.dir/tag.c.o
src/nvim/CMakeFiles/nvim.dir/terminal.c.o
src/nvim/CMakeFiles/nvim.dir/tui/input.c.o
src/nvim/CMakeFiles/nvim.dir/tui/terminfo.c.o
src/nvim/CMakeFiles/nvim.dir/tui/tui.c.o src/nvim/CMakeFiles/nvim.dir/ugrid.c.o
src/nvim/CMakeFiles/nvim.dir/ui.c.o src/nvim/CMakeFiles/nvim.dir/ui_bridge.c.o
src/nvim/CMakeFiles/nvim.dir/ui_compositor.c.o
src/nvim/CMakeFiles/nvim.dir/undo.c.o src/nvim/CMakeFiles/nvim.dir/version.c.o
src/nvim/CMakeFiles/nvim.dir/viml/parser/expressions.c.o
src/nvim/CMakeFiles/nvim.dir/viml/parser/parser.c.o
src/nvim/CMakeFiles/nvim.dir/window.c.o
src/nvim/CMakeFiles/nvim.dir/xdiff/xdiffi.c.o
src/nvim/CMakeFiles/nvim.dir/xdiff/xemit.c.o
src/nvim/CMakeFiles/nvim.dir/xdiff/xhistogram.c.o
src/nvim/CMakeFiles/nvim.dir/xdiff/xpatience.c.o
src/nvim/CMakeFiles/nvim.dir/xdiff/xprepare.c.o
src/nvim/CMakeFiles/nvim.dir/xdiff/xutils.c.o -o bin/nvim -L/usr/local/lib
-lintl -liconv deps/usr/lib -luv -lpthread -lmsgpackc -lvterm -ltermkey
-lunibilium -lpthread -lm -lutil -llua5.1 -lm
-Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
ld: error: cannot open deps/usr/lib: Is a directory
cc: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
*** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:34 'do-build': @cd
/home/pobj/neovim-0.4.2/build-amd64 && exec /usr/bin/env -i VERBOS...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2781
'/home/pobj/neovim-0.4.2/build-amd64/.build_done')
*** Error 1 in /usr/ports/mystuff/editors/neovim
(/usr/ports/infrastructure/mk/bsd.port.mk:2451 'build')
The reason that fails is obviously that 'deps/usr/lib' on the command line. But
I haven't had more time to track down why that's getting in there.
Would be happy to hear if I'm way off in the weeds here.
Thanks!
