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

Apply ppc64le patch properly.

This commit is contained in:
Richard W.M. Jones 2014-04-09 20:27:02 +01:00
parent a0eedc071f
commit 880ea30949
13 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From 07839dfc746ccee318601b9668aa094d4465bc6e 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 01/12] Add .gitignore file to ignore generated files.
Subject: [PATCH 01/13] Add .gitignore file to ignore generated files.
---
.gitignore | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

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

@ -1,7 +1,7 @@
From 7756582741dc56070c03629a3b4640147723beda 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/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.

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

@ -1,7 +1,7 @@
From a6d87cd4bc62d3987835c1ac844f35cc06804294 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 03/12] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
Subject: [PATCH 03/13] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
Debian, sent upstream.
See:

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

@ -1,7 +1,7 @@
From c3a733c10827896a6e3c217b383e874df303d50b 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 04/12] Don't add rpaths to libraries.
Subject: [PATCH 04/13] Don't add rpaths to libraries.
---
tools/Makefile.shared | 3 ---

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

@ -1,7 +1,7 @@
From 459e9550f174e11176a2ece013fc4dd2b08a06bb 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/12] configure: Allow user defined C compiler flags.
Subject: [PATCH 05/13] configure: Allow user defined C compiler flags.
---
configure | 4 ++++

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

@ -1,7 +1,7 @@
From a85437a0d2ffdf7a340d379789500eb583ae4708 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/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.

2
0007-yacc-Use-mkstemp-instead-of-mktemp.patch
View File

@ -1,7 +1,7 @@
From 761242718c3a7513d3b93ca96d24d1f61a4126f0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
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 +-

2
0008-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch
View File

@ -1,7 +1,7 @@
From a1297100a7898223fd9cdf3d37c4136376ee8f88 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
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

2
0009-Updated-with-latest-versions-from-FSF.patch
View File

@ -1,7 +1,7 @@
From 26114ba365c1ef63d9605efc719f6c220ad624eb Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
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)

2
0010-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch
View File

@ -1,7 +1,7 @@
From 0ebe44d283e56056fec1691bdc052c92d70c892d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
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 ++++----

2
0011-arg-Add-no_arg-and-get_arg-helper-functions.patch
View File

@ -1,7 +1,7 @@
From 6a342793f40250c78931afa32961646f20bc5ba4 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/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.

2
0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
View File

@ -1,7 +1,7 @@
From 0d0204c395b4015804d12bcd871b74dd0cb38bdb 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/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 '='

2
ocaml.spec
View File

@ -261,7 +261,9 @@ git am %{_sourcedir}/0006-Add-support-for-ppc64.patch </dev/null
git am %{_sourcedir}/0007-yacc-Use-mkstemp-instead-of-mktemp.patch </dev/null
%ifarch aarch64
git am %{_sourcedir}/0008-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch
%endif
git am %{_sourcedir}/0009-Updated-with-latest-versions-from-FSF.patch
%ifarch aarch64
git am %{_sourcedir}/0010-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch
%endif
git am %{_sourcedir}/0011-arg-Add-no_arg-and-get_arg-helper-functions.patch