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

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 1bbb74a..4bcea20 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -1,6 +1,7 @@
 %global fast 0
 %global use_jankratochvil_dwz 1
 %global use_jankratochvil_uniqaddr 1
+%global use_jankratochvil_ocaml_doc 1
 %global use_jankratochvil_rust 0
 %global pkg_prefix /opt/%{name}
 %global _unpackaged_files_terminate_build 0
@@ -18,7 +19,7 @@
 %endif
 Name: lldb-experimental
 Version: 13.0.0
-Release: 0.20210609snap0%{?dist}
+Release: 0.20210610snap1%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -29,8 +30,8 @@ Source0: empty.tar
 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:1} || 0%{?rhel} > 8
-BuildRequires:  ocaml-findlib ocaml-ctypes
+%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
@@ -96,6 +97,10 @@ This package contains off-trunk DWZ support for Fedora debuginfos such as:
 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
@@ -167,7 +172,7 @@ CLONEOPTS="--single-branch"
 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
@@ -179,7 +184,10 @@ git config user.name jankratochvil
 git merge jankratochvil/dwz
 %endif
 %if %{use_jankratochvil_uniqaddr}
-git merge jankratochvil/layout3
+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+.
@@ -259,7 +267,7 @@ LDFLAGS="$LDFLAGS -flto -Wl,--build-id=sha1"
 %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}