From 7995f539abfcc4099c2788195fe98cb9b81de77c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 21 Mar 2023 10:25:09 -0600 Subject: [PATCH] Add debuginfo patch to produce good debuginfo again --- ocaml-dune-debuginfo.patch | 11 +++++++++++ ocaml-dune.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ocaml-dune-debuginfo.patch diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch new file mode 100644 index 0000000..56a2abe --- /dev/null +++ b/ocaml-dune-debuginfo.patch @@ -0,0 +1,11 @@ +--- dune-3.7.0/src/dune_engine/dune_project.ml.orig 2023-02-17 07:44:16.000000000 -0700 ++++ dune-3.7.0/src/dune_engine/dune_project.ml 2023-03-21 10:01:16.334828478 -0600 +@@ -457,7 +457,7 @@ let implicit_transitive_deps_default ~la + let wrapped_executables_default ~(lang : Lang.Instance.t) = + lang.version >= (2, 0) + +-let map_workspace_root_default ~(lang : Lang.Instance.t) = lang.version >= (3, 0) ++let map_workspace_root_default ~(lang : Lang.Instance.t) = false + + let executables_implicit_empty_intf_default ~(lang : Lang.Instance.t) = + lang.version >= (3, 0) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 816b091..c14e99b 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -31,6 +31,9 @@ URL: https://dune.build Source0: https://github.com/ocaml/dune/archive/%{version}/dune-%{version}.tar.gz # When building without lwt, remove libraries that need it Patch0: %{name}-no-lwt.patch +# Temporary workaround for broken debuginfo (rhbz#2168932) +# See https://github.com/ocaml/dune/issues/6929 +Patch1: %{name}-debuginfo.patch BuildRequires: emacs-nox BuildRequires: make @@ -426,9 +429,10 @@ developing applications that use ocaml-xdg. %prep %autosetup -N -n dune-%{version} %if %{without lwt} -%patch0 -p1 +%patch 0 -p1 rm -fr otherlibs/dune-rpc-lwt dune-rpc-lwt.opam %endif +%autopatch -m1 -p1 %build ./configure \ @@ -541,9 +545,10 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog -* Sat Feb 18 2023 Jerry James - 3.7.0-1 +* Tue Mar 21 2023 Jerry James - 3.7.0-1 - Version 3.7.0 - The fiber subpackage has been removed +- Add debuginfo patch to produce good debuginfo again * Tue Jan 24 2023 Richard W.M. Jones - 3.6.1-3 - Rebuild OCaml packages for F38