X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=lldb-experimental.spec;h=e6e1090e0efa00e8d8321f3e62a6110f56cfc39f;hb=54e4d699a5c9e12f01b24efe9dd9f383d8a7ea6f;hp=4bcea20bc8d39472801f0abdf81f960297ec0720;hpb=e3f126e88a89f4cb87f1f0617fa7c4aac6b3daf0;p=lldb-experimental.git

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 4bcea20..e6e1090 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -1,8 +1,9 @@
 %global fast 0
 %global use_jankratochvil_dwz 1
-%global use_jankratochvil_uniqaddr 1
+%global use_jankratochvil_layout5 1
 %global use_jankratochvil_ocaml_doc 1
 %global use_jankratochvil_rust 0
+%global use_nealsid_lldb_editline_remove_wchar 1
 %global pkg_prefix /opt/%{name}
 %global _unpackaged_files_terminate_build 0
 # dwz: Couldn't find DIE referenced by DW_OP_GNU_parameter_ref
@@ -19,7 +20,7 @@
 %endif
 Name: lldb-experimental
 Version: 13.0.0
-Release: 0.20210610snap1%{?dist}
+Release: 0.20210710snap0%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -93,7 +94,7 @@ This package is an experimental trunk snapshot.
 This package contains off-trunk DWZ support for Fedora debuginfos such as:
   unsupported DW_FORM values: 0x1f20 0x1f21
 %endif
-%if %{use_jankratochvil_uniqaddr}
+%if %{use_jankratochvil_layout5}
 This package contains off-trunk:
   Support for libstdc++11 std::unique_ptr: [[no_unique_address]]
 %endif
@@ -105,6 +106,10 @@ This package contains off-trunk:
 This package contains off-trunk Rust support:
   https://github.com/rust-lang-nursery/lldb
 %endif
+%if %{use_nealsid_lldb_editline_remove_wchar}
+This package contains:
+  https://github.com/nealsid/llvm-project/tree/lldb-editline-remove-wchar
+%endif
 
 %package devel
 Summary: Development header files for %{name}
@@ -183,7 +188,7 @@ git config user.name jankratochvil
 %if %{use_jankratochvil_dwz}
 git merge jankratochvil/dwz
 %endif
-%if %{use_jankratochvil_uniqaddr}
+%if %{use_jankratochvil_layout5}
 git merge jankratochvil/layout5
 %endif
 %if %{use_jankratochvil_ocaml_doc}
@@ -194,6 +199,10 @@ git merge jankratochvil/ocaml_doc
 # '-c merge.renameLimit=0' has no effect.
 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 merge nealsid/lldb-editline-remove-wchar
+%endif
 
 %build
 FLAGS="%{optflags}"
@@ -276,7 +285,7 @@ mkdir -p %{buildroot}%{pkg_prefix}
 %if %{use_jankratochvil_rust}
  revline . jankratochvil/rust
 %endif
-) >%{buildroot}%{pkg_prefix}/HEAD
+) >%{buildroot}%{pkg_prefix}/commit
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
 # lldb-mi
@@ -297,7 +306,7 @@ du -shc $PWD %{buildroot}
 %files
 %{_bindir}/lldb-experimental
 #{_bindir}/lldb-mi-experimental
-%{pkg_prefix}/HEAD
+%{pkg_prefix}/commit
 %{pkg_prefix}/bin/lldb
 %{pkg_prefix}/bin/lldb-server
 #{pkg_prefix}/bin/lldb-mi