diff --git a/0001-Add-.gitignore-file-to-ignore-generated-files.patch b/0001-Add-.gitignore-file-to-ignore-generated-files.patch index 6f8eeb1..859b2f1 100644 --- a/0001-Add-.gitignore-file-to-ignore-generated-files.patch +++ b/0001-Add-.gitignore-file-to-ignore-generated-files.patch @@ -1,7 +1,7 @@ From 07839dfc746ccee318601b9668aa094d4465bc6e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 7 Jun 2012 16:00:28 +0100 -Subject: [PATCH 01/12] Add .gitignore file to ignore generated files. +Subject: [PATCH 01/13] Add .gitignore file to ignore generated files. --- .gitignore | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 7ec82db..27afc5e 100644 --- a/0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch +++ b/0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch @@ -1,7 +1,7 @@ From 7756582741dc56070c03629a3b4640147723beda Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 7 Jun 2012 15:36:16 +0100 -Subject: [PATCH 02/12] Ensure empty compilerlibs/ directory is created by git. +Subject: [PATCH 02/13] 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. diff --git a/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch b/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch index f4739d5..a4fd7ae 100644 --- a/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch +++ b/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch @@ -1,7 +1,7 @@ From a6d87cd4bc62d3987835c1ac844f35cc06804294 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 May 2012 20:40:36 +0100 -Subject: [PATCH 03/12] ocamlbyteinfo, ocamlplugininfo: Useful utilities from +Subject: [PATCH 03/13] ocamlbyteinfo, ocamlplugininfo: Useful utilities from Debian, sent upstream. See: diff --git a/0004-Don-t-add-rpaths-to-libraries.patch b/0004-Don-t-add-rpaths-to-libraries.patch index 7833554..221b2d9 100644 --- a/0004-Don-t-add-rpaths-to-libraries.patch +++ b/0004-Don-t-add-rpaths-to-libraries.patch @@ -1,7 +1,7 @@ From c3a733c10827896a6e3c217b383e874df303d50b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 May 2012 20:43:34 +0100 -Subject: [PATCH 04/12] Don't add rpaths to libraries. +Subject: [PATCH 04/13] Don't add rpaths to libraries. --- tools/Makefile.shared | 3 --- diff --git a/0005-configure-Allow-user-defined-C-compiler-flags.patch b/0005-configure-Allow-user-defined-C-compiler-flags.patch index 03257fd..b521782 100644 --- a/0005-configure-Allow-user-defined-C-compiler-flags.patch +++ b/0005-configure-Allow-user-defined-C-compiler-flags.patch @@ -1,7 +1,7 @@ From 459e9550f174e11176a2ece013fc4dd2b08a06bb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 May 2012 20:44:18 +0100 -Subject: [PATCH 05/12] configure: Allow user defined C compiler flags. +Subject: [PATCH 05/13] configure: Allow user defined C compiler flags. --- configure | 4 ++++ diff --git a/0006-Add-support-for-ppc64.patch b/0006-Add-support-for-ppc64.patch index d4e4db7..a69e8c4 100644 --- a/0006-Add-support-for-ppc64.patch +++ b/0006-Add-support-for-ppc64.patch @@ -1,7 +1,7 @@ From a85437a0d2ffdf7a340d379789500eb583ae4708 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 May 2012 20:47:07 +0100 -Subject: [PATCH 06/12] Add support for ppc64. +Subject: [PATCH 06/13] Add support for ppc64. Note (1): This patch was rejected upstream because they don't have appropriate hardware for testing. diff --git a/0007-yacc-Use-mkstemp-instead-of-mktemp.patch b/0007-yacc-Use-mkstemp-instead-of-mktemp.patch index c05898e..7fdcbe2 100644 --- a/0007-yacc-Use-mkstemp-instead-of-mktemp.patch +++ b/0007-yacc-Use-mkstemp-instead-of-mktemp.patch @@ -1,7 +1,7 @@ From 761242718c3a7513d3b93ca96d24d1f61a4126f0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 13 Sep 2013 21:29:58 +0100 -Subject: [PATCH 07/12] yacc: Use mkstemp instead of mktemp. +Subject: [PATCH 07/13] yacc: Use mkstemp instead of mktemp. --- yacc/main.c | 2 +- diff --git a/0008-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch b/0008-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch index a73d031..34929f4 100644 --- a/0008-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch +++ b/0008-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch @@ -1,7 +1,7 @@ From a1297100a7898223fd9cdf3d37c4136376ee8f88 Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Thu, 18 Jul 2013 16:09:20 +0000 -Subject: [PATCH 08/12] Port to the ARM 64-bits (AArch64) architecture +Subject: [PATCH 08/13] Port to the ARM 64-bits (AArch64) architecture (experimental). Merge of branch branches/arm64. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13909 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 diff --git a/0009-Updated-with-latest-versions-from-FSF.patch b/0009-Updated-with-latest-versions-from-FSF.patch index 2f4c5fc..38cd9c8 100644 --- a/0009-Updated-with-latest-versions-from-FSF.patch +++ b/0009-Updated-with-latest-versions-from-FSF.patch @@ -1,7 +1,7 @@ From 26114ba365c1ef63d9605efc719f6c220ad624eb Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Thu, 18 Jul 2013 16:07:25 +0000 -Subject: [PATCH 09/12] Updated with latest versions from FSF. +Subject: [PATCH 09/13] Updated with latest versions from FSF. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13907 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 (cherry picked from commit 24bb4caeb35e49126aa3a4c0101a412db1091213) diff --git a/0010-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch b/0010-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch index 0bc1e36..015964c 100644 --- a/0010-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch +++ b/0010-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch @@ -1,7 +1,7 @@ From 0ebe44d283e56056fec1691bdc052c92d70c892d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 30 Dec 2013 20:32:03 +0000 -Subject: [PATCH 10/12] Disable ocamldoc and camlp4opt (aarch64 only) +Subject: [PATCH 10/13] Disable ocamldoc and camlp4opt (aarch64 only) --- Makefile | 8 ++++---- diff --git a/0011-arg-Add-no_arg-and-get_arg-helper-functions.patch b/0011-arg-Add-no_arg-and-get_arg-helper-functions.patch index 0f2f5ac..9814a84 100644 --- a/0011-arg-Add-no_arg-and-get_arg-helper-functions.patch +++ b/0011-arg-Add-no_arg-and-get_arg-helper-functions.patch @@ -1,7 +1,7 @@ From 6a342793f40250c78931afa32961646f20bc5ba4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Apr 2014 11:17:07 +0100 -Subject: [PATCH 11/12] arg: Add no_arg and get_arg helper functions. +Subject: [PATCH 11/13] 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. diff --git a/0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch b/0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch index be687af..048370c 100644 --- a/0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch +++ b/0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch @@ -1,7 +1,7 @@ From 0d0204c395b4015804d12bcd871b74dd0cb38bdb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Apr 2014 11:21:40 +0100 -Subject: [PATCH 12/12] arg: Allow flags such as --flag=arg as well as --flag +Subject: [PATCH 12/13] arg: Allow flags such as --flag=arg as well as --flag arg. Allow flags to be followed directly by their argument, separated by an '=' diff --git a/ocaml.spec b/ocaml.spec index 66c0d9c..b0f7013 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -261,7 +261,9 @@ git am %{_sourcedir}/0006-Add-support-for-ppc64.patch