luv.patch

   1 From da0c66bcddbe4e6ebc72357c9f6c5de75e176744 Mon Sep 17 00:00:00 2001
   2 From: dundargoc <gocdundar@gmail.com>
   3 Date: Sun, 5 Mar 2023 17:06:13 +0100
   4 Subject: [PATCH] build: remove workaround for incorrectly packaged libluv
   5
   6 This removes a workaround for incorrectly packaged libluv in
   7 90e44ecf1144cb32195da00e24d23afb111ea680 as it should not be needed
   8 anymore.
   9 ---
  10  cmake/FindLibluv.cmake  | 11 +----------
  11  src/nvim/CMakeLists.txt |  8 ++------
  12  2 files changed, 3 insertions(+), 16 deletions(-)
  13
  14 diff --git a/cmake/FindLibluv.cmake b/cmake/FindLibluv.cmake
  15 index 9a74d5d0e1ba0..3dfc53602413c 100644
  16 --- a/cmake/FindLibluv.cmake
  17 +++ b/cmake/FindLibluv.cmake
  18 @@ -1,14 +1,5 @@
  19  find_path(LIBLUV_INCLUDE_DIR luv/luv.h)
  20 -
  21 -# Explicitly look for luv.so. #10407
  22 -list(APPEND LIBLUV_NAMES luv_a luv libluv_a luv${CMAKE_SHARED_LIBRARY_SUFFIX})
  23 -
  24 -find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES})
  25 -
  26 -set(LIBLUV_LIBRARIES ${LIBLUV_LIBRARY})
  27 -set(LIBLUV_INCLUDE_DIRS ${LIBLUV_INCLUDE_DIR})
  28 -
  29 +find_library(LIBLUV_LIBRARY NAMES luv_a luv libluv_a luv.so)
  30  find_package_handle_standard_args(Libluv DEFAULT_MSG
  31    LIBLUV_LIBRARY LIBLUV_INCLUDE_DIR)
  32 -
  33  mark_as_advanced(LIBLUV_INCLUDE_DIR LIBLUV_LIBRARY)
  34 diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
  35 index 61530f5a7bf95..51e0727cd51c4 100755
  36 --- a/src/nvim/CMakeLists.txt
  37 +++ b/src/nvim/CMakeLists.txt
  38 @@ -14,12 +14,8 @@ else()
  39  endif()
  40
  41  find_package(Libluv 1.43.0 REQUIRED)
  42 -target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIRS})
  43 -# Use "luv" as imported library, to work around CMake using "-lluv" for
  44 -# "luv.so".  #10407
  45 -add_library(luv UNKNOWN IMPORTED)
  46 -set_target_properties(luv PROPERTIES IMPORTED_LOCATION ${LIBLUV_LIBRARIES})
  47 -target_link_libraries(main_lib INTERFACE luv)
  48 +target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIR})
  49 +target_link_libraries(main_lib INTERFACE ${LIBLUV_LIBRARY})
  50
  51  find_package(Iconv REQUIRED)
  52  find_package(Libtermkey 0.22 REQUIRED)