rpms/ocaml
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Reset the version number back to 4.09.0.

Browse Source 
So we generate ocaml(runtime) = 4.09.0 dependency correctly.
This commit is contained in:
Richard W.M. Jones 2019-12-05 18:09:05 +00:00
parent ab47d2524d
commit 54390d6011
14 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-increment-version-number-after-tagging-4.09.0.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 01/13] increment version number after tagging 4.09.0
---
VERSION | 2 +-

2
0002-mark-the-release-in-the-Changes.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 02/13] mark the release in the Changes
---
Changes | 7 +++++--

2
0003-Merge-pull-request-8954-from-Armael-fix-toplevel-sub.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 03/13] Merge pull request #8954 from
Armael/fix-toplevel-submsg-locs
Fix error submessages in the toplevel: do not display dummy locations

2
0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 04/13] Merge pull request #8979 from
gasche/fix-Makefile.menhir
Fix tools/check-parser-uptodate-or-warn.sh

2
0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 05/13] 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

2
0006-Merge-pull-request-8988-from-Octachron-fix_ocamlnat.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 06/13] Merge pull request #8988 from Octachron/fix_ocamlnat
Fix ocamlnat

2
0007-Fix-failure-to-install-tools-links.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 07/13] 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.

2
0008-Merge-pull-request-8996-from-dra27-win-reconfigure.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 08/13] Merge pull request #8996 from dra27/win-reconfigure
Windows supports make reconfigure now

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

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

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

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

2
0011-configure-Remove-incorrect-assumption-about-cross-co.patch
View File

@ -1,7 +1,7 @@
From 272b31bbd8c35a613f035465441ac5a34de8450e 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 11/12] configure: Remove incorrect assumption about
Subject: [PATCH 11/13] configure: Remove incorrect assumption about
cross-compiling.
See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390

2
0012-Add-riscv64-backend.patch
View File

@ -1,7 +1,7 @@
From 46230ada6483449154c465243edd80d9e539b73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= <n.oje.bar@gmail.com>
Date: Mon, 18 Nov 2019 01:13:30 +0100
Subject: [PATCH 12/12] Add riscv64 backend
Subject: [PATCH 12/13] Add riscv64 backend
(cherry picked from commit c8a361f586c21eca25108ee79c495bb480a1c3f3)
---

41
0013-Revert-increment-version-number-after-tagging-4.09.0.patch Normal file
View File

@ -0,0 +1,41 @@
From 76a56065047f9160b0db2491c8f303c9dee6cb59 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 5 Dec 2019 18:07:29 +0000
Subject: [PATCH 13/13] Revert "increment version number after tagging 4.09.0"
Downgrade version number back to 4.09.0 for Fedora.
This reverts commit 6207460e793f8c5538bfd8164fa3078f7300b57a.
---
VERSION | 2 +-
ocaml-variants.opam | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VERSION b/VERSION
index ff541f87c..7128cac1f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-4.09.1+dev0
+4.09.0
# The version string is the first line of this file.
# It must be in the format described in stdlib/sys.mli
diff --git a/ocaml-variants.opam b/ocaml-variants.opam
index 5410d1f4c..30d48eb24 100644
--- a/ocaml-variants.opam
+++ b/ocaml-variants.opam
@@ -1,8 +1,8 @@
opam-version: "2.0"
-version: "4.09.1+trunk"
+version: "4.09.0"
synopsis: "OCaml development version"
depends: [
- "ocaml" {= "4.09.1" & post}
+ "ocaml" {= "4.09.0" & post}
"base-unix" {post}
"base-bigarray" {post}
"base-threads" {post}
--
2.23.0

6
ocaml.spec
View File

@ -31,7 +31,7 @@
Name: ocaml
Version: 4.09.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: OCaml compiler and programming environment
@ -73,6 +73,8 @@ Patch0011: 0011-configure-Remove-incorrect-assumption-about-cross-co.patch
# Out of tree patch for RISC-V support.
# https://github.com/nojb/riscv-ocaml
Patch0012: 0012-Add-riscv64-backend.patch
# Resets the version number back to 4.09.0.
Patch0013: 0013-Revert-increment-version-number-after-tagging-4.09.0.patch
BuildRequires: git
BuildRequires: gcc
@ -373,7 +375,7 @@ 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
* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 4.09.0-2
- OCaml 4.09.0 final.
- Use autosetup, remove old setup line.
- Remove ocamloptp binaries.