Compare commits
5 Commits
develop
...
balay/llvm
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f2ddfe31ff | ||
![]() |
9ea2612650 | ||
![]() |
4e033e4940 | ||
![]() |
0b8a86d397 | ||
![]() |
aa33912c84 |
@ -0,0 +1,52 @@
|
||||
commit 5053d62162ad01d78da42a405f683aaf53c5724e
|
||||
Author: Satish Balay <balay@mcs.anl.gov>
|
||||
Date: Tue Sep 24 15:18:47 2024 -0500
|
||||
|
||||
llvm: patch to work when ncurses is built with --with-termlib [i.e. ncurses~termlib]
|
||||
|
||||
diff --git a/lldb/cmake/modules/FindCursesAndPanel.cmake b/lldb/cmake/modules/FindCursesAndPanel.cmake
|
||||
index aaadf214b..98242cdf5 100644
|
||||
--- a/lldb/cmake/modules/FindCursesAndPanel.cmake
|
||||
+++ b/lldb/cmake/modules/FindCursesAndPanel.cmake
|
||||
@@ -2,12 +2,13 @@
|
||||
# FindCursesAndPanel
|
||||
# -----------
|
||||
#
|
||||
-# Find the curses and panel library as a whole.
|
||||
+# Find the curses tinfo and panel library as a whole.
|
||||
|
||||
-if(CURSES_INCLUDE_DIRS AND CURSES_LIBRARIES AND PANEL_LIBRARIES)
|
||||
+if(CURSES_INCLUDE_DIRS AND CURSES_LIBRARIES AND TINFO_LIBRARIES AND PANEL_LIBRARIES)
|
||||
set(CURSESANDPANEL_FOUND TRUE)
|
||||
else()
|
||||
find_package(Curses QUIET)
|
||||
+ find_library(TINFO_LIBRARIES NAMES tinfo DOC "The curses tinfo library" QUIET)
|
||||
find_library(PANEL_LIBRARIES NAMES panel DOC "The curses panel library" QUIET)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(CursesAndPanel
|
||||
@@ -16,9 +17,10 @@ else()
|
||||
REQUIRED_VARS
|
||||
CURSES_INCLUDE_DIRS
|
||||
CURSES_LIBRARIES
|
||||
+ TINFO_LIBRARIES
|
||||
PANEL_LIBRARIES)
|
||||
- if(CURSES_FOUND AND PANEL_LIBRARIES)
|
||||
- mark_as_advanced(CURSES_INCLUDE_DIRS CURSES_LIBRARIES PANEL_LIBRARIES)
|
||||
+ if(CURSES_FOUND AND TINFO_LIBRARIES AND PANEL_LIBRARIES)
|
||||
+ mark_as_advanced(CURSES_INCLUDE_DIRS CURSES_LIBRARIES TINFO_LIBRARIES PANEL_LIBRARIES)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt
|
||||
index dbc620b91..83003818d 100644
|
||||
--- a/lldb/source/Core/CMakeLists.txt
|
||||
+++ b/lldb/source/Core/CMakeLists.txt
|
||||
@@ -10,7 +10,7 @@ set(LLDB_CURSES_LIBS)
|
||||
set(LLDB_LIBEDIT_LIBS)
|
||||
|
||||
if (LLDB_ENABLE_CURSES)
|
||||
- list(APPEND LLDB_CURSES_LIBS ${PANEL_LIBRARIES} ${CURSES_LIBRARIES})
|
||||
+ list(APPEND LLDB_CURSES_LIBS ${PANEL_LIBRARIES} ${CURSES_LIBRARIES} ${TINFO_LIBRARIES})
|
||||
if (LLVM_BUILD_STATIC)
|
||||
list(APPEND LLDB_CURSES_LIBS gpm)
|
||||
endif()
|
@ -56,6 +56,7 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
|
||||
license("Apache-2.0")
|
||||
|
||||
version("main", branch="main")
|
||||
version("19.1.0", sha256="0a08341036ca99a106786f50f9c5cb3fbe458b3b74cab6089fd368d0edb2edfe")
|
||||
version("18.1.8", sha256="09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856")
|
||||
version("18.1.7", sha256="b60df7cbe02cef2523f7357120fb0d46cbb443791cde3a5fb36b82c335c0afc9")
|
||||
version("18.1.6", sha256="01390edfae5b809e982b530ff9088e674c62b13aa92cb9dc1e067fa2cf501083")
|
||||
@ -285,6 +286,8 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
|
||||
description="Enable zstd support for static analyzer / lld",
|
||||
)
|
||||
|
||||
provides("libllvm@19", when="@19.0.0:19")
|
||||
provides("libllvm@18", when="@18.0.0:18")
|
||||
provides("libllvm@17", when="@17.0.0:17")
|
||||
provides("libllvm@16", when="@16.0.0:16")
|
||||
provides("libllvm@15", when="@15.0.0:15")
|
||||
@ -424,6 +427,12 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
|
||||
# Fixed in upstream versions of both
|
||||
conflicts("^cmake@3.19.0", when="@6:11.0.0")
|
||||
|
||||
# llvm-19.0.1
|
||||
patch(
|
||||
"llvm-19.0.1-ncurses-termlib.patch",
|
||||
when="@19: ^ncurses+termlib"
|
||||
)
|
||||
|
||||
# Fix lld templates: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230463
|
||||
patch(
|
||||
"https://raw.githubusercontent.com/freebsd/freebsd-ports/f8f9333d8e1e5a7a6b28c5ef0ca73785db06136e/devel/llvm50/files/lld/patch-tools_lld_ELF_Symbols.cpp",
|
||||
|
Loading…
Reference in New Issue
Block a user