rpms
/
ocaml
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport ocamlbuild -where fix.

This commit is contained in:
Richard W.M. Jones 2009-05-26 13:09:02 +00:00
parent 9f89b6c018
commit 1f353c5e81
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ocaml.spec
View File

@ -2,7 +2,7 @@
Name: ocaml
Version: 3.11.1
Release: 0.rc0.1%{?dist}
Release: 0.rc0.2%{?dist}
Summary: Objective Caml compiler and programming environment
@ -24,6 +24,9 @@ Patch1: ocaml-user-cflags.patch
# Support for PPC64 platform by David Woodhouse:
Patch3: ocaml-3.11.0-ppc64.patch
# Backport ocamlbuild -where fix to 3.11.1+rc0.
Patch4: ocamlbuild_where.ml.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@ -195,6 +198,7 @@ man pages and info files.
%patch0 -p1 -b .rpath
%patch1 -p1 -b .cflags
%patch3 -p1 -b .ppc64
%patch4 -p1 -b .ocamlbuild
cp %{SOURCE2} refman.pdf
@ -435,6 +439,9 @@ fi
%changelog
* Tue May 26 2009 Richard W.M. Jones <rjones@redhat.com> - 3.11.1-0.rc0.2
- Backport ocamlbuild -where fix.
* Fri May 22 2009 Richard W.M. Jones <rjones@redhat.com> - 3.11.1-0.rc0.1
- 3.11.1 release candidate 0.

12
ocamlbuild_where.ml.diff Normal file
View File

@ -0,0 +1,12 @@
--- ocaml/ocamlbuild/ocamlbuild_where.ml 2009/03/05 14:33:06 1.1.2.2
+++ ocaml/ocamlbuild/ocamlbuild_where.ml 2009/05/24 09:11:39 1.1.2.3
@@ -1,5 +1,7 @@
let bindir = ref Ocamlbuild_Myocamlbuild_config.bindir;;
let libdir = ref begin
- try Filename.concat (Sys.getenv "OCAMLLIB") "ocamlbuild"
- with Not_found -> Ocamlbuild_Myocamlbuild_config.libdir
+ Filename.concat
+ (try Sys.getenv "OCAMLLIB"
+ with Not_found -> Ocamlbuild_Myocamlbuild_config.libdir)
+ "ocamlbuild"
end;;