Sync from SUSE:SLFO:Main ocaml revision 8152946193d4a59b779c6ea069825b88
This commit is contained in:
@@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 3 03:03:03 UTC 2025 - ohering@suse.de
|
||||
|
||||
- Use gcc7 in SLE12 because dune 3.17 requires a gcc which recognizes
|
||||
-fdiagnostics-color=always (dune#11509)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 7 07:07:07 UTC 2025 - ohering@suse.de
|
||||
|
||||
|
10
ocaml.spec
10
ocaml.spec
@@ -66,7 +66,13 @@ Requires: ocaml(runtime) = %version-%release
|
||||
Obsoletes: ocaml-docs
|
||||
Provides: ocaml(compiler) = %ocaml_base_version
|
||||
Provides: ocaml(ocaml_base_version) = %ocaml_base_version
|
||||
%if 0%{?suse_version} > 1315
|
||||
Requires: gcc
|
||||
%else
|
||||
BuildRequires: gcc7
|
||||
Requires: gcc7
|
||||
Requires: gcc7-c++
|
||||
%endif
|
||||
Provides: ocaml(ocaml.opt) = %ocaml_base_version
|
||||
Obsoletes: ocaml-seq < %version-%release
|
||||
Obsoletes: ocaml-seq-debuginfo < %version-%release
|
||||
@@ -151,7 +157,11 @@ applications that use Ocaml.
|
||||
|
||||
%build
|
||||
echo %version > VERSION
|
||||
%if 0%{?suse_version} > 1315
|
||||
export CC='gcc'
|
||||
%else
|
||||
export CC='/usr/bin/gcc-7'
|
||||
%endif
|
||||
export AS='as'
|
||||
export ASPP="$CC -c"
|
||||
configure_target=
|
||||
|
Reference in New Issue
Block a user