From 1bfa2fb9eb6f6028fc1d0aaadf659dfe092b2e2a Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 31 Dec 2022 18:05:47 +0100 Subject: [PATCH] neovim: switch to custom build type --- .../patches/cmake-allow-build-type-none.patch | 26 +++++++++++++++++++ srcpkgs/neovim/template | 4 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/neovim/patches/cmake-allow-build-type-none.patch diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch new file mode 100644 index 000000000000..d6d8c8f1b15f --- /dev/null +++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/Util.cmake b/cmake/Util.cmake +index 343a729..d7d15e1 100644 +--- a/cmake/Util.cmake ++++ b/cmake/Util.cmake +@@ -177,7 +177,7 @@ function(set_default_buildtype) + message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'") + set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build" FORCE) + elseif(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes) +- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}") ++ message(WARNING "Invalid build type: ${CMAKE_BUILD_TYPE}") + else() + message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") + endif() +diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim +index be56658..46fdd0f 100644 +--- a/runtime/autoload/health/nvim.vim ++++ b/runtime/autoload/health/nvim.vim +@@ -135,7 +135,7 @@ function! s:check_performance() abort + let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') + if empty(buildtype) + call health#report_error('failed to get build type from :version') +- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' ++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|None)' + call health#report_ok(buildtype) + else + call health#report_info(buildtype) diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 8ee497a2fc18..da9efa2a4098 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,10 +1,10 @@ # Template file for 'neovim' pkgname=neovim version=0.8.2 -revision=1 +revision=2 build_style=cmake build_helper="qemu" -configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF" +configure_args="-DCOMPILE_LUA=OFF" hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack" makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel libluv-devel tree-sitter-devel"