!6 [sync] PR-5: Update to 0.14.0
From: @openeuler-sync-bot Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
201568d376
@ -1,43 +0,0 @@
|
||||
From 70a33ab6500b35c3d73662ece8de32126f3572ac Mon Sep 17 00:00:00 2001
|
||||
From: Xavier Clerc <xclerc@janestreet.com>
|
||||
Date: Mon, 13 Aug 2018 12:56:37 +0100
|
||||
Subject: [PATCH] Change the order of `open`s so that `Format.dprintf` does not
|
||||
shadow `Log.dprintf`.
|
||||
|
||||
---
|
||||
src/main.ml | 2 +-
|
||||
src/solver.ml | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main.ml b/src/main.ml
|
||||
index 55155a7..c0b8772 100644
|
||||
--- a/src/main.ml
|
||||
+++ b/src/main.ml
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
(* Original author: Berke Durak *)
|
||||
open My_std
|
||||
+open Format
|
||||
open Log
|
||||
open Pathname.Operators
|
||||
open Command
|
||||
open Tools
|
||||
open Ocaml_specific
|
||||
-open Format
|
||||
;;
|
||||
|
||||
exception Exit_build_error of string
|
||||
diff --git a/src/solver.ml b/src/solver.ml
|
||||
index 9895a11..c0b7d06 100644
|
||||
--- a/src/solver.ml
|
||||
+++ b/src/solver.ml
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
(* Original author: Nicolas Pouillard *)
|
||||
open My_std
|
||||
-open Log
|
||||
open Format
|
||||
+open Log
|
||||
open Outcome
|
||||
|
||||
type backtrace =
|
||||
Binary file not shown.
BIN
ocaml-ocamlbuild-0.14.0.tar.gz
Normal file
BIN
ocaml-ocamlbuild-0.14.0.tar.gz
Normal file
Binary file not shown.
@ -2,13 +2,12 @@
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
Name: ocaml-ocamlbuild
|
||||
Version: 0.12.0
|
||||
Release: 2
|
||||
Version: 0.14.0
|
||||
Release: 1
|
||||
Summary: Build tool for OCaml libraries and programs
|
||||
License: LGPLv2+ with exceptions
|
||||
URL: https://github.com/ocaml/ocamlbuild
|
||||
Source0: https://github.com/ocaml/ocamlbuild/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0000: 0001-Change-the-order-of-open-s-so-that-Format.dprintf-do.patch
|
||||
BuildRequires: ocaml >= 4.04.0
|
||||
%description
|
||||
OCamlbuild is a build tool for building OCaml libraries and programs.
|
||||
@ -33,10 +32,13 @@ make configure \
|
||||
OCAMLBUILD_PREFIX=%{_prefix} \
|
||||
OCAMLBUILD_BINDIR=%{_bindir} \
|
||||
OCAMLBUILD_LIBDIR=%{_libdir}/ocaml \
|
||||
OCAMLBUILD_MANDIR=%{_mandir} \
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
OCAML_NATIVE=true
|
||||
OCAML_NATIVE_TOOLS=true
|
||||
%else
|
||||
OCAML_NATIVE=false
|
||||
OCAML_NATIVE_TOOLS=false
|
||||
%endif
|
||||
make \
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
@ -58,8 +60,6 @@ ln -sf ocamlbuild.native ocamlbuild
|
||||
ln -sf ocamlbuild.byte ocamlbuild
|
||||
%endif
|
||||
popd
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
|
||||
install -p -m 0644 man/ocamlbuild.1 $RPM_BUILD_ROOT%{_mandir}/man1/
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild/META
|
||||
|
||||
%files
|
||||
@ -95,6 +95,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild/META
|
||||
%doc manual/*
|
||||
|
||||
%changelog
|
||||
* Mon May 23 2022 yaoxin <yaoxin30@h-partners.com> - 0.14.0-1
|
||||
- Update to 0.14.0
|
||||
|
||||
* Thu Jan 20 2022 xu_ping <xuping33@huawei.com> - 0.12.0-2
|
||||
- fix build error due to `Format.dprintf` does not shadow `Log.dprintf`
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user