From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA0A3158094 for ; Tue, 5 Jul 2022 00:33:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAD33E0101; Tue, 5 Jul 2022 00:33:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BA43E0101 for ; Tue, 5 Jul 2022 00:33:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C21334142A for ; Tue, 5 Jul 2022 00:33:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3B974D3 for ; Tue, 5 Jul 2022 00:33:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1656981172.bd47d534eab9e010022944bf9f9e98aa198a6860.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/files/neovim-9999-cmake-darwin.patch app-editors/neovim/neovim-9999.ebuild X-VCS-Directories: app-editors/neovim/files/ app-editors/neovim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bd47d534eab9e010022944bf9f9e98aa198a6860 X-VCS-Branch: master Date: Tue, 5 Jul 2022 00:33:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f976ac9-530c-4de1-82fc-725d04f8c2db X-Archives-Hash: 8bb7e09a04cec91c41e321615808e542 commit: bd47d534eab9e010022944bf9f9e98aa198a6860 Author: Sam James gentoo org> AuthorDate: Tue Jul 5 00:32:52 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 5 00:32:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd47d534 app-editors/neovim: rebase Darwin patch Closes: https://github.com/gentoo/gentoo/pull/25889 Signed-off-by: Sam James gentoo.org> .../neovim/files/neovim-9999-cmake-darwin.patch | 55 ++++++++++++++++++++++ app-editors/neovim/neovim-9999.ebuild | 12 +++-- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch new file mode 100644 index 000000000000..5b829904a13e --- /dev/null +++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch @@ -0,0 +1,55 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") + # used for check_c_compiler_flag + include(CheckCCompilerFlag) + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- # CMake tries to treat /sw and /opt/local as extension of the system path, but +- # that doesn't really work out very well. Once you have a dependency that +- # resides there and have to add it as an include directory, then any other +- # dependency that could be satisfied from there must be--otherwise you can end +- # up with conflicting versions. So, let's make them more of a priority having +- # them be included as one of the first places to look for dependencies. +- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) +- +- # Work around some old, broken detection by CMake for knowing when to use the +- # isystem flag. Apple's compilers have supported this for quite some time +- # now. +- if(CMAKE_COMPILER_IS_GNUCC) +- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") +- endif() +-endif() +- + if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # Ignore case when comparing filenames on Windows and Mac. + set(CASE_INSENSITIVE_FILENAME TRUE) +--- a/cmake.deps/CMakeLists.txt ++++ b/cmake.deps/CMakeLists.txt +@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) + set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + endif() + +-if(CMAKE_OSX_SYSROOT) +- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- if(DEPS_CXX_COMPILER) +- set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- endif() +-endif() +- + if(CMAKE_OSX_ARCHITECTURES) + string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") + # The LuaJIT build does not like being passed multiple `-arch` flags +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt +@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot") +- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") +-endif() + string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) + separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) + separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 4316da6d93cc..5f18e490acbb 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -68,12 +68,18 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" ) + if [[ ${PV} == 9999 ]]; then - PATCHES+=("${FILESDIR}/${PN}-9999-cmake_lua_version.patch") + PATCHES+=( + "${FILESDIR}/${PN}-9999-cmake_lua_version.patch" + "${FILESDIR}/${PN}-9999-cmake-darwin.patch" + ) else - PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch") + PATCHES+=( + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" + ) fi src_prepare() {