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

New upstream OCaml 4.02.0 final. 

- Add patch for ocaml-camlimages
  (see http://caml.inria.fr/mantis/view.php?id=6517)
This commit is contained in:
Richard W.M. Jones 2014-08-30 13:37:34 +01:00
parent 1dbbca1c02
commit 91c6a95e71
13 changed files with 2001 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-Don-t-ignore-.-configure-it-s-a-real-git-file.patch
View File

@ -1,7 +1,7 @@
From b82c357ec2006551276ec850537eead05f231c65 Mon Sep 17 00:00:00 2001
From ccc1bf226619608230dc94b26377756719cf7b20 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 24 Jun 2014 22:29:38 +0100
Subject: [PATCH 01/10] Don't ignore ./configure, it's a real git file.
Subject: [PATCH 01/11] Don't ignore ./configure, it's a real git file.
---
.gitignore | 1 -

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

@ -1,7 +1,7 @@
From 5bdd0491e1416bb33050ebd87a3fab3a23c8af97 Mon Sep 17 00:00:00 2001
From 0e3b6450f6ab803442a809b6da41d5d5c5da650f 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 02/10] Ensure empty compilerlibs/ directory is created by git.
Subject: [PATCH 02/11] Ensure empty compilerlibs/ directory is created by git.
This directory exists in the OCaml tarball, but is empty. As a
result, git ignores it unless we put a dummy file in it.

4
0003-Don-t-add-rpaths-to-libraries.patch
View File

@ -1,7 +1,7 @@
From 80e6085da156af1c6f64f05be3b02b63b8ed6d8d Mon Sep 17 00:00:00 2001
From 79f0f91e3e4abbfbd3564c11ea72e53310236afc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 24 Jun 2014 10:00:15 +0100
Subject: [PATCH 03/10] Don't add rpaths to libraries.
Subject: [PATCH 03/11] Don't add rpaths to libraries.
---
tools/Makefile.shared | 6 +++---

4
0004-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
View File

@ -1,7 +1,7 @@
From 9d21ab16494b43872ab6a5a359ff2e327ed8486c Mon Sep 17 00:00:00 2001
From 11b377aee2811891635982a5590fef62f12645b6 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 04/10] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
Subject: [PATCH 04/11] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
Debian, sent upstream.
See:

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

@ -1,7 +1,7 @@
From 1560523eee4445a28f10f872f8d4b0210c0c4f4b Mon Sep 17 00:00:00 2001
From 5308c47681201ef3beef3e543ab877f81aa08784 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 05/10] configure: Allow user defined C compiler flags.
Subject: [PATCH 05/11] configure: Allow user defined C compiler flags.
---
configure | 4 ++++

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

@ -1,7 +1,7 @@
From 39da8f7124a972e1b7c96af9ca69f9aff7532110 Mon Sep 17 00:00:00 2001
From b97622b54339f810bdca378ba7e58e5ad3152330 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 06/10] Add support for ppc64.
Subject: [PATCH 06/11] Add support for ppc64.
Note (1): This patch was rejected upstream because they don't have
appropriate hardware for testing.

4
0007-Add-support-for-ppc64le.patch
View File

@ -1,7 +1,7 @@
From 81f0522871559e17591efaac09d4b7b9d9b5dc50 Mon Sep 17 00:00:00 2001
From 6e3ca14f2d4dba2612eff59126140cde0d04394f Mon Sep 17 00:00:00 2001
From: Michel Normand <normand@linux.vnet.ibm.com>
Date: Tue, 18 Mar 2014 09:15:47 -0400
Subject: [PATCH 07/10] Add support for ppc64le.
Subject: [PATCH 07/11] Add support for ppc64le.
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---

4
0008-arm-arm64-Mark-stack-as-non-executable.patch
View File

@ -1,7 +1,7 @@
From 3a69252da94db29ea343ef9f5c1a84685cb60eee Mon Sep 17 00:00:00 2001
From a2a1e564bbe995f44de2023893f6dea51668b51e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 10 May 2014 03:20:35 -0400
Subject: [PATCH 08/10] arm, arm64: Mark stack as non-executable.
Subject: [PATCH 08/11] arm, arm64: Mark stack as non-executable.
The same fix as this one, which was only fully applied to
i686 & x86-64:

4
0009-arg-Add-no_arg-and-get_arg-helper-functions.patch
View File

