New upstream version: 4.02.3.

This commit is contained in:
Richard W.M. Jones 2015-07-28 10:58:32 +01:00
parent cf3cc5b245
commit 34fde6cc25
21 changed files with 49 additions and 42 deletions

View File

@ -1,4 +1,4 @@
From 6fbdb9e95ecd4654067565afe0c0b12fbeed3336 Mon Sep 17 00:00:00 2001
From 988c1068100b7f30bd8b0d2c1195ac383705dc1c 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/19] Don't ignore ./configure, it's a real git file.
@ -20,5 +20,5 @@ index 87f7cda..8aad7c2 100644
/ocamlc.opt
/expunge
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 3cecfa8e2765a4f1a126af37ddb77ad67c3f6720 Mon Sep 17 00:00:00 2001
From d08dc9232f0ee90e3dc8132b9e63935be58e668e 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/19] Ensure empty compilerlibs/ directory is created by git.
@ -14,5 +14,5 @@ diff --git a/compilerlibs/.exists b/compilerlibs/.exists
new file mode 100644
index 0000000..e69de29
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From c8084922e188649becfe1e8bbe89b7fab0de6dd0 Mon Sep 17 00:00:00 2001
From 73db2ab33221880d2399b2e98038219d798861ff 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/19] Don't add rpaths to libraries.
@ -25,5 +25,5 @@ index 0b90cd3..dc48712 100644
sed -n -e 's/^#ml //p' ../config/Makefile) \
> ocamlmklibconfig.ml
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From bfcc9876923963085d23537ca444469362673889 Mon Sep 17 00:00:00 2001
From 953b84dd9626f2be68f5cc8942478338250d560b 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/19] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
@ -236,5 +236,5 @@ index 0000000..e28800f
+ header.units
+ end
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 67b0b755b208027600255e379f98cdd8a919c7aa Mon Sep 17 00:00:00 2001
From 613c9273f4cd73eb6e6750d8be29d7fa7f5a68c9 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/19] configure: Allow user defined C compiler flags.
@ -23,5 +23,5 @@ index 4ea1498..d006010 100755
cclibs="$cclibs $mathlib"
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 83b653b6b163018086c0d9d66d02feb5edeb44d1 Mon Sep 17 00:00:00 2001
From d1b5848cac51fc63723cdecb857f520caa0b27a2 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/19] Add support for ppc64.
@ -2126,5 +2126,5 @@ index d006010..cb289fb 100755
aspp="$bytecc -c";;
sparc,solaris) as="${TOOLPREF}as"
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From cec09000c6659261e90310c5eff81b936849edf0 Mon Sep 17 00:00:00 2001
From 49dcd94b5db72c7d6d0801309ca1e218b759fa00 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Oct 2014 12:59:23 +0200
Subject: [PATCH 07/19] ppc64: Update for OCaml 4.02.0.
@ -201,5 +201,5 @@ index b7bba9b..b582b6a 100644
| Iintop(Imod) -> 40 (* assuming full stall *)
| Iintop(Icomp _) -> 4
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 5a2495689fcb11c4ed690008f4eab7dfc51d89ef Mon Sep 17 00:00:00 2001
From d63e08ea4d073b2f5d5297eff396110d949c0352 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 08/19] Add support for ppc64le.
@ -1913,5 +1913,5 @@ index cb289fb..6157157 100755
aspp="$bytecc -c";;
sparc,solaris) as="${TOOLPREF}as"
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 1a1d2ae928bcc88591502414a4167865da2db93a Mon Sep 17 00:00:00 2001
From 5abd39f1a1e4f7c4dd0c1b1252f98e7ee5a95e27 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Oct 2014 12:59:23 +0200
Subject: [PATCH 09/19] ppc64le: Update for OCaml 4.02.0.
@ -200,5 +200,5 @@ index b7bba9b..b582b6a 100644
| Iintop(Imod) -> 40 (* assuming full stall *)
| Iintop(Icomp _) -> 4
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From b2b2dd82e4aa60307ba2f98c142dd2980bf4dc18 Mon Sep 17 00:00:00 2001
From e3a29e8c9e85c5d1a4dc28f2ab746dae57c2636b 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 10/19] arm, arm64: Mark stack as non-executable.
@ -35,5 +35,5 @@ index 9b4b9ab..c23168b 100644
+ /* Mark stack as non-executable, PR#4564 */
+ .section .note.GNU-stack,"",%progbits
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From ee670da51f4d7763f607e456186c52e72a09a929 Mon Sep 17 00:00:00 2001
From e48a32ed47b6b5a77653ca3b40afb7c26aca7123 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 11/19] arg: Add no_arg and get_arg helper functions.
@ -114,5 +114,5 @@ index d7b8ac0..a8f3964 100644
treat_action action
with Bad m -> stop (Message m);
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 94a567b59750a3765140a6c8bd41223f5ecf6220 Mon Sep 17 00:00:00 2001
From b5e341afca2bdb390255cb74b3e3f5d1e3971590 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 12/19] arg: Allow flags such as --flag=arg as well as --flag
@ -80,5 +80,5 @@ index 0999edf..71af638 100644
Examples ([cmd] is assumed to be the command name):
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From b6ae488dba765380975d71a03c5afdd02c4b5c58 Mon Sep 17 00:00:00 2001
From 341e1f0892d1c7d39057e733b035fce54568d28b Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Wed, 27 Aug 2014 09:58:33 +0000
Subject: [PATCH 13/19] PR#6517: use ISO C99 types {,u}int{32,64}_t in
@ -1959,5 +1959,5 @@ index b8d02ea..6f3dc54 100644
lseek(fd, (long) -TRAILER_SIZE, SEEK_END);
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 51d003033bc15d215a6860714190edacecd724ab Mon Sep 17 00:00:00 2001
From e6b37c1b0c9ee724ae81b74a84e133a75ed9e3a3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 11 Sep 2014 14:49:54 +0100
Subject: [PATCH 14/19] ppc, ppc64, ppc64le: Mark stack as non-executable.
@ -70,5 +70,5 @@ index 98c42e2..b7bfce4 100644
+/* Mark stack as non-executable, PR#4564 */
+ .section .note.GNU-stack,"",%progbits
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From e1dbbb661405f35600d78f16a0a729a8ac014f61 Mon Sep 17 00:00:00 2001
From 3f2be69df7fa930e0584abc217ef9d06b1155696 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Oct 2014 10:10:54 +0100
Subject: [PATCH 15/19] ppc64/ppc64le: proc: Interim definitions for op_is_pure
@ -80,5 +80,5 @@ index 476c984..56473ac 100644
let num_stack_slots = [| 0; 0 |]
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From 4198d84ca53b4760269abe7bfbecf9ecb853a303 Mon Sep 17 00:00:00 2001
From 3aff352bb01751cddeb2b18c26576337d1b46c90 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 28 May 2015 16:13:40 -0400
Subject: [PATCH 16/19] ppc64le: Fix calling convention of external functions
@ -30,5 +30,5 @@ index 56473ac..c705695 100644
let extcall_use_push = false
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From e549e91ccfeb0c8bb99aa4095cc2088ab443e7a3 Mon Sep 17 00:00:00 2001
From 8f8713a113a218e7d7203c1575e8302f49821f41 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Jun 2015 08:31:31 -0400
Subject: [PATCH 17/19] ppc64: Fix PIC variant of asmrun.
@ -22,5 +22,5 @@ index a63321e..4aa2fc9 100644
cp power64le-$(SYSTEM).o power64le.o
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From d662ee171f94885a565828818ad0ccd73af06d39 Mon Sep 17 00:00:00 2001
From 184190bc52eb86fe37864acc4679297a52756b01 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Jun 2015 08:32:31 -0400
Subject: [PATCH 18/19] ppc64le: Fix PIC variant of asmrun.
@ -22,5 +22,5 @@ index 4aa2fc9..8997e15 100644
ln -s ../byterun/main.c main.c
misc.c: ../byterun/misc.c
--
2.3.1
2.4.3

