Revert "Disable bootstrapping by default."
This doesn't work well since non-bootstrapping cannot be used to move
from one minor release to the next. For example if you have OCaml
4.07.0 then you cannot use non-bootstrapping to move to 4.07.1,
because the *.cmi files are incompatible between the two releases.
We need to rethink this.
This reverts commit 8f288a07f3
.
This commit is contained in:
parent
4a96e5f705
commit
1be91fb723
15
ocaml.spec
15
ocaml.spec
@ -25,12 +25,6 @@
|
|||||||
# Architectures where parallel builds fail.
|
# Architectures where parallel builds fail.
|
||||||
#%global no_parallel_build_arches aarch64
|
#%global no_parallel_build_arches aarch64
|
||||||
|
|
||||||
# If you want to bootstrap OCaml on a brand new architecture, or if
|
|
||||||
# you want to build OCaml without requiring an existing OCaml package,
|
|
||||||
# or if you want to build OCaml exactly as it is built upstream (using
|
|
||||||
# a binary ocamlc from the previous build), then use ‘--with bootstrap’.
|
|
||||||
%bcond_with bootstrap
|
|
||||||
|
|
||||||
Name: ocaml
|
Name: ocaml
|
||||||
Version: 4.07.0
|
Version: 4.07.0
|
||||||
Release: 4%{?dist}
|
Release: 4%{?dist}
|
||||||
@ -75,10 +69,6 @@ Patch0007: 0007-Adapt-to-4.07.patch
|
|||||||
# Sent upstream 2018-06-05.
|
# Sent upstream 2018-06-05.
|
||||||
Patch0008: 0008-riscv-Emit-debug-info.patch
|
Patch0008: 0008-riscv-Emit-debug-info.patch
|
||||||
|
|
||||||
%if ! %{with bootstrap}
|
|
||||||
BuildRequires: ocaml
|
|
||||||
%endif
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: binutils-devel
|
BuildRequires: binutils-devel
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -202,10 +192,7 @@ may not be portable between versions.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -T -b 0 -n %{name}-%{version}
|
%setup -q -T -b 0 -n %{name}-%{version}
|
||||||
%autopatch -p1
|
%autopatch -p1
|
||||||
%if ! %{with bootstrap}
|
|
||||||
cp %{_bindir}/ocamlc.byte boot/ocamlc
|
|
||||||
cp %{_bindir}/ocamllex.byte boot/ocamllex
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifnarch %{no_parallel_build_arches}
|
%ifnarch %{no_parallel_build_arches}
|
||||||
|
Loading…
Reference in New Issue
Block a user