diff --git a/3671.patch b/3671.patch deleted file mode 100644 index 2361301..0000000 --- a/3671.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a176b0ce6d6be0cdd6c7b04c3d655cae567527e2 Mon Sep 17 00:00:00 2001 -From: Rudi Grinberg -Date: Tue, 4 Aug 2020 00:56:34 -0700 -Subject: [PATCH] Pass -g when compiling ppx preprocessor - -Signed-off-by: Rudi Grinberg ---- - CHANGES.md | 2 ++ - src/dune/preprocessing.ml | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CHANGES.md b/CHANGES.md -index 3bb8c04160..f195d7ca45 100644 ---- a/CHANGES.md -+++ b/CHANGES.md -@@ -76,6 +76,8 @@ next - - Fix a stack overflow when displaying large outputs (including diffs) (#3537, - fixes #2767, #3490, @emillon) - -+- Pass `-g` when compiling ppx preprocessors (#3671, @rgrinberg) -+ - 2.6.0 (05/06/2020) - ------------------ - -diff --git a/src/dune/preprocessing.ml b/src/dune/preprocessing.ml -index 87c765256c..53a391448b 100644 ---- a/src/dune/preprocessing.ml -+++ b/src/dune/preprocessing.ml -@@ -332,7 +332,8 @@ let build_ppx_driver sctx ~dep_kind ~target ~pps ~pp_names = - (Build.record_lib_deps - (Lib_deps.info ~kind:dep_kind (Lib_deps.of_pps pp_names))) - >>> Command.run compiler ~dir:(Path.build ctx.build_dir) -- [ A "-o" -+ [ A "-g" -+ ; A "-o" - ; Target target - ; A "-w" - ; A "-24" diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7223d72..2cc1874 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.6.2 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -22,15 +22,11 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -# Pass -g when compiling ppx extensions. -# https://github.com/ocaml/dune/pull/3671 -Patch1: 3671.patch - BuildRequires: emacs -BuildRequires: ocaml >= 4.07 +BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-findlib -BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(sphinx-rtd-theme) +BuildRequires: %{py3_dist sphinx} +BuildRequires: %{py3_dist sphinx-rtd-theme} %if %{without menhir} # Required by tests. @@ -195,6 +191,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Aug 14 2020 Jerry James - 2.7.0-1 +- Version 2.7.0 +- Drop upstreamed patch for issue 3671 + * Tue Aug 4 2020 Richard W.M. Jones - 2.6.2-2 - Pass -g option when compiling ppx extensions. https://github.com/ocaml/dune/pull/3671 diff --git a/sources b/sources index a54c4ae..c26d54c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.6.2.tar.gz) = 34993daaf10b2f4e897b56d60bd329472f80cec58c61348b086974d17f195946f16d5e767a0ee85f0a59e86a26ca9b3ea56ae81e8072442fbc041457bc9afed0 +SHA512 (dune-2.7.0.tar.gz) = 6063010f7e9d34846df878d94d12517e88a376ab67372ceac9411f4a83ba6eeaf487b8809c1fcc150e0d150ce8f7b925438780920c1883aee4ea242653b4cdb8