From 54390d6011a662e771f7d87508003d8b3c8ca78b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Dec 2019 18:09:05 +0000 Subject: [PATCH] Reset the version number back to 4.09.0. So we generate ocaml(runtime) = 4.09.0 dependency correctly. --- ...-version-number-after-tagging-4.09.0.patch | 2 +- 0002-mark-the-release-in-the-Changes.patch | 2 +- ...st-8954-from-Armael-fix-toplevel-sub.patch | 2 +- ...st-8979-from-gasche-fix-Makefile.men.patch | 2 +- ...e-of-gen_primitives.sh-with-LC_ALL-C.patch | 2 +- ...est-8988-from-Octachron-fix_ocamlnat.patch | 2 +- 0007-Fix-failure-to-install-tools-links.patch | 2 +- ...uest-8996-from-dra27-win-reconfigure.patch | 2 +- 0009-Don-t-add-rpaths-to-libraries.patch | 2 +- ...-Allow-user-defined-C-compiler-flags.patch | 2 +- ...-incorrect-assumption-about-cross-co.patch | 2 +- 0012-Add-riscv64-backend.patch | 2 +- ...-version-number-after-tagging-4.09.0.patch | 41 +++++++++++++++++++ ocaml.spec | 6 ++- 14 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 0013-Revert-increment-version-number-after-tagging-4.09.0.patch diff --git a/0001-increment-version-number-after-tagging-4.09.0.patch b/0001-increment-version-number-after-tagging-4.09.0.patch index 646daeb..108de03 100644 --- a/0001-increment-version-number-after-tagging-4.09.0.patch +++ b/0001-increment-version-number-after-tagging-4.09.0.patch @@ -1,7 +1,7 @@ From 6207460e793f8c5538bfd8164fa3078f7300b57a Mon Sep 17 00:00:00 2001 From: Florian Angeletti 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 +- diff --git a/0002-mark-the-release-in-the-Changes.patch b/0002-mark-the-release-in-the-Changes.patch index 78a91d2..b004485 100644 --- a/0002-mark-the-release-in-the-Changes.patch +++ b/0002-mark-the-release-in-the-Changes.patch @@ -1,7 +1,7 @@ From c1db490f8d92e7b5f1a4685cd9a095f24429bb3e Mon Sep 17 00:00:00 2001 From: Gabriel Scherer 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 +++++-- diff --git a/0003-Merge-pull-request-8954-from-Armael-fix-toplevel-sub.patch b/0003-Merge-pull-request-8954-from-Armael-fix-toplevel-sub.patch index 2cb9cc4..3ddfbb1 100644 --- a/0003-Merge-pull-request-8954-from-Armael-fix-toplevel-sub.patch +++ b/0003-Merge-pull-request-8954-from-Armael-fix-toplevel-sub.patch @@ -1,7 +1,7 @@ From 1204abd71a4ef585dbb70ba68a5879856d24c1a9 Mon Sep 17 00:00:00 2001 From: Gabriel Scherer 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 diff --git a/0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch b/0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch index db2e66e..406b851 100644 --- a/0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch +++ b/0004-Merge-pull-request-8979-from-gasche-fix-Makefile.men.patch @@ -1,7 +1,7 @@ From 987e819b8fb8e36e660340931270a2ade02c439e Mon Sep 17 00:00:00 2001 From: Gabriel Scherer 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 diff --git a/0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch b/0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch index 4865a5b..a0fb4b9 100644 --- a/0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch +++ b/0005-Run-whole-of-gen_primitives.sh-with-LC_ALL-C.patch @@ -1,7 +1,7 @@ From 3ef8ce701db0a010771c62171fc7ae355214ed05 Mon Sep 17 00:00:00 2001 From: David Allsopp 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 diff --git a/0006-Merge-pull-request-8988-from-Octachron-fix_ocamlnat.patch b/0006-Merge-pull-request-8988-from-Octachron-fix_ocamlnat.patch index 0e3709a..41f5db5 100644 --- a/0006-Merge-pull-request-8988-from-Octachron-fix_ocamlnat.patch +++ b/0006-Merge-pull-request-8988-from-Octachron-fix_ocamlnat.patch @@ -1,7 +1,7 @@ From 8995e5828ebfe933b74d0c3704c0524a63c73467 Mon Sep 17 00:00:00 2001 From: Florian Angeletti 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 diff --git a/0007-Fix-failure-to-install-tools-links.patch b/0007-Fix-failure-to-install-tools-links.patch index 5824bd8..6463c15 100644 --- a/0007-Fix-failure-to-install-tools-links.patch +++ b/0007-Fix-failure-to-install-tools-links.patch @@ -1,7 +1,7 @@ From fa36269c5752bfb8f4b65dd0f9a2dd8f9c9eeb8f Mon Sep 17 00:00:00 2001 From: David Allsopp 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. diff --git a/0008-Merge-pull-request-8996-from-dra27-win-reconfigure.patch b/0008-Merge-pull-request-8996-from-dra27-win-reconfigure.patch index 56ebcde..969530f 100644 --- a/0008-Merge-pull-request-8996-from-dra27-win-reconfigure.patch +++ b/0008-Merge-pull-request-8996-from-dra27-win-reconfigure.patch @@ -1,7 +1,7 @@ From 308ea9a8d526160e2b45f16d63a0aee70984b814 Mon Sep 17 00:00:00 2001 From: Gabriel Scherer 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 diff --git a/0009-Don-t-add-rpaths-to-libraries.patch b/0009-Don-t-add-rpaths-to-libraries.patch index f2589ba..c150f8a 100644 --- a/0009-Don-t-add-rpaths-to-libraries.patch +++ b/0009-Don-t-add-rpaths-to-libraries.patch @@ -1,7 +1,7 @@ From 065c173840d0c379c26376b1de6363736043c969 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" 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 ++-- diff --git a/0010-configure-Allow-user-defined-C-compiler-flags.patch b/0010-configure-Allow-user-defined-C-compiler-flags.patch index 34ff372..2d9c5c3 100644 --- a/0010-configure-Allow-user-defined-C-compiler-flags.patch +++ b/0010-configure-Allow-user-defined-C-compiler-flags.patch @@ -1,7 +1,7 @@ From aab08177e52b9951b5e95c949c7b61c690a0efd7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" 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 ++++ diff --git a/0011-configure-Remove-incorrect-assumption-about-cross-co.patch b/0011-configure-Remove-incorrect-assumption-about-cross-co.patch index f2743cf..9a74aea 100644 --- a/0011-configure-Remove-incorrect-assumption-about-cross-co.patch +++ b/0011-configure-Remove-incorrect-assumption-about-cross-co.patch @@ -1,7 +1,7 @@ From 272b31bbd8c35a613f035465441ac5a34de8450e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" 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 diff --git a/0012-Add-riscv64-backend.patch b/0012-Add-riscv64-backend.patch index 7666e22..7697762 100644 --- a/0012-Add-riscv64-backend.patch +++ b/0012-Add-riscv64-backend.patch @@ -1,7 +1,7 @@ From 46230ada6483449154c465243edd80d9e539b73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= 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) --- diff --git a/0013-Revert-increment-version-number-after-tagging-4.09.0.patch b/0013-Revert-increment-version-number-after-tagging-4.09.0.patch new file mode 100644 index 0000000..86ebf7e --- /dev/null +++ b/0013-Revert-increment-version-number-after-tagging-4.09.0.patch @@ -0,0 +1,41 @@ +From 76a56065047f9160b0db2491c8f303c9dee6cb59 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +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 + diff --git a/ocaml.spec b/ocaml.spec index abf8161..1911150 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -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 - 4.09.0-1 +* Thu Dec 05 2019 Richard W.M. Jones - 4.09.0-2 - OCaml 4.09.0 final. - Use autosetup, remove old setup line. - Remove ocamloptp binaries.