OCaml 4.09.0 final.
This commit is contained in:
parent
fe05d6a138
commit
643d094358
52
0001-increment-version-number-after-tagging-4.09.0.patch
Normal file
52
0001-increment-version-number-after-tagging-4.09.0.patch
Normal file
@ -0,0 +1,52 @@
|
||||
From 6207460e793f8c5538bfd8164fa3078f7300b57a Mon Sep 17 00:00:00 2001
|
||||
From: Florian Angeletti <florian.angeletti@inria.fr>
|
||||
Date: Tue, 17 Sep 2019 14:35:00 +0200
|
||||
Subject: [PATCH 01/12] increment version number after tagging 4.09.0
|
||||
|
||||
---
|
||||
VERSION | 2 +-
|
||||
configure | Bin 542920 -> 542985 bytes
|
||||
ocaml-variants.opam | 4 ++--
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/VERSION b/VERSION
|
||||
index 7128cac1f..ff541f87c 100644
|
||||
--- a/VERSION
|
||||
+++ b/VERSION
|
||||
@@ -1,4 +1,4 @@
|
||||
-4.09.0
|
||||
+4.09.1+dev0
|
||||
|
||||
# The version string is the first line of this file.
|
||||
# It must be in the format described in stdlib/sys.mli
|
||||
diff --git a/configure b/configure
|
||||
index 85fb6842dffc1ba52a07895aefa7d49f7f383d17..c364be4e3a365e01c667023ea23238037446a3c3 100755
|
||||
GIT binary patch
|
||||
delta 189
|
||||
zcmX>xQL%H9;)HruL+zB*vW@kPP7u~4XE_LCvz&8XD3m#8#&>QgbMlgF5>RI5-Yp&w
|
||||
z=5|>&Ml~Hauu%rn8#gjaOph^Ql!r=I8!_gwL)h&vEg6BB35c12m}UD*OIB{E&Fx>R
|
||||
iS%H{s`<H6=WlRwD(}4#2Zhv0Kt_d|@yFeTJjza*mO+t16
|
||||
|
||||
delta 120
|
||||
zcmeC2q<CVY;)ME*Esai-xt!%T>pItkZr(8CJNM=_ORh;U8cg?LW0c>#eD4&G?G9{=
|
||||
zYC1rXkJ^k9(_4%f<+raeV$5T2m$qUAVkRJF24a@&(pIe8PVL$?tU%1RUAu;T8Pjy2
|
||||
TUf=D?_3WDL+XLI!cN_u$b;&5C
|
||||
|
||||
diff --git a/ocaml-variants.opam b/ocaml-variants.opam
|
||||
index 30d48eb24..5410d1f4c 100644
|
||||
--- a/ocaml-variants.opam
|
||||
+++ b/ocaml-variants.opam
|
||||
@@ -1,8 +1,8 @@
|
||||
opam-version: "2.0"
|
||||
-version: "4.09.0"
|
||||
+version: "4.09.1+trunk"
|
||||
synopsis: "OCaml development version"
|
||||
depends: [
|
||||
- "ocaml" {= "4.09.0" & post}
|
||||
+ "ocaml" {= "4.09.1" & post}
|
||||
"base-unix" {post}
|
||||
"base-bigarray" {post}
|
||||
"base-threads" {post}
|
||||
--
|
||||
2.23.0
|
||||
|
27
0002-mark-the-release-in-the-Changes.patch
Normal file
27
0002-mark-the-release-in-the-Changes.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From c1db490f8d92e7b5f1a4685cd9a095f24429bb3e Mon Sep 17 00:00:00 2001
|
||||
From: Gabriel Scherer <gabriel.scherer@gmail.com>
|
||||
Date: Thu, 19 Sep 2019 15:40:49 +0200
|
||||
Subject: [PATCH 02/12] mark the release in the Changes
|
||||
|
||||
---
|
||||
Changes | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Changes b/Changes
|
||||
index d4b8a994d..e95ae5e49 100644
|
||||
--- a/Changes
|
||||
+++ b/Changes
|
||||
@@ -1,5 +1,8 @@
|
||||
-OCaml 4.09.0
|
||||
-------------
|
||||
+OCaml 4.09 maintenance branch:
|
||||
+------------------------------
|
||||
+
|
||||
+OCaml 4.09.0 (19 September 2019):
|
||||
+---------------------------------
|
||||
|
||||
(Changes that can break existing programs are marked with a "*")
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
@ -0,0 +1,46 @@
|
||||
From 1204abd71a4ef585dbb70ba68a5879856d24c1a9 Mon Sep 17 00:00:00 2001
|
||||
From: Gabriel Scherer <gabriel.scherer@gmail.com>
|
||||
Date: Fri, 20 Sep 2019 10:58:09 +0200
|
||||
Subject: [PATCH 03/12] Merge pull request #8954 from
|
||||
Armael/fix-toplevel-submsg-locs
|
||||
|
||||
Fix error submessages in the toplevel: do not display dummy locations
|
||||
|
||||
(cherry picked from commit 8f7708a0fbc3e1199ccf04a6b9e1ba8e0f0d5254)
|
||||
---
|
||||
Changes | 4 ++++
|
||||
parsing/location.ml | 3 ++-
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Changes b/Changes
|
||||
index e95ae5e49..355cb1a94 100644
|
||||
--- a/Changes
|
||||
+++ b/Changes
|
||||
@@ -1,6 +1,10 @@
|
||||
OCaml 4.09 maintenance branch:
|
||||
------------------------------
|
||||
|
||||
+- #8953, #8954: Fix error submessages in the toplevel: do not display
|
||||
+ dummy locations
|
||||
+ (Armaël Guéneau, review by Gabriel Scherer)
|
||||
+
|
||||
OCaml 4.09.0 (19 September 2019):
|
||||
---------------------------------
|
||||
|
||||
diff --git a/parsing/location.ml b/parsing/location.ml
|
||||
index 25cba42c7..ab823d36f 100644
|
||||
--- a/parsing/location.ml
|
||||
+++ b/parsing/location.ml
|
||||
@@ -752,7 +752,8 @@ let terminfo_toplevel_printer (lb: lexbuf): report_printer =
|
||||
in
|
||||
let pp_main_loc _ _ _ _ = () in
|
||||
let pp_submsg_loc _ _ ppf loc =
|
||||
- Format.fprintf ppf "%a:@ " print_loc loc in
|
||||
+ if not loc.loc_ghost then
|
||||
+ Format.fprintf ppf "%a:@ " print_loc loc in
|
||||
{ batch_mode_printer with pp; pp_main_loc; pp_submsg_loc }
|
||||
|
||||
let best_toplevel_printer () =
|
||||
--
|
||||
2.23.0
|
||||
|
File diff suppressed because it is too large
Load Diff
102
0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch
Normal file
102
0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch
Normal file
@ -0,0 +1,102 @@
|
||||
From 987e819b8fb8e36e660340931270a2ade02c439e Mon Sep 17 00:00:00 2001
|
||||
From: Gabriel Scherer <gabriel.scherer@gmail.com>
|
||||
Date: Thu, 26 Sep 2019 21:46:03 +0200
|
||||
Subject: [PATCH 04/12] Merge pull request #8979 from
|
||||
gasche/fix-Makefile.menhir
|
||||
|
||||
Fix tools/check-parser-uptodate-or-warn.sh
|
||||
|
||||
(cherry picked from commit f075ab6fdeedc8d53ececd1184d69a1cc35c0fd5)
|
||||
---
|
||||
Changes | 3 +++
|
||||
Makefile | 6 +++---
|
||||
tools/check-parser-uptodate-or-warn.sh | 21 +++++++++++++++++----
|
||||
3 files changed, 23 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Changes b/Changes
|
||||
index 355cb1a94..63cac3ef9 100644
|
||||
--- a/Changes
|
||||
+++ b/Changes
|
||||
@@ -5,6 +5,9 @@ OCaml 4.09 maintenance branch:
|
||||
dummy locations
|
||||
(Armaël Guéneau, review by Gabriel Scherer)
|
||||
|
||||
+- #8965, #8979: Alpine build failure caused by check-parser-uptodate-or-warn.sh
|
||||
+ (Gabriel Scherer and David Allsopp, report by Anton Kochkov)
|
||||
+
|
||||
OCaml 4.09.0 (19 September 2019):
|
||||
---------------------------------
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 47548c79d..7ac446f62 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1076,10 +1076,10 @@ parsing/camlinternalMenhirLib.mli: boot/menhir/menhirLib.mli
|
||||
|
||||
parsing/parser.ml: boot/menhir/parser.ml parsing/parser.mly \
|
||||
tools/check-parser-uptodate-or-warn.sh
|
||||
- @tools/check-parser-uptodate-or-warn.sh
|
||||
- cat $< | sed "s/MenhirLib/CamlinternalMenhirLib/g" > $@
|
||||
+ @-tools/check-parser-uptodate-or-warn.sh
|
||||
+ sed "s/MenhirLib/CamlinternalMenhirLib/g" $< > $@
|
||||
parsing/parser.mli: boot/menhir/parser.mli
|
||||
- cat $< | sed "s/MenhirLib/CamlinternalMenhirLib/g" > $@
|
||||
+ sed "s/MenhirLib/CamlinternalMenhirLib/g" $< > $@
|
||||
|
||||
|
||||
partialclean:: partialclean-menhir
|
||||
diff --git a/tools/check-parser-uptodate-or-warn.sh b/tools/check-parser-uptodate-or-warn.sh
|
||||
index 5502eae54..2f07619a6 100755
|
||||
--- a/tools/check-parser-uptodate-or-warn.sh
|
||||
+++ b/tools/check-parser-uptodate-or-warn.sh
|
||||
@@ -15,6 +15,9 @@
|
||||
#* *
|
||||
#**************************************************************************
|
||||
|
||||
+# stop early if we are not on a development version
|
||||
+grep -Fq '+dev' VERSION || exit 0
|
||||
+
|
||||
# We try to warn if the user edits parsing/parser.mly but forgets to
|
||||
# rebuild the generated parser. Our heuristic is to use the file
|
||||
# modification timestamp, but just testing
|
||||
@@ -24,15 +27,20 @@
|
||||
# seconds after boot/menhir/parser.ml.
|
||||
|
||||
# mtime(): access a file's last modification time as a timestamp,
|
||||
-# using either GNU coreutils' stat --format, or BSD/macos stat -f.
|
||||
+# using either
|
||||
+# GNU coreutils' stat --format, or
|
||||
+# busybox's stat -c, or
|
||||
+# BSD/macOS stat -f.
|
||||
# Default to 0 if 'stat' is not available.
|
||||
|
||||
stat . 2>/dev/null 1>/dev/null
|
||||
if test $? != 0
|
||||
then MTIME=""
|
||||
-elif test -n "$(stat --version 2>/dev/null | grep coreutils)"
|
||||
+elif stat --version 2>/dev/null | grep -Fq 'coreutils'
|
||||
then MTIME="stat --format %Y"
|
||||
-else MTIME="stat -f %m"
|
||||
+elif stat 2>&1 | grep -Fq 'busybox'
|
||||
+then MTIME="stat -c %Y"
|
||||
+else MTIME="stat -f %m" # BSD stat?
|
||||
fi
|
||||
|
||||
mtime() {
|
||||
@@ -45,7 +53,12 @@ mtime() {
|
||||
# The check itself
|
||||
SOURCE_MTIME=$(mtime parsing/parser.mly)
|
||||
GENERATED_MTIME=$(mtime boot/menhir/parser.ml)
|
||||
-if test $SOURCE_MTIME -gt $(( $GENERATED_MTIME + 10 ))
|
||||
+if test -z "$SOURCE_MTIME" -o -z "$GENERATED_MTIME"
|
||||
+then
|
||||
+ echo
|
||||
+ tput setaf 3; tput bold; printf "Warning: "; tput sgr0
|
||||
+ echo "Failed to check if boot/menhir/parser.ml is up-to-date."
|
||||
+elif test "$SOURCE_MTIME" -gt $(( GENERATED_MTIME + 10 ))
|
||||
then
|
||||
echo
|
||||
tput setaf 3; tput bold; printf "Warning: "; tput sgr0
|
||||
--
|
||||
2.23.0
|
||||
|
51
0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch
Normal file
51
0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch
Normal file
@ -0,0 +1,51 @@
|
||||
From 3ef8ce701db0a010771c62171fc7ae355214ed05 Mon Sep 17 00:00:00 2001
|
||||
From: David Allsopp <david.allsopp@metastack.com>
|
||||
Date: Thu, 26 Sep 2019 13:51:08 +0100
|
||||
Subject: [PATCH 05/12] Run whole of gen_primitives.sh with LC_ALL=C
|
||||
|
||||
Fixes #8985. Assuming the locale has been generated, running
|
||||
LC_COLLATE=sv_SE.UTF-8 make world failed previously since the w
|
||||
character is not matched in [a-z] in this locale.
|
||||
---
|
||||
Changes | 4 ++++
|
||||
runtime/gen_primitives.sh | 5 ++++-
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Changes b/Changes
|
||||
index 63cac3ef9..257a75e3d 100644
|
||||
--- a/Changes
|
||||
+++ b/Changes
|
||||
@@ -8,6 +8,10 @@ OCaml 4.09 maintenance branch:
|
||||
- #8965, #8979: Alpine build failure caused by check-parser-uptodate-or-warn.sh
|
||||
(Gabriel Scherer and David Allsopp, report by Anton Kochkov)
|
||||
|
||||
+- #8985, #8986: fix generation of the primitives when the locale collation is
|
||||
+ incompatible with C.
|
||||
+ (David Allsopp, review by Nicolás Ojeda Bär, report by Sebastian Rasmussen)
|
||||
+
|
||||
OCaml 4.09.0 (19 September 2019):
|
||||
---------------------------------
|
||||
|
||||
diff --git a/runtime/gen_primitives.sh b/runtime/gen_primitives.sh
|
||||
index e3ca2779b..63365a7fb 100755
|
||||
--- a/runtime/gen_primitives.sh
|
||||
+++ b/runtime/gen_primitives.sh
|
||||
@@ -17,6 +17,9 @@
|
||||
|
||||
# duplicated from $(ROOTDIR)/runtime/Makefile
|
||||
|
||||
+# #8985: the meaning of character range a-z depends on the locale, so force C
|
||||
+# locale throughout.
|
||||
+export LC_ALL=C
|
||||
(
|
||||
for prim in \
|
||||
alloc array compare extern floats gc_ctrl hash intern interp ints io \
|
||||
@@ -27,4 +30,4 @@
|
||||
done
|
||||
sed -n -e 's/^CAMLprim_int64_[0-9](\([a-z0-9_][a-z0-9_]*\)).*/caml_int64_\1\
|
||||
caml_int64_\1_native/p' ints.c
|
||||
-) | LC_ALL=C sort | uniq
|
||||
+) | sort | uniq
|
||||
--
|
||||
2.23.0
|
||||
|
@ -1,40 +0,0 @@
|
||||
From 2f23a53b4aa1b672b3919cc021b83548f713b90a Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 5 Jun 2018 19:48:08 +0000
|
||||
Subject: [PATCH 5/5] riscv: Emit debug info.
|
||||
|
||||
---
|
||||
asmcomp/riscv/emit.mlp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/asmcomp/riscv/emit.mlp b/asmcomp/riscv/emit.mlp
|
||||
index 88ea9f884..cc05aefe4 100644
|
||||
--- a/asmcomp/riscv/emit.mlp
|
||||
+++ b/asmcomp/riscv/emit.mlp
|
||||
@@ -261,6 +261,7 @@ let tailrec_entry_point = ref 0
|
||||
(* Output the assembly code for an instruction *)
|
||||
|
||||
let emit_instr i =
|
||||
+ emit_debug_info i.dbg;
|
||||
match i.desc with
|
||||
Lend -> ()
|
||||
| Lprologue ->
|
||||
@@ -556,6 +557,7 @@ let fundecl fundecl =
|
||||
` {emit_string code_space}\n`;
|
||||
` .align 2\n`;
|
||||
`{emit_symbol fundecl.fun_name}:\n`;
|
||||
+ emit_debug_info fundecl.fun_dbg;
|
||||
emit_all fundecl.fun_body;
|
||||
List.iter emit_call_gc !call_gc_sites;
|
||||
List.iter emit_call_bound_error !bound_error_sites;
|
||||
@@ -615,6 +617,7 @@ let data l =
|
||||
|
||||
let begin_assembly() =
|
||||
` .file \"\"\n`; (* PR#7073 *)
|
||||
+ reset_debug_info ();
|
||||
(* Emit the beginning of the segments *)
|
||||
let lbl_begin = Compilenv.make_symbol (Some "data_begin") in
|
||||
` {emit_string data_space}\n`;
|
||||
--
|
||||
2.22.0.rc3
|
||||
|
@ -0,0 +1,28 @@
|
||||
From 8995e5828ebfe933b74d0c3704c0524a63c73467 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Angeletti <florian.angeletti@inria.fr>
|
||||
Date: Fri, 27 Sep 2019 17:15:26 +0200
|
||||
Subject: [PATCH 06/12] Merge pull request #8988 from Octachron/fix_ocamlnat
|
||||
|
||||
Fix ocamlnat
|
||||
|
||||
(cherry picked from commit afb90bdf7476a92c024eee2e5745ed85200c654b)
|
||||
---
|
||||
toplevel/opttoploop.ml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/toplevel/opttoploop.ml b/toplevel/opttoploop.ml
|
||||
index 0d1f73921..0174a9ab5 100644
|
||||
--- a/toplevel/opttoploop.ml
|
||||
+++ b/toplevel/opttoploop.ml
|
||||
@@ -257,7 +257,7 @@ let load_lambda ppf ~module_ident ~required_globals lam size =
|
||||
else
|
||||
Asmgen.compile_implementation_flambda
|
||||
~required_globals ~backend ~toplevel:need_symbol fn ~ppf_dump:ppf
|
||||
- (Flambda_middle_end.middle_end ~ppf_dump:ppf ~prefixname:"" ~backend ~size
|
||||
+ (Flambda_middle_end.middle_end ~ppf_dump:ppf ~prefixname:fn ~backend ~size
|
||||
~module_ident ~module_initializer:slam ~filename:"toplevel");
|
||||
Asmlink.call_linker_shared [fn ^ ext_obj] dll;
|
||||
Sys.remove (fn ^ ext_obj);
|
||||
--
|
||||
2.23.0
|
||||
|
45
0007-Fix-failure-to-install-tools-links.patch
Normal file
45
0007-Fix-failure-to-install-tools-links.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From fa36269c5752bfb8f4b65dd0f9a2dd8f9c9eeb8f Mon Sep 17 00:00:00 2001
|
||||
From: David Allsopp <david.allsopp@metastack.com>
|
||||
Date: Tue, 6 Aug 2019 09:23:06 +0100
|
||||
Subject: [PATCH 07/12] Fix failure to install tools links
|
||||
|
||||
In --disable-installing-bytecode-programs mode, the .opt version of the
|
||||
tools is installed, but the symlink for the tool itself is not created.
|
||||
|
||||
(cherry picked from commit 705739fa54260b7a0e6cbba0b5a99e52c79f9c09)
|
||||
---
|
||||
Changes | 5 +++++
|
||||
tools/Makefile | 1 +
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/Changes b/Changes
|
||||
index 257a75e3d..3fdc31a5f 100644
|
||||
--- a/Changes
|
||||
+++ b/Changes
|
||||
@@ -1,6 +1,11 @@
|
||||
OCaml 4.09 maintenance branch:
|
||||
------------------------------
|
||||
|
||||
+- #8855, #8858: Links for tools not created when installing with
|
||||
+ --disable-installing-byecode-programs (e.g. ocamldep.opt installed, but
|
||||
+ ocamldep link not created)
|
||||
+ (David Allsopp, report by Thomas Leonard)
|
||||
+
|
||||
- #8953, #8954: Fix error submessages in the toplevel: do not display
|
||||
dummy locations
|
||||
(Armaël Guéneau, review by Gabriel Scherer)
|
||||
diff --git a/tools/Makefile b/tools/Makefile
|
||||
index afefc4d83..84ddd79fb 100644
|
||||
--- a/tools/Makefile
|
||||
+++ b/tools/Makefile
|
||||
@@ -242,6 +242,7 @@ else
|
||||
do \
|
||||
if test -f "$$i".opt; then \
|
||||
$(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \
|
||||
+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \
|
||||
fi; \
|
||||
done
|
||||
endif
|
||||
--
|
||||
2.23.0
|
||||
|
@ -0,0 +1,31 @@
|
||||
From 308ea9a8d526160e2b45f16d63a0aee70984b814 Mon Sep 17 00:00:00 2001
|
||||
From: Gabriel Scherer <gabriel.scherer@gmail.com>
|
||||
Date: Sun, 29 Sep 2019 19:33:29 +0200
|
||||
Subject: [PATCH 08/12] Merge pull request #8996 from dra27/win-reconfigure
|
||||
|
||||
Windows supports make reconfigure now
|
||||
|
||||
(cherry picked from commit c71997a167c3670d202c6ecaf830c6a25b4b95b8)
|
||||
---
|
||||
Makefile | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7ac446f62..90583f1bc 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -326,11 +326,9 @@ endif
|
||||
utils/config.ml: utils/config.mlp Makefile.config utils/Makefile Makefile
|
||||
$(MAKE) -C utils config.ml
|
||||
|
||||
-ifeq "$(UNIX_OR_WIN32)" "unix"
|
||||
.PHONY: reconfigure
|
||||
reconfigure:
|
||||
./configure $(CONFIGURE_ARGS)
|
||||
-endif
|
||||
|
||||
.PHONY: partialclean
|
||||
partialclean::
|
||||
--
|
||||
2.23.0
|
||||
|
@ -1,14 +1,14 @@
|
||||
From d3bc916ff1bc467c503e21015db9c1e2a47a64f2 Mon Sep 17 00:00:00 2001
|
||||
From 065c173840d0c379c26376b1de6363736043c969 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 1/5] Don't add rpaths to libraries.
|
||||
Subject: [PATCH 09/12] Don't add rpaths to libraries.
|
||||
|
||||
---
|
||||
tools/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/Makefile b/tools/Makefile
|
||||
index ee0e0be4c..7c96b6405 100644
|
||||
index 84ddd79fb..796821968 100644
|
||||
--- a/tools/Makefile
|
||||
+++ b/tools/Makefile
|
||||
@@ -153,8 +153,8 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo \
|
||||
@ -23,5 +23,5 @@ index ee0e0be4c..7c96b6405 100644
|
||||
> ocamlmklibconfig.ml
|
||||
|
||||
--
|
||||
2.22.0.rc3
|
||||
2.23.0
|
||||
|
@ -1,17 +1,17 @@
|
||||
From 8cc56a1515816c9cef84694e63eaed63a0474090 Mon Sep 17 00:00:00 2001
|
||||
From f1c04c17f5b42a969cbf3119ebbb851e799d664d 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 2/5] configure: Allow user defined C compiler flags.
|
||||
Subject: [PATCH 10/12] configure: Allow user defined C compiler flags.
|
||||
|
||||
---
|
||||
configure.ac | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f5d8a2687..ad5b701bd 100644
|
||||
index c2f185373..12d9f6cde 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -553,6 +553,10 @@ AS_CASE([$host],
|
||||
@@ -549,6 +549,10 @@ AS_CASE([$host],
|
||||
internal_cflags="$gcc_warnings"],
|
||||
[common_cflags="-O"])])
|
||||
|
||||
@ -23,5 +23,5 @@ index f5d8a2687..ad5b701bd 100644
|
||||
|
||||
# Enable SSE2 on x86 mingw to avoid using 80-bit registers.
|
||||
--
|
||||
2.22.0.rc3
|
||||
2.23.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 0204a1137a8e8058afd1665aa6112656bc7bf0be Mon Sep 17 00:00:00 2001
|
||||
From 3432e0eb653e670025642b6e40e2d4a2eb4c28ae Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Fri, 26 Apr 2019 16:16:29 +0100
|
||||
Subject: [PATCH 3/5] configure: Remove incorrect assumption about
|
||||
Subject: [PATCH 11/12] configure: Remove incorrect assumption about
|
||||
cross-compiling.
|
||||
|
||||
See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
|
||||
@ -10,12 +10,12 @@ See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ad5b701bd..2227769e8 100644
|
||||
index 12d9f6cde..e85cc9ffa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -959,7 +959,7 @@ AS_CASE([$host],
|
||||
[*-*-mingw32|*-pc-windows], [asppprofflags=''],
|
||||
[asppprofflags='-DPROFILING'])
|
||||
@@ -927,7 +927,7 @@ AS_IF([test $arch != "none" && $arch64 ],
|
||||
|
||||
# Assembler
|
||||
|
||||
-AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
|
||||
+#AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
|
||||
@ -23,5 +23,5 @@ index ad5b701bd..2227769e8 100644
|
||||
# We first compute default values for as and aspp
|
||||
# If values have been given by the user then they take precedence over
|
||||
--
|
||||
2.22.0.rc3
|
||||
2.23.0
|
||||
|
1912
0012-Add-riscv64-backend.patch
Normal file
1912
0012-Add-riscv64-backend.patch
Normal file
File diff suppressed because it is too large
Load Diff
27
ocaml.spec
27
ocaml.spec
@ -30,7 +30,7 @@
|
||||
#global rcver +rc2
|
||||
|
||||
Name: ocaml
|
||||
Version: 4.08.1
|
||||
Version: 4.09.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: OCaml compiler and programming environment
|
||||
@ -39,7 +39,7 @@ License: QPL and (LGPLv2+ with exceptions)
|
||||
|
||||
URL: http://www.ocaml.org
|
||||
|
||||
Source0: http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-%{version}%{rcver}.tar.xz
|
||||
Source0: http://caml.inria.fr/pub/distrib/ocaml-4.09/ocaml-%{version}%{rcver}.tar.xz
|
||||
|
||||
# IMPORTANT NOTE:
|
||||
#
|
||||
@ -50,21 +50,29 @@ Source0: http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-%{version}%{rc
|
||||
#
|
||||
# https://pagure.io/fedora-ocaml
|
||||
#
|
||||
# Current branch: fedora-32-4.08.1
|
||||
# Current branch: fedora-32-4.09.0
|
||||
#
|
||||
# ALTERNATIVELY add a patch to the end of the list (leaving the
|
||||
# existing patches unchanged) adding a comment to note that it should
|
||||
# be incorporated into the git repo at a later time.
|
||||
#
|
||||
|
||||
# Upstream patches after 4.09.0 was released.
|
||||
Patch0001: 0001-increment-version-number-after-tagging-4.09.0.patch
|
||||
Patch0002: 0002-mark-the-release-in-the-Changes.patch
|
||||
Patch0003: 0003-Merge-pull-request-8954-from-Armael-fix-toplevel-sub.patch
|
||||
Patch0004: 0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch
|
||||
Patch0005: 0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch
|
||||
Patch0006: 0006-Merge-pull-request-8988-from-Octachron-fix_ocamlnat.patch
|
||||
Patch0007: 0007-Fix-failure-to-install-tools-links.patch
|
||||
Patch0008: 0008-Merge-pull-request-8996-from-dra27-win-reconfigure.patch
|
||||
# Fedora-specific downstream patches.
|
||||
Patch0001: 0001-Don-t-add-rpaths-to-libraries.patch
|
||||
Patch0002: 0002-configure-Allow-user-defined-C-compiler-flags.patch
|
||||
Patch0003: 0003-configure-Remove-incorrect-assumption-about-cross-co.patch
|
||||
Patch0009: 0009-Don-t-add-rpaths-to-libraries.patch
|
||||
Patch0010: 0010-configure-Allow-user-defined-C-compiler-flags.patch
|
||||
Patch0011: 0011-configure-Remove-incorrect-assumption-about-cross-co.patch
|
||||
# Out of tree patch for RISC-V support.
|
||||
# https://github.com/nojb/riscv-ocaml
|
||||
Patch0004: 0004-Add-RISC-V-backend.patch
|
||||
Patch0005: 0005-riscv-Emit-debug-info.patch
|
||||
Patch0012: 0012-Add-riscv64-backend.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: autoconf
|
||||
@ -381,6 +389,9 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 4.09.0-1
|
||||
- OCaml 4.09.0 final.
|
||||
|
||||
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.08.1-1
|
||||
- OCaml 4.08.1 final.
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ocaml-4.08.1.tar.xz) = ebcc065c4cc4bf16256c6dad6795d9660d355c5facbe432591811dc4aa02af6498899219ec4e786358dffcfc38c68f5af2d1c3787d418a78732ec37e84a28cd4
|
||||
SHA512 (ocaml-4.09.0.tar.xz) = 5cd745802ee53ab85ee676a20fbb28985ba68965df1d7242de5763d982b0a744951da742615fe478c4d3c98b34531632e3a71de89da6c717ccd90cc01e6fff26
|
||||
|
Loading…
Reference in New Issue
Block a user