Re: Unbreak editors/neovim on macppc

On Sun, 03 Mar 2019 20:27:49 +0100
Jeremie Courreges-Anglas wrote:

> On Sun, Mar 03 2019, Charlene Wendling <julianaito@posteo.jp> wrote:
> > 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).
>
> (yep, because sparc64 currently builds base-clang and thus libc++abi,
> it's just that the default compiler is still gcc.)
>
> > 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?
>
> libc++abi is only needed because of luajit (see
> ports/lang/luajit/Makefile). The neovim port disables luajit in favor
> of lua-5.1, the latter doesn't need special treatment. I would
> suggest to just kill any c++abi use instead, hence the diff below.
> ok jca@ if you like it :)

Thanks, that works for me on amd64 and macppc. Unless Edd has
objections, let's go for it!

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/neovim/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 24 Oct 2018 14:28:01 -0000 1.12
> +++ Makefile 3 Mar 2019 19:23:20 -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
> @@ -15,7 +15,7 @@ MAINTAINER = Edd Barrett <edd@openbsd.or
> PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey
> -WANTLIB += unibilium util uv vterm ${COMPILER_LIBCXX}
> +WANTLIB += unibilium util uv vterm
>
> COMPILER = base-clang ports-gcc base-gcc
>
> 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 19:23:20
> -0000 @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +No need for libc++abi, only available on clang archs and only needed
> for +luajit (we use lua instead).
> +
> +Index: src/nvim/CMakeLists.txt
> +--- src/nvim/CMakeLists.txt.orig
> ++++ src/nvim/CMakeLists.txt
> +@@ -359,10 +359,6 @@ endforeach()
> +
> + # Our dependencies come first.
> +
> +-if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
> +- list(APPEND NVIM_LINK_LIBRARIES pthread c++abi)
> +-endif()
> +-
> + if (LibIntl_FOUND)
> + list(APPEND NVIM_LINK_LIBRARIES ${LibIntl_LIBRARY})
> + endif()
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE
> 1524 E7EE
>