Hi ports, Edd, > http://build-failures.rhaalovely.net//powerpc/2019-02-04/editors/neovim.log
It seems the issue has been introduced when upstream added OpenBSD support [1]. The diff drops the global -lc++abi flag to use it only on base-clang archs. I've bumped revision, as it may change flags on some archs, i'm thinking especially at other ports-gcc archs (it has been bulk built on sparc64). I'm not sure about how it should be done. I could have changed CMakeLists.txt to target macppc as well. Any thought on this? Testing: - macppc/ports-gcc: it builds [2] and runs [3] fine - amd64/base-clang: it builds [4] and runs fine as well. Feedback and comments are welcome! Charlène. [1] https://github.com/neovim/neovim/pull/8215/commits/9d767d3d948f1fdd90c614d23ea7c98e3bfcda6a [2] http://ix.io/1CrW [3] https://bsd.network/@julianaito/101686351316975478 [4] http://ix.io/1Csb Index: Makefile =================================================================== RCS file: /cvs/ports/editors/neovim/Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 Makefile --- Makefile 24 Oct 2018 14:28:01 -0000 1.12 +++ Makefile 3 Mar 2019 11:51:07 -0000 @@ -5,7 +5,7 @@ COMMENT = continuation and extension of GH_ACCOUNT = neovim GH_PROJECT = neovim GH_TAGNAME = v0.3.1 -REVISION = 1 +REVISION = 2 CATEGORIES = editors devel HOMEPAGE = http://neovim.org @@ -57,5 +57,11 @@ TEST_DEPENDS = shells/bash \ do-test: cd ${WRKSRC} && env LC_CTYPE=en_US.UTF-8 ${MAKE_PROGRAM} \ -C src/nvim/testdir NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS} + +.include <bsd.port.arch.mk> + +.if ${PROPERTIES:Mclang} +CONFIGURE_ARGS += -DNVIM_LINK_LIBRARIES="-lc++abi" +.endif .include <bsd.port.mk> Index: patches/patch-src_nvim_CMakeLists_txt =================================================================== RCS file: patches/patch-src_nvim_CMakeLists_txt diff -N patches/patch-src_nvim_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_nvim_CMakeLists_txt 3 Mar 2019 11:51:07 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ +Fix build with ports-gcc by removing c++abi here to put it in +the port Makefile instead. +Index: src/nvim/CMakeLists.txt +--- src/nvim/CMakeLists.txt.orig ++++ src/nvim/CMakeLists.txt +@@ -360,7 +360,7 @@ endforeach() + # Our dependencies come first. + + if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") +- list(APPEND NVIM_LINK_LIBRARIES pthread c++abi) ++ list(APPEND NVIM_LINK_LIBRARIES pthread) + endif() + + if (LibIntl_FOUND)