View File

@ -1,4 +1,4 @@
From cf026cf66315609afe8f76272e493259bade255f Mon Sep 17 00:00:00 2001
From 351e776744c56bf6c4afb75e8e9f510e89c15233 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Jun 2015 14:18:38 -0400
Subject: [PATCH 19/19] =?UTF-8?q?ppc64/ppc64le:=20Fix=20behaviour=20of=20I?=
@ -41,5 +41,5 @@ index 586534b..2155e79 100644
(* Operations on addressing modes *)
--
2.3.1
2.4.3

View File

@ -16,8 +16,8 @@
%endif
Name: ocaml
Version: 4.02.2
Release: 4%{?dist}
Version: 4.02.3
Release: 1%{?dist}
Summary: OCaml compiler and programming environment
@ -39,7 +39,7 @@ Source3: http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman.in
#
# https://git.fedorahosted.org/cgit/fedora-ocaml.git/
#
# Current branch: fedora-23-4.02
# Current branch: fedora-24-4.02
#
# ALTERNATIVELY add a patch to the end of the list (leaving the
# existing patches unchanged) adding a comment to note that it should
@ -294,6 +294,10 @@ install -m 0755 ocamlbyteinfo $RPM_BUILD_ROOT%{_bindir}
find $RPM_BUILD_ROOT -name .ignore -delete
# Remove .cmt and .cmti files, for now. We could package them later.
# See also: http://www.ocamlpro.com/blog/2012/08/20/ocamlpro-and-4.00.0.html
find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
%post docs
/sbin/install-info \
@ -441,6 +445,9 @@ fi
%changelog
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.02.3-1
- New upstream version: 4.02.3.
* Mon Jun 29 2015 Richard W.M. Jones <rjones@redhat.com> - 4.02.2-4
- Couple of minor build fixes for ppc64 and ppc64le.
- ppc64/ppc64le: Fix behaviour of Int64.max_int ÷ -1 (RHBZ#1236615).

View File

@ -1,4 +1,4 @@
20b691d71d36df69f9cb16ab4521ed49 ocaml-4.02-refman-html.tar.gz
265b7db123e925e8b7b70ca2266b4206 ocaml-4.02-refman.info.tar.gz
1d683029a6ef48e34cc24eb1982cdd05 ocaml-4.02-refman.pdf
359ad0ef89717341767142f2a4d050b2 ocaml-4.02.2.tar.gz
ef1a324608c97031cbd92a442d685ab7 ocaml-4.02.3.tar.gz