X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=719897a95b0e89679a53562e6140dbeb7c40e172;hp=e6e1090e0efa00e8d8321f3e62a6110f56cfc39f;hb=e1590527bc4eec3aa6c25f13035c35835e91814c;hpb=54e4d699a5c9e12f01b24efe9dd9f383d8a7ea6f diff --git a/lldb-experimental.spec b/lldb-experimental.spec index e6e1090..719897a 100644 --- a/lldb-experimental.spec +++ b/lldb-experimental.spec @@ -2,8 +2,9 @@ %global use_jankratochvil_dwz 1 %global use_jankratochvil_layout5 1 %global use_jankratochvil_ocaml_doc 1 +%global use_jankratochvil_rnglist 1 %global use_jankratochvil_rust 0 -%global use_nealsid_lldb_editline_remove_wchar 1 +%global use_nealsid_lldb_editline_remove_wchar 0 %global pkg_prefix /opt/%{name} %global _unpackaged_files_terminate_build 0 # dwz: Couldn't find DIE referenced by DW_OP_GNU_parameter_ref @@ -19,8 +20,8 @@ %global debug_package %{nil} %endif Name: lldb-experimental -Version: 13.0.0 -Release: 0.20210710snap0%{?dist} +Version: 14.0.0 +Release: 0.20210817snap0%{?dist} Summary: Next generation high-performance debugger - experimental trunk snapshot License: NCSA URL: http://lldb.llvm.org/ @@ -102,6 +103,9 @@ This package contains off-trunk: This package contains off-trunk: ocaml_doc fix %endif +%if %{use_jankratochvil_rnglist} +This package contains off-trunk DWARF-5 .debug_rnglists fix. +%endif %if %{use_jankratochvil_rust} This package contains off-trunk Rust support: https://github.com/rust-lang-nursery/lldb @@ -194,6 +198,9 @@ git merge jankratochvil/layout5 %if %{use_jankratochvil_ocaml_doc} git merge jankratochvil/ocaml_doc %endif +%if %{use_jankratochvil_rnglist} +git merge jankratochvil/rnglist +%endif %if %{use_jankratochvil_rust} # '-c merge.renames=false' is F-29+. # '-c merge.renameLimit=0' has no effect. @@ -201,6 +208,7 @@ git -c merge.renameLimit=1 merge jankratochvil/rust %endif %if %{use_nealsid_lldb_editline_remove_wchar} git remote add nealsid https://github.com/nealsid/llvm-project.git +git fetch nealsid git merge nealsid/lldb-editline-remove-wchar %endif