@ -1,7 +1,7 @@
From 8903821937e38fc62571a6e42b699ab4d46b611e Mon Sep 17 00:00:00 2001
From 9e70610b08939bef354be508eb8eec6a498ec663 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 1 Apr 2014 11:17:07 +0100
Subject: [PATCH 09/10] arg: Add no_arg and get_arg helper functions.
Subject: [PATCH 09/11] arg: Add no_arg and get_arg helper functions.
The no_arg function in this patch is a no-op. It will do something
useful in the followups.

4
0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
View File

@ -1,7 +1,7 @@
From 485f2f45afcfbfe4046169dea1f971a8124e0fcf Mon Sep 17 00:00:00 2001
From 40e1fd09162cccabe79013c9f663c1b970dee771 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 1 Apr 2014 11:21:40 +0100
Subject: [PATCH 10/10] arg: Allow flags such as --flag=arg as well as --flag
Subject: [PATCH 10/11] arg: Allow flags such as --flag=arg as well as --flag
arg.
Allow flags to be followed directly by their argument, separated by an '='

1963
0011-PR-6517-use-ISO-C99-types-u-int-32-64-_t-in-preferen.patch Normal file
View File

File diff suppressed because it is too large Load Diff

25
ocaml.spec
View File

@ -15,12 +15,9 @@
%global natdynlink 0
%endif
%global gitcommit c48fc015a97826df3b39aefee8e96b1d20990ef5
%global shortcommit c48fc015
Name: ocaml
Version: 4.02.0
Release: 0.11.git%{shortcommit}%{?dist}
Release: 1%{?dist}
Summary: OCaml compiler and programming environment
@ -28,10 +25,10 @@ License: QPL and (LGPLv2+ with exceptions)
URL: http://www.ocaml.org
Source0: https://github.com/ocaml/%{name}/archive/%{gitcommit}/%{name}-%{gitcommit}.tar.gz
Source1: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02beta-refman-html.tar.gz
Source2: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02beta-refman.pdf
Source3: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02beta-refman.info.tar.gz
Source0: http://caml.inria.fr/pub/distrib/ocaml-4.02/%{name}-%{version}.tar.gz
Source1: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman-html.tar.gz
Source2: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman.pdf
Source3: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman.info.tar.gz
# IMPORTANT NOTE:
#
@ -58,6 +55,7 @@ Patch0007: 0007-Add-support-for-ppc64le.patch
Patch0008: 0008-arm-arm64-Mark-stack-as-non-executable.patch
Patch0009: 0009-arg-Add-no_arg-and-get_arg-helper-functions.patch
Patch0010: 0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
Patch0011: 0011-PR-6517-use-ISO-C99-types-u-int-32-64-_t-in-preferen.patch
# Add BFD support so that ocamlobjinfo supports *.cmxs format (RHBZ#1113735).
BuildRequires: binutils-devel
@ -190,9 +188,9 @@ may not be portable between versions.
%prep
%setup -q -T -b 0 -n %{name}-%{gitcommit}
%setup -q -T -D -a 1 -n %{name}-%{gitcommit}
%setup -q -T -D -a 3 -n %{name}-%{gitcommit}
%setup -q -T -b 0 -n %{name}-%{version}
%setup -q -T -D -a 1 -n %{name}-%{version}
%setup -q -T -D -a 3 -n %{name}-%{version}
cp %{SOURCE2} refman.pdf
git init
@ -420,6 +418,11 @@ fi
%changelog
* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 4.02.0-1
- New upstream OCaml 4.02.0 final.
- Add patch for ocaml-camlimages
(see http://caml.inria.fr/mantis/view.php?id=6517)
* Fri Aug 22 2014 Richard W.M. Jones <rjones@redhat.com> - 4.02.0-0.11.gitc48fc015
- Rebase on top of OCaml 4.02+rc1 (same as git commit c48fc015).

8
sources
View File

@ -1,4 +1,4 @@
c308e831a1c5d6b3024bb339fcee72f4 ocaml-4.02beta-refman-html.tar.gz
672044269cea28b661fca5c0edadc195 ocaml-4.02beta-refman.info.tar.gz
d05fc06025d7bad2a969a659f6de1c83 ocaml-4.02beta-refman.pdf
efb11f942c57b77ff587defc4a9fcdb4 ocaml-c48fc015a97826df3b39aefee8e96b1d20990ef5.tar.gz
8bba7e7d872083af1723dd450e07a5f4 ocaml-4.02.0.tar.gz
20b691d71d36df69f9cb16ab4521ed49 ocaml-4.02-refman-html.tar.gz
265b7db123e925e8b7b70ca2266b4206 ocaml-4.02-refman.info.tar.gz
1d683029a6ef48e34cc24eb1982cdd05 ocaml-4.02-refman.pdf