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

OCaml 4.00.1. 

- Clean up spec file.
This commit is contained in:
Richard W.M. Jones 2012-10-16 19:19:17 +01:00
parent 0612b77708
commit ed0c3aae64
9 changed files with 41 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.gitignore vendored
View File

@ -1,20 +1,5 @@
ocaml-3.11-refman.html.tar.gz
ocaml-3.11-refman.info.tar.gz
ocaml-3.11-refman.pdf
ocaml-3.11.1+rc0.tar.gz
ocaml-3.11.1+rc1.tar.gz
ocaml-3.11.1.tar.bz2
ocaml-3.11.2+rc1.tar.bz2
ocaml-3.11.2.tar.bz2
/ocaml-3.12.0.tar.gz
/ocaml-3.12-refman.html.tar.gz
/ocaml-3.12-refman.info.tar.gz
/ocaml-3.12-refman.pdf
/ocaml-3.12.1.tar.gz
/ocaml-4.00.0+beta2.tar.bz2
/ocaml-4.00beta-refman-html.tar.gz
/ocaml-4.00beta-refman.info.tar.gz
/ocaml-4.00beta-refman.pdf
/ocaml-4.00.0.tar.bz2
/ocaml-4.00-refman.info.tar.gz
/ocaml-4.00-refman.pdf
/.build*.log
/clog
/ocaml-*.tar.bz2
/ocaml-*.tar.gz
/ocaml-*-refman.pdf

6
0001-Add-.gitignore-file-to-ignore-generated-files.patch
View File

@ -1,10 +1,10 @@
From 15b5463d5d69a235e9ae6dd63df69cf2895d5b0d Mon Sep 17 00:00:00 2001
From 51c4b66e0b0e07a337fa33b081ff1314e22d8416 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 7 Jun 2012 16:00:28 +0100
Subject: [PATCH 1/6] Add .gitignore file to ignore generated files.
---
.gitignore | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
.gitignore | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 345 insertions(+)
create mode 100644 .gitignore
@ -360,5 +360,5 @@ index 0000000..b67b39f
+/yacc/ocamlyacc
+/yacc/version.h
--
1.7.10.4
1.7.11.4

4
0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch
View File

@ -1,4 +1,4 @@
From 4199df517cc7701c7eab526077d144ed3b9509f2 Mon Sep 17 00:00:00 2001
From d284aa71cb426a99e28c5acfa1a99f932767fede Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 7 Jun 2012 15:36:16 +0100
Subject: [PATCH 2/6] Ensure empty compilerlibs/ directory is created by git.
@ -13,5 +13,5 @@ diff --git a/compilerlibs/.exists b/compilerlibs/.exists
new file mode 100644
index 0000000..e69de29
--
1.7.10.4
1.7.11.4

8
0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
View File

@ -1,4 +1,4 @@
From e2e4674341b3f2f16adb30e2d0efd3ff824d0d84 Mon Sep 17 00:00:00 2001
From 133ddd0bb459bf3c687e149c850454c3c3b4f406 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 29 May 2012 20:40:36 +0100
Subject: [PATCH 3/6] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
@ -7,8 +7,8 @@ Subject: [PATCH 3/6] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
See:
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git;a=tree;f=debian/ocamlbyteinfo;hb=HEAD
---
ocamlbyteinfo.ml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++
ocamlplugininfo.ml | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++
ocamlbyteinfo.ml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++
ocamlplugininfo.ml | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 210 insertions(+)
create mode 100644 ocamlbyteinfo.ml
create mode 100644 ocamlplugininfo.ml
@ -236,5 +236,5 @@ index 0000000..e28800f
+ header.units
+ end
--
1.7.10.4
1.7.11.4

6
0004-Don-t-add-rpaths-to-libraries.patch
View File

@ -1,10 +1,10 @@
From 89b696fcb9fb4b34e79f4cf97b42057fe0c4c2ab Mon Sep 17 00:00:00 2001
From 1e6bdb2cbc4a515ea589604e895501b40925585d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 29 May 2012 20:43:34 +0100
Subject: [PATCH 4/6] Don't add rpaths to libraries.
---
tools/Makefile.shared | 3 ---
tools/Makefile.shared | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/Makefile.shared b/tools/Makefile.shared
@ -22,5 +22,5 @@ index f6818d3..aadd7e2 100644
ocamlmklib.mlp >> ocamlmklib.ml
--
1.7.10.4
1.7.11.4

6
0005-configure-Allow-user-defined-C-compiler-flags.patch
View File

@ -1,10 +1,10 @@
From 054fdef0909de3dd1bd1142b4e57ff29f4826cfe Mon Sep 17 00:00:00 2001
From 49388917a7cc798b89b95c86c5a65ed2cbea7bd4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 29 May 2012 20:44:18 +0100
Subject: [PATCH 5/6] configure: Allow user defined C compiler flags.
---
configure | 4 ++++
configure | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
@ -23,5 +23,5 @@ index e08bbce..cda73fd 100755
cclibs="$cclibs $mathlib"
--
1.7.10.4
1.7.11.4

24
0006-Add-support-for-ppc64.patch
View File

