Add hacky workaround for C++ flags problem, see:

https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/M2VM5DNB7HSAJIFDGT4WAIZDA5JPE5KM/

Seems to be either a dune or C++ bug of some sort.
This commit is contained in:
Richard W.M. Jones 2020-04-22 12:58:05 +01:00
parent 84899900c5
commit c3dd0983c7
2 changed files with 17 additions and 2 deletions

View File

@ -0,0 +1,11 @@
--- ocaml-mccs-1.1-11/src/dune 2019-12-11 16:55:17.000000000 +0000
+++ ocaml-mccs-1.1-11.new/src/dune 2020-04-22 12:56:05.001005113 +0100
@@ -6,7 +6,7 @@
(public_name mccs)
(modules :standard \ context_flags)
(cxx_flags
- :standard
+ -fPIC -O2 -g
-I
.
(:include cxxflags.sexp))

View File

@ -16,6 +16,10 @@ URL: https://github.com/AltGr/ocaml-mccs
# Upstream's use of a '+' instead of a '.' makes this hard to use a macro.
Source0: https://github.com/AltGr/ocaml-mccs/archive/%{version}+%{extraver}/%{name}-%{version}-%{extraver}.tar.gz
# Hacky workaround for:
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/M2VM5DNB7HSAJIFDGT4WAIZDA5JPE5KM/
Patch1: ocaml-mccs-1.1-c++-flags.patch
BuildRequires: ocaml
BuildRequires: ocaml-dune
BuildRequires: gcc, gcc-c++
@ -43,10 +47,10 @@ The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
%prep
%autosetup -n %{name}-%{version}-%{extraver}
%autosetup -n %{name}-%{version}-%{extraver} -p1
%build
dune build -p mccs %{?_smp_mflags}
dune build -p mccs
%install
# This is an opam dependency. Tragically it means we must manually install,