[ocaml/f21] Update to last 4.01 version from OCaml git.
Richard W.M. Jones
rjones at fedoraproject.org
Thu Sep 11 12:25:34 UTC 2014
commit f4d6d542f980209dad096ba44ed6227cf1c88670
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Tue Sep 9 18:12:21 2014 +0100
Update to last 4.01 version from OCaml git.
- Fix bug in argument parsing (RHBZ#1139790).
....gitignore-file-to-ignore-generated-files.patch | 13 ++++---
...y-compilerlibs-directory-is-created-by-gi.patch | 4 +-
...fo-ocamlplugininfo-Useful-utilities-from-.patch | 4 +-
0004-Don-t-add-rpaths-to-libraries.patch | 35 +++++++++++---------
...igure-Allow-user-defined-C-compiler-flags.patch | 8 ++--
0006-Add-support-for-ppc64.patch | 10 +++---
0007-yacc-Use-mkstemp-instead-of-mktemp.patch | 4 +-
...-ARM-64-bits-AArch64-architecture-experim.patch | 20 ++++++------
0009-Updated-with-latest-versions-from-FSF.patch | 4 +-
0010-arm64-Align-code-and-data-to-8-bytes.patch | 4 +-
...g-Add-no_arg-and-get_arg-helper-functions.patch | 6 ++--
...lags-such-as-flag-arg-as-well-as-flag-arg.patch | 16 +++++----
0013-Add-support-for-ppc64le.patch | 10 +++---
0014-arm-arm64-Mark-stack-as-non-executable.patch | 4 +-
ocaml.spec | 14 +++++++-
sources | 2 +-
16 files changed, 87 insertions(+), 71 deletions(-)
---
diff --git a/0001-Add-.gitignore-file-to-ignore-generated-files.patch b/0001-Add-.gitignore-file-to-ignore-generated-files.patch
index 527beae..03eef52 100644
--- a/0001-Add-.gitignore-file-to-ignore-generated-files.patch
+++ b/0001-Add-.gitignore-file-to-ignore-generated-files.patch
@@ -1,19 +1,19 @@
-From 07839dfc746ccee318601b9668aa094d4465bc6e Mon Sep 17 00:00:00 2001
+From 3e74f2acd0b5a41f0faa33c770740cb74c89d257 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Thu, 7 Jun 2012 16:00:28 +0100
Subject: [PATCH 01/14] Add .gitignore file to ignore generated files.
---
- .gitignore | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 347 insertions(+)
+ .gitignore | 348 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 348 insertions(+)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
-index 0000000..7191b83
+index 0000000..20a181f
--- /dev/null
+++ b/.gitignore
-@@ -0,0 +1,347 @@
+@@ -0,0 +1,348 @@
+*~
+*.a
+*.bak
@@ -352,6 +352,7 @@ index 0000000..7191b83
+/tools/ocamldep.opt
+/tools/ocamlmklib
+/tools/ocamlmklib.ml
++/tools/ocamlmklibconfig.ml
+/tools/ocamlmktop
+/tools/ocamloptp
+/tools/ocamlprof
@@ -362,5 +363,5 @@ index 0000000..7191b83
+/yacc/ocamlyacc
+/yacc/version.h
--
-1.9.0
+2.0.4
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 6208ace..aa3209b 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 7756582741dc56070c03629a3b4640147723beda Mon Sep 17 00:00:00 2001
+From a0c1f4805f85cc3ba4217ecbcae62cd567eb9dab 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/14] 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
+2.0.4
diff --git a/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch b/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
index 9bc9b44..4749346 100644
--- a/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
+++ b/0003-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
@@ -1,4 +1,4 @@
-From a6d87cd4bc62d3987835c1ac844f35cc06804294 Mon Sep 17 00:00:00 2001
+From 4a5da8081ca854cebb0d431d12fc8edcfd3de59a 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 03/14] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
@@ -236,5 +236,5 @@ index 0000000..e28800f
+ header.units
+ end
--
-1.9.0
+2.0.4
diff --git a/0004-Don-t-add-rpaths-to-libraries.patch b/0004-Don-t-add-rpaths-to-libraries.patch
index efe4095..884e288 100644
--- a/0004-Don-t-add-rpaths-to-libraries.patch
+++ b/0004-Don-t-add-rpaths-to-libraries.patch
@@ -1,26 +1,29 @@
-From c3a733c10827896a6e3c217b383e874df303d50b Mon Sep 17 00:00:00 2001
+From 67f9cad7f4d3db0efcbcdf8bb97a2db3757ff14f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Tue, 29 May 2012 20:43:34 +0100
+Date: Tue, 24 Jun 2014 10:00:15 +0100
Subject: [PATCH 04/14] Don't add rpaths to libraries.
---
- tools/Makefile.shared | 3 ---
- 1 file changed, 3 deletions(-)
+ tools/Makefile.shared | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/Makefile.shared b/tools/Makefile.shared
-index 117f576..cad227d 100644
+index cf2f216..2d466cd 100644
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
-@@ -116,9 +116,6 @@ ocamlmklib.ml: ocamlmklib.mlp ../config/Makefile
- sed -e "s|%%BINDIR%%|$(BINDIR)|" \
- -e "s|%%SUPPORTS_SHARED_LIBRARIES%%|$(SUPPORTS_SHARED_LIBRARIES)|" \
- -e "s|%%MKSHAREDLIB%%|$(MKSHAREDLIB)|" \
-- -e "s|%%BYTECCRPATH%%|$(BYTECCRPATH)|" \
-- -e "s|%%NATIVECCRPATH%%|$(NATIVECCRPATH)|" \
-- -e "s|%%MKSHAREDLIBRPATH%%|$(MKSHAREDLIBRPATH)|" \
- -e "s|%%RANLIB%%|$(RANLIB)|" \
- ocamlmklib.mlp >> ocamlmklib.ml
-
+@@ -108,9 +108,9 @@ ocamlmklibconfig.ml: ../config/Makefile
+ echo 'let ext_dll = "$(EXT_DLL)"'; \
+ echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
+ echo 'let mkdll = "$(MKDLL)"'; \
+- echo 'let byteccrpath = "$(BYTECCRPATH)"'; \
+- echo 'let nativeccrpath = "$(NATIVECCRPATH)"'; \
+- echo 'let mksharedlibrpath = "$(MKSHAREDLIBRPATH)"'; \
++ echo 'let byteccrpath = ""'; \
++ echo 'let nativeccrpath = ""'; \
++ echo 'let mksharedlibrpath = ""'; \
+ echo 'let toolpref = "$(TOOLPREF)"'; \
+ sed -n -e 's/^#ml //p' ../config/Makefile) \
+ > ocamlmklibconfig.ml
--
-1.9.0
+2.0.4
diff --git a/0005-configure-Allow-user-defined-C-compiler-flags.patch b/0005-configure-Allow-user-defined-C-compiler-flags.patch
index 5864c92..6eeef8d 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 459e9550f174e11176a2ece013fc4dd2b08a06bb Mon Sep 17 00:00:00 2001
+From 5c7b50033ad64f20c3cce71adb9b5c93dfa62678 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/14] configure: Allow user defined C compiler flags.
@@ -8,10 +8,10 @@ Subject: [PATCH 05/14] configure: Allow user defined C compiler flags.
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
-index 07b1c35..39b38dc 100755
+index cbaa053..e8f8cfd 100755
--- a/configure
+++ b/configure
-@@ -1612,6 +1612,10 @@ case "$buggycc" in
+@@ -1617,6 +1617,10 @@ case "$buggycc" in
nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
esac
@@ -23,5 +23,5 @@ index 07b1c35..39b38dc 100755
cclibs="$cclibs $mathlib"
--
-1.9.0
+2.0.4
diff --git a/0006-Add-support-for-ppc64.patch b/0006-Add-support-for-ppc64.patch
index 35e3b74..af28a09 100644
--- a/0006-Add-support-for-ppc64.patch
+++ b/0006-Add-support-for-ppc64.patch
@@ -1,4 +1,4 @@
-From a85437a0d2ffdf7a340d379789500eb583ae4708 Mon Sep 17 00:00:00 2001
+From 959c12d1dfa5a3049fc4c7aed794afa287c46594 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/14] Add support for ppc64.
@@ -2105,10 +2105,10 @@ index 57c87fa..756db95 100644
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
#define Callback_link(sp) ((struct caml_context *)((sp) + 8))
diff --git a/configure b/configure
-index 39b38dc..9b02664 100755
+index e8f8cfd..9bb9e9e 100755
--- a/configure
+++ b/configure
-@@ -694,6 +694,7 @@ case "$host" in
+@@ -698,6 +698,7 @@ case "$host" in
arch=i386; system=macosx
fi;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
@@ -2116,7 +2116,7 @@ index 39b38dc..9b02664 100755
powerpc*-*-linux*) arch=power; model=ppc; system=elf;;
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;;
-@@ -776,6 +777,8 @@ case "$arch,$model,$system" in
+@@ -781,6 +782,8 @@ case "$arch,$model,$system" in
aspp='gcc -c';;
power,*,bsd*) as='as'
aspp='gcc -c';;
@@ -2126,5 +2126,5 @@ index 39b38dc..9b02664 100755
aspp="$bytecc -c";;
sparc,*,solaris) as='as'
--
-1.9.0
+2.0.4
diff --git a/0007-yacc-Use-mkstemp-instead-of-mktemp.patch b/0007-yacc-Use-mkstemp-instead-of-mktemp.patch
index 0a2c140..9cf7ca4 100644
--- a/0007-yacc-Use-mkstemp-instead-of-mktemp.patch
+++ b/0007-yacc-Use-mkstemp-instead-of-mktemp.patch
@@ -1,4 +1,4 @@
-From 761242718c3a7513d3b93ca96d24d1f61a4126f0 Mon Sep 17 00:00:00 2001
+From 4119a66e247a74b559d4df275f223476306440a2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Fri, 13 Sep 2013 21:29:58 +0100
Subject: [PATCH 07/14] yacc: Use mkstemp instead of mktemp.
@@ -21,5 +21,5 @@ index f6cac60..3067000 100644
#endif
--
-1.9.0
+2.0.4
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 da6b5e3..a874f6a 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,4 +1,4 @@
-From a1297100a7898223fd9cdf3d37c4136376ee8f88 Mon Sep 17 00:00:00 2001
+From 9f75e98d1cad55d1f6e0131e656acc716177e8d5 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy at inria.fr>
Date: Thu, 18 Jul 2013 16:09:20 +0000
Subject: [PATCH 08/14] Port to the ARM 64-bits (AArch64) architecture
@@ -2111,10 +2111,10 @@ index b99ed2f..af9fa0f 100644
/* Division and modulus madness */
diff --git a/configure b/configure
-index 9b02664..36edfab 100755
+index 9bb9e9e..a0e1466 100755
--- a/configure
+++ b/configure
-@@ -657,6 +657,7 @@ if test $withsharedlibs = "yes"; then
+@@ -661,6 +661,7 @@ if test $withsharedlibs = "yes"; then
x86_64-*-netbsd*) natdynlink=true;;
i386-*-gnu0.3) natdynlink=true;;
arm*-*-linux*) natdynlink=true;;
@@ -2122,15 +2122,15 @@ index 9b02664..36edfab 100755
esac
fi
-@@ -715,6 +716,7 @@ case "$host" in
+@@ -719,6 +720,7 @@ case "$host" in
x86_64-*-netbsd*) arch=amd64; system=netbsd;;
x86_64-*-openbsd*) arch=amd64; system=openbsd;;
x86_64-*-darwin*) arch=amd64; system=macosx;;
+ aarch64-*-linux*) arch=arm64; system=linux;;
+ x86_64-*-cygwin*) arch=amd64; system=cygwin;;
esac
- # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -767,7 +769,7 @@ case "$arch,$model,$system" in
+@@ -772,7 +774,7 @@ case "$arch,$model,$system" in
aspp='gcc -m64 -c';;
amd64,*,*) as='as'
aspp='gcc -c';;
@@ -2139,7 +2139,7 @@ index 9b02664..36edfab 100755
aspp='gcc -c';;
i386,*,solaris) as='as'
aspp='/usr/ccs/bin/as -P';;
-@@ -1193,6 +1195,7 @@ case "$arch" in
+@@ -1198,6 +1200,7 @@ case "$arch" in
fi;;
power) bng_arch=ppc; bng_asm_level=1;;
amd64) bng_arch=amd64; bng_asm_level=1;;
@@ -2193,10 +2193,10 @@ index 0000000..50843a0
+ : "=&r" (resl), "=&r" (resh) \
+ : "r" (arg1), "r" (arg2))
diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile
-index fd01d33..9dca023 100644
+index 98c2e4c..15fcb7c 100644
--- a/testsuite/tests/asmcomp/Makefile
+++ b/testsuite/tests/asmcomp/Makefile
-@@ -126,7 +126,7 @@ parsecmm.mli parsecmm.ml: parsecmm.mly
+@@ -128,7 +128,7 @@ parsecmm.mli parsecmm.ml: parsecmm.mly
lexcmm.ml: lexcmm.mll
@$(OCAMLLEX) -q lexcmm.mll
@@ -2276,5 +2276,5 @@ index d67a643..82b699e 100644
Emit.begin_assembly();
let ic = open_in filename in
--
-1.9.0
+2.0.4
diff --git a/0009-Updated-with-latest-versions-from-FSF.patch b/0009-Updated-with-latest-versions-from-FSF.patch
index 3f5a427..0bca3a4 100644
--- a/0009-Updated-with-latest-versions-from-FSF.patch
+++ b/0009-Updated-with-latest-versions-from-FSF.patch
@@ -1,4 +1,4 @@
-From 26114ba365c1ef63d9605efc719f6c220ad624eb Mon Sep 17 00:00:00 2001
+From 77a24f7ba8023f1119454cac877285cfaef909e0 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy at inria.fr>
Date: Thu, 18 Jul 2013 16:07:25 +0000
Subject: [PATCH 09/14] Updated with latest versions from FSF.
@@ -712,5 +712,5 @@ index e76eaf4..8b612ab 100755
os=-coff
;;
--
-1.9.0
+2.0.4
diff --git a/0010-arm64-Align-code-and-data-to-8-bytes.patch b/0010-arm64-Align-code-and-data-to-8-bytes.patch
index ac0d177..e26f4d3 100644
--- a/0010-arm64-Align-code-and-data-to-8-bytes.patch
+++ b/0010-arm64-Align-code-and-data-to-8-bytes.patch
@@ -1,4 +1,4 @@
-From 848ca220af9224a5cc7abb64f32b89ed54c21121 Mon Sep 17 00:00:00 2001
+From 30c30cdc0b2d0af7aa05048345f272de77aba6cb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Mon, 24 Mar 2014 05:50:28 -0500
Subject: [PATCH 10/14] arm64: Align code and data to 8 bytes.
@@ -37,5 +37,5 @@ index fc9649c..4e7c4b0 100644
(* Beginning / end of an assembly file *)
--
-1.9.0
+2.0.4
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 4173775..ba765bf 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,4 +1,4 @@
-From 251d3447bb10550320f43512d8886561c1298f74 Mon Sep 17 00:00:00 2001
+From c647e7cc2df2cad5a3e811dc7b3519960eb67da4 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 11/14] arg: Add no_arg and get_arg helper functions.
@@ -6,7 +6,7 @@ Subject: [PATCH 11/14] 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.
-The get_arg function simple checks the next position on the command
+The get_arg function simply checks the next position on the command
line exists and returns that argument or raises a Arg.Missing.
This patch should introduce no functional change, it is simply code
@@ -114,5 +114,5 @@ index 8b64236..c8b3d44 100644
treat_action action
with Bad m -> stop (Message m);
--
-1.9.0
+2.0.4
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 4a1ba25..3078448 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,4 +1,4 @@
-From 57955b8a4d4cf7732cb87964f5e124ab713e084b Mon Sep 17 00:00:00 2001
+From af99e796d142efa9fc9717dcff3df55a4e82e6ca 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 12/14] arg: Allow flags such as --flag=arg as well as --flag
@@ -11,12 +11,12 @@ command line parsing libraries allow.
Fix for the following issue:
http://caml.inria.fr/mantis/view.php?id=5197
---
- stdlib/arg.ml | 28 ++++++++++++++++++++++------
+ stdlib/arg.ml | 30 ++++++++++++++++++++++++------
stdlib/arg.mli | 3 ++-
- 2 files changed, 24 insertions(+), 7 deletions(-)
+ 2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/stdlib/arg.ml b/stdlib/arg.ml
-index c8b3d44..766de5f 100644
+index c8b3d44..50d6e46 100644
--- a/stdlib/arg.ml
+++ b/stdlib/arg.ml
@@ -55,6 +55,12 @@ let rec assoc3 x l =
@@ -32,7 +32,7 @@ index c8b3d44..766de5f 100644
let make_symlist prefix sep suffix l =
match l with
| [] -> "<none>"
-@@ -130,14 +136,24 @@ let parse_argv_dynamic ?(current=current) argv speclist anonfun errmsg =
+@@ -130,14 +136,26 @@ let parse_argv_dynamic ?(current=current) argv speclist anonfun errmsg =
while !current < l do
let s = argv.(!current) in
if String.length s >= 1 && String.get s 0 = '-' then begin
@@ -59,7 +59,9 @@ index c8b3d44..766de5f 100644
+ | None ->
+ if !current + 1 < l then argv.(!current + 1)
+ else stop (Missing s)
-+ | Some arg -> arg
++ | Some arg ->
++ decr current;
++ arg
in
begin try
let rec treat_action = function
@@ -78,5 +80,5 @@ index 869d030..b8c6f11 100644
Examples ([cmd] is assumed to be the command name):
--
-1.9.0
+2.0.4
diff --git a/0013-Add-support-for-ppc64le.patch b/0013-Add-support-for-ppc64le.patch
index d3b4e3b..a593537 100644
--- a/0013-Add-support-for-ppc64le.patch
+++ b/0013-Add-support-for-ppc64le.patch
@@ -1,4 +1,4 @@
-From d9ec3ac29493999687b0f7daa23f4888bc57c7be Mon Sep 17 00:00:00 2001
+From dbef48d3cb6424271e5d2296d16a3284db19cb25 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 13/14] Add support for ppc64le.
@@ -1892,10 +1892,10 @@ index b79252d..049652e 100755
echo powerpc-unknown-linux-${LIBC}
exit ;;
diff --git a/configure b/configure
-index 36edfab..8a22078 100755
+index a0e1466..3bd98ad 100755
--- a/configure
+++ b/configure
-@@ -696,6 +696,7 @@ case "$host" in
+@@ -700,6 +700,7 @@ case "$host" in
fi;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
powerpc64-*-linux*) arch=power64; model=ppc64; system=elf;;
@@ -1903,7 +1903,7 @@ index 36edfab..8a22078 100755
powerpc*-*-linux*) arch=power; model=ppc; system=elf;;
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;;
-@@ -781,6 +782,8 @@ case "$arch,$model,$system" in
+@@ -786,6 +787,8 @@ case "$arch,$model,$system" in
aspp='gcc -c';;
power64,*,elf) as='as -u -m ppc64'
aspp='gcc -c';;
@@ -1913,5 +1913,5 @@ index 36edfab..8a22078 100755
aspp="$bytecc -c";;
sparc,*,solaris) as='as'
--
-1.9.0
+2.0.4
diff --git a/0014-arm-arm64-Mark-stack-as-non-executable.patch b/0014-arm-arm64-Mark-stack-as-non-executable.patch
index 7767b40..9e11ae3 100644
--- a/0014-arm-arm64-Mark-stack-as-non-executable.patch
+++ b/0014-arm-arm64-Mark-stack-as-non-executable.patch
@@ -1,4 +1,4 @@
-From 64da031fc17ca93efd5beabcf0b7ea49bcd645a0 Mon Sep 17 00:00:00 2001
+From 262882b5fe2d327170f33a28dc35866aa32af84e 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 14/14] arm, arm64: Mark stack as non-executable.
@@ -35,5 +35,5 @@ index de670e6..84e18ba 100644
+ /* Mark stack as non-executable, PR#4564 */
+ .section .note.GNU-stack,"",%progbits
--
-1.9.0
+2.0.4
diff --git a/ocaml.spec b/ocaml.spec
index 6193340..cfd7527 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -17,7 +17,7 @@
Name: ocaml
Version: 4.01.0
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: OCaml compiler and programming environment
@@ -25,7 +25,13 @@ License: QPL and (LGPLv2+ with exceptions)
URL: http://www.ocaml.org
-Source0: http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-%{version}.tar.gz
+# After ocaml 4.01.0 was released, upstream added some patches and
+# fixes to the git repository, but did not make a further tarball
+# release. The Source0 file here reflects the final git release of 4.01.0.
+# To reconstruct this archive, do:
+# git archive --prefix=ocaml-4.01.0/ --output=ocaml-ecc80c0d3850bc144760af4c63b7eab438615bdc.tar ecc80c0d3850bc144760af4c63b7eab438615bdc
+# gzip --best ocaml-ecc80c0d3850bc144760af4c63b7eab438615bdc.tar
+Source0: ocaml-ecc80c0d3850bc144760af4c63b7eab438615bdc.tar.gz
Source1: http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-4.01-refman-html.tar.gz
Source2: http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-4.01-refman.pdf
Source3: http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-4.01-refman.info.tar.gz
@@ -549,6 +555,10 @@ fi
%changelog
+* Thu Sep 11 2014 Richard W.M. Jones <rjones at redhat.com> - 4.01.0-22
+- Update to last 4.01 version from OCaml git.
+- Fix bug in argument parsing (RHBZ#1139790).
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.01.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index ab191f4..4d841ee 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-04dfdd7da189462a4f10ec6530359cef ocaml-4.01.0.tar.gz
73f4657680baeb200135720fbc84eb4b ocaml-4.01-refman-html.tar.gz
f4605c5cf0dbf90395331997e600e159 ocaml-4.01-refman.info.tar.gz
f14652070cfb984c75de1919085b6915 ocaml-4.01-refman.pdf
+87e2bca715459bd3c0936c5ffbe76c3c ocaml-ecc80c0d3850bc144760af4c63b7eab438615bdc.tar.gz
More information about the scm-commits
mailing list