@ -1,4 +1,4 @@
From 8c0add238693e59d78e665e0d5275f6e77c35f8c Mon Sep 17 00:00:00 2001
From 5b518e4ccac2ab99508f98b0d6a03dc1613a91f9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 29 May 2012 20:47:07 +0100
Subject: [PATCH 6/6] Add support for ppc64.
@ -20,16 +20,16 @@ register (RHBZ#826649).
Includes updates for OCaml 4.00.0.
---
asmcomp/power64/arch.ml | 87 ++++
asmcomp/power64/emit.mlp | 989 +++++++++++++++++++++++++++++++++++++++++
asmcomp/power64/proc.ml | 241 ++++++++++
asmcomp/power64/reload.ml | 18 +
asmcomp/power64/scheduling.ml | 65 +++
asmcomp/power64/selection.ml | 103 +++++
asmrun/Makefile | 6 +
asmrun/power64-elf.S | 486 ++++++++++++++++++++
asmrun/stack.h | 9 +
configure | 3 +
asmcomp/power64/arch.ml | 87 ++++
asmcomp/power64/emit.mlp | 989 ++++++++++++++++++++++++++++++++++++++++++
asmcomp/power64/proc.ml | 241 ++++++++++
asmcomp/power64/reload.ml | 18 +
asmcomp/power64/scheduling.ml | 65 +++
asmcomp/power64/selection.ml | 103 +++++
asmrun/Makefile | 6 +
asmrun/power64-elf.S | 486 +++++++++++++++++++++
asmrun/stack.h | 9 +
configure | 3 +
10 files changed, 2007 insertions(+)
create mode 100644 asmcomp/power64/arch.ml
create mode 100644 asmcomp/power64/emit.mlp
@ -2129,5 +2129,5 @@ index cda73fd..314d1e9 100755
aspp='gcc -c';;
power,*,rhapsody) as="as -arch $model"
--
1.7.10.4
1.7.11.4

23
ocaml.spec
View File

@ -1,17 +1,15 @@
Name: ocaml
Version: 4.00.0
Release: 2%{?dist}
Version: 4.00.1
Release: 1%{?dist}
Summary: OCaml compiler and programming environment
Group: Development/Languages
License: QPL and (LGPLv2+ with exceptions)
URL: http://www.ocaml.org
Source0: http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-%{version}.tar.bz2
# Link to non-beta file was broken on 2012-07-28:
Source1: http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00beta-refman-html.tar.gz
Source1: http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00-refman-html.tar.gz
Source2: http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00-refman.pdf
Source3: http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00-refman.info.tar.gz
@ -97,7 +95,6 @@ and a comprehensive library.
%package runtime
Group: System Environment/Libraries
Summary: OCaml runtime environment
Requires: util-linux
Provides: ocaml(runtime) = %{version}
@ -111,7 +108,6 @@ bytecode.
%package source
Group: Development/Languages
Summary: Source code for OCaml libraries
Requires: ocaml = %{version}-%{release}
@ -120,7 +116,6 @@ Source code for OCaml libraries.
%package x11
Group: System Environment/Libraries
Summary: X11 support for OCaml
Requires: ocaml-runtime = %{version}-%{release}
Requires: libX11-devel
@ -130,7 +125,6 @@ X11 support for OCaml.
%package labltk
Group: System Environment/Libraries
Summary: Tk bindings for OCaml
Requires: ocaml-runtime = %{version}-%{release}
@ -142,7 +136,6 @@ This package contains the runtime files.
%package labltk-devel
Group: Development/Libraries
Summary: Development files for labltk
Requires: ocaml = %{version}-%{release}
Requires: %{name}-labltk = %{version}-%{release}
@ -159,7 +152,6 @@ browser for code editing and library browsing.
%package camlp4
Group: Development/Languages
Summary: Pre-Processor-Pretty-Printer for OCaml
Requires: ocaml-runtime = %{version}-%{release}
@ -171,7 +163,6 @@ This package contains the runtime files.
%package camlp4-devel
Group: Development/Languages
Summary: Pre-Processor-Pretty-Printer for OCaml
Requires: ocaml = %{version}-%{release}
Requires: %{name}-camlp4 = %{version}-%{release}
@ -184,7 +175,6 @@ This package contains the development files.
%package ocamldoc
Group: Development/Languages
Summary: Documentation generator for OCaml.
Requires: ocaml = %{version}-%{release}
Provides: ocamldoc
@ -194,7 +184,6 @@ Documentation generator for OCaml.
%package emacs
Group: Development/Languages
Summary: Emacs mode for OCaml
Requires: ocaml = %{version}-%{release}
Requires: emacs
@ -204,7 +193,6 @@ Emacs mode for OCaml.
%package docs
Group: Development/Languages
Summary: Documentation for OCaml
Requires: ocaml = %{version}-%{release}
Requires(post): /sbin/install-info
@ -220,7 +208,6 @@ man pages and info files.
%package compiler-libs
Group: Development/Languages
Summary: Compiler libraries for OCaml
Requires: ocaml = %{version}-%{release}
@ -523,6 +510,10 @@ fi
%changelog
* Tue Oct 16 2012 Richard W.M. Jones <rjones@redhat.com> - 4.00.1-1
- Update to upstream version 4.00.1.
- Clean up the spec file further.
* Thu Aug 16 2012 Richard W.M. Jones <rjones@redhat.com> - 4.00.0-2
- ppc supports natdynlink.

4
sources
View File

@ -1,4 +1,4 @@
4e24c15df07bba220425da67f1a43c31 ocaml-4.00beta-refman-html.tar.gz
7b14718e69d84f10e7fb251c7ce0acd2 ocaml-4.00.0.tar.bz2
1c9dca1130edc0d1fa4647ae2cd7564a ocaml-4.00.1.tar.bz2
ad05925dab6066863211b03d81f7a119 ocaml-4.00-refman-html.tar.gz
229d6b00715bf0d004a567bb1c3174a0 ocaml-4.00-refman.info.tar.gz
a9d66274dfb3a7244e725ab8f2b31209 ocaml-4.00-refman.pdf