Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lldb v18.1.2 #62

Merged
merged 3 commits into from
Mar 22, 2024
Merged

lldb v18.1.2 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e5967b
updated v18.1.2
regro-cf-autotick-bot Mar 20, 2024
6940d61
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.32.0, and co…
regro-cf-autotick-bot Mar 20, 2024
71ac96d
rebase patches
h-vetinari Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
ncurses:
- '6'
pin_run_as_build:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2212.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channel_targets:
cxx_compiler:
- vs2019
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channel_targets:
cxx_compiler:
- vs2019
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channel_targets:
cxx_compiler:
- vs2019
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channel_targets:
cxx_compiler:
- vs2019
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{% set version = "17.0.6" %}
{% set version = "18.1.2" %}

package:
name: lldb
version: {{ version }}

source:
url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version }}/llvm-project-{{ version }}.src.tar.xz
sha256: 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813
sha256: 51073febd91d1f2c3b411d022695744bda322647e76e0b4eb1918229210c48d5
patches:
# Fix Python and Mac support
- patches/0001-Remove-linking-liblldb-to-libpython.patch # [not win]
# https://github.com/llvm/llvm-project/issues/59449
# allows for compiling with older SDKs
- patches/0001-Define-CPU_SUBTYPE_ARM64E-if-not-available.patch
- patches/0002-Define-CPU_SUBTYPE_ARM64E-if-not-available.patch

build:
number: 1
number: 0

requirements:
build:
Expand Down
39 changes: 25 additions & 14 deletions recipe/patches/0001-Remove-linking-liblldb-to-libpython.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
From ed9e11f2ba546a36acc3ce1315779ded6311a859 Mon Sep 17 00:00:00 2001
From ed285e5276347d05e0dcd446702e80f4682b5e3c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Thu, 9 Apr 2020 18:08:39 +0000
Subject: [PATCH] Remove linking liblldb to libpython

Co-authored-by: Uwe L. Korn <uwelk@xhochy.com>
Subject: [PATCH 1/2] Remove linking liblldb to libpython

liblldb doubles as an extension module too, but python
executable is linked to static python. When the extension module
Expand All @@ -15,17 +13,21 @@ and added to its interfaces to make sure the executables like
lldb works fine.

Thanks to feedback from @saulshanabrook

Co-authored-by: Uwe L. Korn <uwelk@xhochy.com>
Co-authored-by: H. Vetinari <h.vetinari@gmx.com>
---
lldb/cmake/modules/AddLLDB.cmake | 3 +++
lldb/source/API/CMakeLists.txt | 6 ++++++
lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt | 1 -
3 files changed, 9 insertions(+), 1 deletion(-)
.../ScriptInterpreter/Python/Interfaces/CMakeLists.txt | 1 -
4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
index a5be4afb4..e9f03b039 100644
index 328e883ddbe5..b84641938d3a 100644
--- a/lldb/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake
@@ -164,6 +164,9 @@ function(add_lldb_executable name)
@@ -196,6 +196,9 @@ function(add_lldb_executable name)
endif()

list(APPEND LLVM_LINK_COMPONENTS ${ARG_LINK_COMPONENTS})
Expand All @@ -36,10 +38,10 @@ index a5be4afb4..e9f03b039 100644
${pass_ENTITLEMENTS}
${pass_NO_INSTALL_RPATH}
diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt
index 3e189f387..9d3de7f2e 100644
index 7d478ecc7f59..a02b119d3961 100644
--- a/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt
@@ -180,6 +180,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -235,6 +235,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
endif()

if (NOT MSVC)
Expand All @@ -53,17 +55,26 @@ index 3e189f387..9d3de7f2e 100644
PROPERTIES
OUTPUT_NAME lldb
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
index d59b7bbf6..80acb7fba 100644
index 7523d65abf0f..d51f2dbf12e8 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
@@ -29,7 +29,6 @@ add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN
@@ -34,7 +34,6 @@ add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN
lldbInterpreter
lldbTarget
lldbPluginScriptInterpreterPythonInterfaces
- ${Python3_LIBRARIES}
${LLDB_LIBEDIT_LIBS}

LINK_COMPONENTS
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt
index b22abc49c92a..ab967dcc5e66 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/CMakeLists.txt
@@ -31,7 +31,6 @@ add_lldb_library(lldbPluginScriptInterpreterPythonInterfaces
lldbHost
lldbInterpreter
lldbTarget
- ${Python3_LIBRARIES}
${LLDB_LIBEDIT_LIBS}

LINK_COMPONENTS
--
2.39.3 (Apple Git-145)

Loading