[ocaml] Rebase on top of 4.02.0 beta commit 10e45753.
Richard W.M. Jones
rjones at fedoraproject.org
Fri Aug 1 15:20:52 UTC 2014
commit f482b154ca4adabceb130024243be9e4e40b64e3
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Fri Aug 1 15:43:00 2014 +0100
Rebase on top of 4.02.0 beta commit 10e45753.
This changes the definition of String and Bytes, thus necessitating
another complete rebuild :-(
...t-ignore-.-configure-it-s-a-real-git-file.patch | 4 ++--
...y-compilerlibs-directory-is-created-by-gi.patch | 4 ++--
0003-Don-t-add-rpaths-to-libraries.patch | 4 ++--
...fo-ocamlplugininfo-Useful-utilities-from-.patch | 4 ++--
...igure-Allow-user-defined-C-compiler-flags.patch | 4 ++--
0006-Add-support-for-ppc64.patch | 4 ++--
0007-Add-support-for-ppc64le.patch | 4 ++--
0008-arm-arm64-Mark-stack-as-non-executable.patch | 4 ++--
...g-Add-no_arg-and-get_arg-helper-functions.patch | 4 ++--
...lags-such-as-flag-arg-as-well-as-flag-arg.patch | 4 ++--
ocaml.spec | 9 ++++++---
sources | 2 +-
12 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/0001-Don-t-ignore-.-configure-it-s-a-real-git-file.patch b/0001-Don-t-ignore-.-configure-it-s-a-real-git-file.patch
index f257220..793b53d 100644
--- a/0001-Don-t-ignore-.-configure-it-s-a-real-git-file.patch
+++ b/0001-Don-t-ignore-.-configure-it-s-a-real-git-file.patch
@@ -1,4 +1,4 @@
-From 7cc05d407f206f4f506cd9720e4ec62024d88e99 Mon Sep 17 00:00:00 2001
+From 39f4cb65afc38a5012a8cdf694dd5686dd60b727 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at 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.
@@ -20,5 +20,5 @@ index 2817041..6835234 100644
/ocamlc.opt
/expunge
--
-1.9.0
+1.9.3
diff --git a/0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch b/0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch
index d8461f3..bb930e0 100644
--- a/0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch
+++ b/0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch
@@ -1,4 +1,4 @@
-From 6e7303dbfe3edefdb8449fc39e7ee63958fbd60a Mon Sep 17 00:00:00 2001
+From b766bba6c388a6772d7d918ea7134f84926c41fd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Thu, 7 Jun 2012 15:36:16 +0100
Subject: [PATCH 02/10] 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
--
-1.9.0
+1.9.3
diff --git a/0003-Don-t-add-rpaths-to-libraries.patch b/0003-Don-t-add-rpaths-to-libraries.patch
index 0a16984..4459712 100644
--- a/0003-Don-t-add-rpaths-to-libraries.patch
+++ b/0003-Don-t-add-rpaths-to-libraries.patch
@@ -1,4 +1,4 @@
-From 8dd577b4959375c1011e4dcf835ee74caef45420 Mon Sep 17 00:00:00 2001
+From ba4b5ff5197769c89169697dae4787922c99a92c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 24 Jun 2014 10:00:15 +0100
Subject: [PATCH 03/10] Don't add rpaths to libraries.
@@ -25,5 +25,5 @@ index c4c9030..7a918e5 100644
sed -n -e 's/^#ml //p' ../config/Makefile) \
> ocamlmklibconfig.ml
--
-1.9.0
+1.9.3
diff --git a/0004-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch b/0004-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
index b3ad0e4..f2ec3b2 100644
--- a/0004-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
+++ b/0004-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
@@ -1,4 +1,4 @@
-From fd8991ecdd206adc765a8da4953da6599ccacf3b Mon Sep 17 00:00:00 2001
+From b57344b6f2527f13dfcf6452353f09c85faef940 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 29 May 2012 20:40:36 +0100
Subject: [PATCH 04/10] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
@@ -236,5 +236,5 @@ index 0000000..e28800f
+ header.units
+ end
--
-1.9.0
+1.9.3
diff --git a/0005-configure-Allow-user-defined-C-compiler-flags.patch b/0005-configure-Allow-user-defined-C-compiler-flags.patch
index 89da7f9..d1112b2 100644
--- a/0005-configure-Allow-user-defined-C-compiler-flags.patch
+++ b/0005-configure-Allow-user-defined-C-compiler-flags.patch
@@ -1,4 +1,4 @@
-From d4d6771059115cbb43bba5ab44eba8f30df6012e Mon Sep 17 00:00:00 2001
+From f90ddd09c1f50a993806632efb46416af3e20e0e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 29 May 2012 20:44:18 +0100
Subject: [PATCH 05/10] configure: Allow user defined C compiler flags.
@@ -23,5 +23,5 @@ index 74d489f..251ee2c 100755
cclibs="$cclibs $mathlib"
--
-1.9.0
+1.9.3
diff --git a/0006-Add-support-for-ppc64.patch b/0006-Add-support-for-ppc64.patch
index ef5ddc8..8be4322 100644
--- a/0006-Add-support-for-ppc64.patch
+++ b/0006-Add-support-for-ppc64.patch
@@ -1,4 +1,4 @@
-From 23059f5c594bbae825cfa6a0e511363a13ec5104 Mon Sep 17 00:00:00 2001
+From 691620fe915dfa850ad0dd126619184db0e0cbf3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 29 May 2012 20:47:07 +0100
Subject: [PATCH 06/10] Add support for ppc64.
@@ -2126,5 +2126,5 @@ index 251ee2c..5f92bac 100755
aspp="$bytecc -c";;
sparc,solaris) as="${TOOLPREF}as"
--
-1.9.0
+1.9.3
diff --git a/0007-Add-support-for-ppc64le.patch b/0007-Add-support-for-ppc64le.patch
index 028502c..0a1c54e 100644
--- a/0007-Add-support-for-ppc64le.patch
+++ b/0007-Add-support-for-ppc64le.patch
@@ -1,4 +1,4 @@
-From 1b87259914c2ed9ee0dc7e8c3dacbe1b7a257504 Mon Sep 17 00:00:00 2001
+From 925ead0db97e6ae5ed158feabd80b0cc2b67a844 Mon Sep 17 00:00:00 2001
From: Michel Normand <normand at linux.vnet.ibm.com>
Date: Tue, 18 Mar 2014 09:15:47 -0400
Subject: [PATCH 07/10] Add support for ppc64le.
@@ -1913,5 +1913,5 @@ index 5f92bac..8b300a4 100755
aspp="$bytecc -c";;
sparc,solaris) as="${TOOLPREF}as"
--
-1.9.0
+1.9.3
diff --git a/0008-arm-arm64-Mark-stack-as-non-executable.patch b/0008-arm-arm64-Mark-stack-as-non-executable.patch
index 6805361..c852849 100644
--- a/0008-arm-arm64-Mark-stack-as-non-executable.patch
+++ b/0008-arm-arm64-Mark-stack-as-non-executable.patch
@@ -1,4 +1,4 @@
-From 0e1c8ad58e3841d9610a4c4aa19c38c5dbd02040 Mon Sep 17 00:00:00 2001
+From dab7f94484f21ae05a996a11177bad9b4435b610 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sat, 10 May 2014 03:20:35 -0400
Subject: [PATCH 08/10] arm, arm64: Mark stack as non-executable.
@@ -35,5 +35,5 @@ index fa871df..50abdae 100644
+ /* Mark stack as non-executable, PR#4564 */
+ .section .note.GNU-stack,"",%progbits
--
-1.9.0
+1.9.3
diff --git a/0009-arg-Add-no_arg-and-get_arg-helper-functions.patch b/0009-arg-Add-no_arg-and-get_arg-helper-functions.patch
index ef086e3..8c4c818 100644
--- a/0009-arg-Add-no_arg-and-get_arg-helper-functions.patch
+++ b/0009-arg-Add-no_arg-and-get_arg-helper-functions.patch
@@ -1,4 +1,4 @@
-From 9466d5ed5d621cb6ffd61ea952321159f6c2b716 Mon Sep 17 00:00:00 2001
+From e195fe3961208a2dd2b668b5a37f5c44fa6445a1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 1 Apr 2014 11:17:07 +0100
Subject: [PATCH 09/10] arg: Add no_arg and get_arg helper functions.
@@ -114,5 +114,5 @@ index 0f6480b..a41e0a2 100644
treat_action action
with Bad m -> stop (Message m);
--
-1.9.0
+1.9.3
diff --git a/0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch b/0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
index 54a25d5..1fbfc6d 100644
--- a/0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
+++ b/0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
@@ -1,4 +1,4 @@
-From f3b3583ce96430228aa9d2286da0bd0f2b82eca9 Mon Sep 17 00:00:00 2001
+From a39906c0ab2560969575d60b3ff74e641027f8a9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at 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
@@ -78,5 +78,5 @@ index 22eda40..7078071 100644
Examples ([cmd] is assumed to be the command name):
--
-1.9.0
+1.9.3
diff --git a/ocaml.spec b/ocaml.spec
index 2c40220..1b87dbc 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -15,12 +15,12 @@
%global natdynlink 0
%endif
-%global gitcommit c4f3a6c70c12681871573851921d3b070be5744b
-%global shortcommit c4f3a6c7
+%global gitcommit 10e45753f3d0b6b0313b6377afd722e54d7286b5
+%global shortcommit 10e45753
Name: ocaml
Version: 4.02.0
-Release: 0.7.git%{shortcommit}%{?dist}
+Release: 0.8.git%{shortcommit}%{?dist}
Summary: OCaml compiler and programming environment
@@ -420,6 +420,9 @@ fi
%changelog
+* Fri Aug 01 2014 Richard W.M. Jones <rjones at redhat.com> - 4.02.0-0.8
+- Rebase on top of 4.02.0 beta commit 10e45753.
+
* Sat Jul 19 2014 Richard W.M. Jones <rjones at redhat.com> - 4.02.0-0.7
- Rebase on top of 4.02.0 beta commit c4f3a6c7.
- Remove the patch to disable CSE, since that problem is fixed upstream.
diff --git a/sources b/sources
index 2abd34b..1d09e35 100644
--- a/sources
+++ b/sources
@@ -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
-469c97675af781c2f737f5692fac3b84 ocaml-c4f3a6c70c12681871573851921d3b070be5744b.tar.gz
+979cc1eb74713122fc15a406a10c54a8 ocaml-10e45753f3d0b6b0313b6377afd722e54d7286b5.tar.gz
More information about the scm-commits
mailing list