%global fast 0
%global use_jankratochvil_dwz 1
-%global use_jankratochvil_uniqaddr 1
+# FIXME:
+%global use_jankratochvil_layout5 0
+%global use_jankratochvil_ocaml_doc 1
%global use_jankratochvil_rust 0
+%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
%global debug_package %{nil}
%endif
Name: lldb-experimental
-Version: 13.0.0
-Release: 0.20210605snap0%{?dist}
+Version: 14.0.0
+Release: 0.20210920snap0%{?dist}
Summary: Next generation high-performance debugger - experimental trunk snapshot
License: NCSA
URL: http://lldb.llvm.org/
BuildRequires: clang git libedit-devel libatomic libxml2-devel zlib-devel valgrind-devel libpfm-devel
# https://src.fedoraproject.org/rpms/epydoc
#BuildRequires: epydoc
+%if 0%{?rhel} > 8 || 0%{?fedora} >= 34
+BuildRequires: ocaml-findlib ocaml-ctypes ocaml-ocamldoc
+%endif
%if 0%{?rhel:1} && 0%{?rhel} <= 7
#+ /usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1
#Compiling /quad/home/jkratoch/redhat/lldb-experimental/BUILDROOT/lldb-experimental-13.0.0-0.20210206snap1.el7.x86_64/opt/lldb-experimental/lib64/python3.8/site-packages/lldb/__init__.py ...
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
+%if %{use_jankratochvil_ocaml_doc}
+This package contains off-trunk:
+ ocaml_doc fix
+%endif
%if %{use_jankratochvil_rust}
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}
test -d ../$REF/ && CLONEOPTS="$CLONEOPTS --reference ../$REF"
# 2500 = 1 month in 2019
git clone $OPTS $CLONEOPTS https://github.com/llvm/llvm-project.git .
-%if %{use_jankratochvil_dwz} || %{use_jankratochvil_rust}
+%if 1
git remote remove jankratochvil || :
#git remote add jankratochvil git://git.jankratochvil.net/lldb
git remote add jankratochvil https://github.com/jankratochvil/llvm-project.git
%if %{use_jankratochvil_dwz}
git merge jankratochvil/dwz
%endif
-%if %{use_jankratochvil_uniqaddr}
-git merge jankratochvil/layout3
+%if %{use_jankratochvil_layout5}
+git merge jankratochvil/layout5
+%endif
+%if %{use_jankratochvil_ocaml_doc}
+git merge jankratochvil/ocaml_doc
%endif
%if %{use_jankratochvil_rust}
# '-c merge.renames=false' is F-29+.
# '-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 fetch nealsid
+git merge nealsid/lldb-editline-remove-wchar
+%endif
%build
FLAGS="%{optflags}"
%install
mkdir -p %{buildroot}%{pkg_prefix}
(function revline {
- echo "$(cd $1;git rev-parse ${2:-origin/master}) ${2:-$1}"
+ echo "$(cd $1;git rev-parse ${2:-origin/main}) ${2:-$1}"
}
revline .
%if %{use_jankratochvil_dwz}
%if %{use_jankratochvil_rust}
revline . jankratochvil/rust
%endif
-) >%{buildroot}%{pkg_prefix}/HEAD
+) >%{buildroot}%{pkg_prefix}/commit
%cmake_install
mkdir -p %{buildroot}%{_bindir}
# lldb-mi
%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