Drop downstream 0017-configure-Only-use-OC_-for-building-executables.patch

This is no longer needed now we found another way to work around build notes breakage.
2023-07-11 17:46:39 +01:00 · 2023-07-11 17:46:39 +01:00 · 772b17b666
commit 772b17b666
parent be2dfe04db
19 changed files with 21 additions and 62 deletions
--- a/0001-increment-version-number-after-tagging-5.0.0.patch
+++ b/0001-increment-version-number-after-tagging-5.0.0.patch
@ -1,7 +1,7 @@
 From 8741f4d88801e478e0ab7f871dc7dbcf9d7cc8f4 Mon Sep 17 00:00:00 2001
 From: Florian Angeletti <florian.angeletti@inria.fr>
 Date: Thu, 15 Dec 2022 14:28:32 +0100
-Subject: [PATCH 01/18] increment version number after tagging 5.0.0
+Subject: [PATCH 01/17] increment version number after tagging 5.0.0

 ---
 VERSION                    |   2 +-
--- a/0002-Merge-pull-request-11814-from-gasche-clarify-DLS.new.patch
+++ b/0002-Merge-pull-request-11814-from-gasche-clarify-DLS.new.patch
@ -1,7 +1,7 @@
 From 925bf9a6d828d7548751f9a21892cad6209fc950 Mon Sep 17 00:00:00 2001
 From: Gabriel Scherer <gabriel.scherer@gmail.com>
 Date: Fri, 16 Dec 2022 09:41:13 +0100
-Subject: [PATCH 02/18] Merge pull request #11814 from
+Subject: [PATCH 02/17] Merge pull request #11814 from
 gasche/clarify-DLS.new_key-doc

 clarify the doc of Domain.DLS.new_key
--- a/0003-Add-KC-Sivaramakrishnan-as-author.patch
+++ b/0003-Add-KC-Sivaramakrishnan-as-author.patch
@ -1,7 +1,7 @@
 From 83ef99f67fda11b268098a271f56b990e295bbc2 Mon Sep 17 00:00:00 2001
 From: Xavier Leroy <xavier.leroy@college-de-france.fr>
 Date: Tue, 20 Dec 2022 10:48:41 +0100
-Subject: [PATCH 03/18] Add KC Sivaramakrishnan as author
+Subject: [PATCH 03/17] Add KC Sivaramakrishnan as author

 For the two new chapters "Parallel programming" and "Memory model".

--- a/0004-removed-set-but-unused-variables-in-yacc-reader.c-11.patch
+++ b/0004-removed-set-but-unused-variables-in-yacc-reader.c-11.patch
@ -1,7 +1,7 @@
 From ea8b79eda165722d04b369f1811a5aa80ab5acc6 Mon Sep 17 00:00:00 2001
 From: SSHz <szhang590@bloomberg.net>
 Date: Sun, 27 Nov 2022 14:46:16 +0000
-Subject: [PATCH 04/18] removed set but unused variables in yacc/reader.c
+Subject: [PATCH 04/17] removed set but unused variables in yacc/reader.c
 (#11758)

 (cherry picked from commit 0114f62d3ed056254ac25192f724e92a2ff6c448)
--- a/0005-Merge-pull-request-11860-from-Octachron-index_for_st.patch
+++ b/0005-Merge-pull-request-11860-from-Octachron-index_for_st.patch
@ -1,7 +1,7 @@
 From 848e28fc6f3f3c9802b23c00f2d77f568c761667 Mon Sep 17 00:00:00 2001
 From: Gabriel Scherer <gabriel.scherer@gmail.com>
 Date: Tue, 3 Jan 2023 17:41:12 +0100
-Subject: [PATCH 05/18] Merge pull request #11860 from
+Subject: [PATCH 05/17] Merge pull request #11860 from
 Octachron/index_for_stdlib

 documentation: sort modules alphabetically
--- a/0006-Allow-installing-in-folder-with-space-in-name-11590.patch
+++ b/0006-Allow-installing-in-folder-with-space-in-name-11590.patch
@ -1,7 +1,7 @@
 From a3cd42bc03ed0fc706bb7364fdb14b29b1925600 Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Wed, 4 Jan 2023 16:33:28 +0000
-Subject: [PATCH 06/18] Allow installing in folder with space in name (#11590)
+Subject: [PATCH 06/17] Allow installing in folder with space in name (#11590)

 - fix(build): Repair make install (in man/Makefile)
 ---
--- a/0007-Detect-unused-Makefile-variables-in-workflow.patch
+++ b/0007-Detect-unused-Makefile-variables-in-workflow.patch
@ -1,7 +1,7 @@
 From 44f4015f9a649e164b332e6ab1302139191d4a4f Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Wed, 3 Mar 2021 12:24:36 +0000
-Subject: [PATCH 07/18] Detect unused Makefile variables in workflow
+Subject: [PATCH 07/17] Detect unused Makefile variables in workflow

 ---
 tools/ci/actions/runner.sh | 13 ++++++++++++-
--- a/0008-Fix-incorrect-variable-from-runtime-Makefile-merge.patch
+++ b/0008-Fix-incorrect-variable-from-runtime-Makefile-merge.patch
@ -1,7 +1,7 @@
 From 2eccdd3cd78624b0f2664d6152afbcae167f6f8b Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Mon, 20 Feb 2023 20:27:58 +0000
-Subject: [PATCH 08/18] Fix incorrect variable from runtime/Makefile merge
+Subject: [PATCH 08/17] Fix incorrect variable from runtime/Makefile merge

 Wrong CPPFLAGS used when assembling with ASPP.
 ---
--- a/0009-Provide-a-default-for-OCAMLDEPFLAGS.patch
+++ b/0009-Provide-a-default-for-OCAMLDEPFLAGS.patch
@ -1,7 +1,7 @@
 From 5f3f8bf734bdc02adc69cf92f066547bd71e8a25 Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Mon, 20 Feb 2023 20:31:31 +0000
-Subject: [PATCH 09/18] Provide a default for $(OCAMLDEPFLAGS)
+Subject: [PATCH 09/17] Provide a default for $(OCAMLDEPFLAGS)

 ---
 Makefile.common | 1 +
--- a/0010-Report-all-post-build-failures.patch
+++ b/0010-Report-all-post-build-failures.patch
@ -1,7 +1,7 @@
 From 7f4569e22c2a19d51324c44a2954b10427df2cd8 Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Tue, 21 Feb 2023 14:44:21 +0000
-Subject: [PATCH 10/18] Report all post-build failures
+Subject: [PATCH 10/17] Report all post-build failures

 Rather than just reporting un-prefixed symbol names, also report
 undefined variables.
--- a/0011-Finish-off-removal-of-FORCE_INSTRUMENTED_RUNTIME.patch
+++ b/0011-Finish-off-removal-of-FORCE_INSTRUMENTED_RUNTIME.patch
@ -1,7 +1,7 @@
 From 0f6dc503bf3814e5547ffb4e9d6ea0a75ffd1ec0 Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Wed, 22 Feb 2023 10:47:00 +0000
-Subject: [PATCH 11/18] Finish off removal of FORCE_INSTRUMENTED_RUNTIME
+Subject: [PATCH 11/17] Finish off removal of FORCE_INSTRUMENTED_RUNTIME

 ---
 utils/Makefile | 1 -
--- a/0012-suppress-spurious-alert-when-compiling-stdlib-docume.patch
+++ b/0012-suppress-spurious-alert-when-compiling-stdlib-docume.patch
@ -1,7 +1,7 @@
 From ffb2022797986324213891a59c02af46269b5c17 Mon Sep 17 00:00:00 2001
 From: Damien Doligez <damien.doligez@inria.fr>
 Date: Mon, 17 Apr 2023 11:36:32 +0200
-Subject: [PATCH 12/18] suppress spurious alert when compiling stdlib
+Subject: [PATCH 12/17] suppress spurious alert when compiling stdlib
 documentation

 (cherry picked from commit 5c0fb8e23865fdbf151bdbe15d91176903c284d3)
--- a/0013-Merge-pull-request-12285-from-smorimoto-update-depre.patch
+++ b/0013-Merge-pull-request-12285-from-smorimoto-update-depre.patch
@ -1,7 +1,7 @@
 From 4cc4eb8b0d71c64c5252d6764f4c4b0aa6020995 Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Sat, 3 Jun 2023 18:02:24 +0100
-Subject: [PATCH 13/18] Merge pull request #12285 from
+Subject: [PATCH 13/17] Merge pull request #12285 from
 smorimoto/update-deprecated-actions

 Update deprecated GitHub Actions
--- a/0014-Merge-pull-request-12286-from-smorimoto-replace-set-.patch
+++ b/0014-Merge-pull-request-12286-from-smorimoto-replace-set-.patch
@ -1,7 +1,7 @@
 From af3a67cd06e07825c63b70a038cf90481039b1ed Mon Sep 17 00:00:00 2001
 From: David Allsopp <david.allsopp@metastack.com>
 Date: Fri, 9 Jun 2023 21:47:51 +0100
-Subject: [PATCH 14/18] Merge pull request #12286 from
+Subject: [PATCH 14/17] Merge pull request #12286 from
 smorimoto/replace-set-output

 Replace the set-output command with the GITHUB_OUTPUT environment file
--- a/0015-Don-t-add-rpaths-to-libraries.patch
+++ b/0015-Don-t-add-rpaths-to-libraries.patch
@ -1,7 +1,7 @@
 From 0e07dfdb530734ef4db351ecc24c6363e36916ec 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 15/18] Don't add rpaths to libraries.
+Subject: [PATCH 15/17] Don't add rpaths to libraries.

 ---
 utils/config.mlp | 4 ++--
--- a/0016-configure-Allow-user-defined-C-compiler-flags.patch
+++ b/0016-configure-Allow-user-defined-C-compiler-flags.patch
@ -1,7 +1,7 @@
 From 9d3722c87ab15dfbc4e1a934e09ddc8253712d9c 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 16/18] configure: Allow user defined C compiler flags.
+Subject: [PATCH 16/17] configure: Allow user defined C compiler flags.

 ---
 configure.ac | 4 ++++
--- a/0017-Fix-skiplist-test-failure-12346.patch
+++ b/0017-Fix-skiplist-test-failure-12346.patch
@ -1,7 +1,7 @@
-From 69fdedd5c7747370879abbdc2beb5d7a1bd72194 Mon Sep 17 00:00:00 2001
+From 74b0eee42f616cb05c640c0ceac0cc391e4a7ef1 Mon Sep 17 00:00:00 2001
 From: Jerry James <loganjerry@gmail.com>
 Date: Fri, 7 Jul 2023 07:07:09 -0600
-Subject: [PATCH 18/18] Fix skiplist test failure (#12346)
+Subject: [PATCH 17/17] Fix skiplist test failure (#12346)

 Fix -Wmaybe-uninitialized warning in skiplist test
 Fix -Wunused-variable warning in skiplist test
--- a/0017-configure-Only-use-OC_-for-building-executables.patch
+++ b/0017-configure-Only-use-OC_-for-building-executables.patch
@ -1,40 +0,0 @@
-From 1c908c961738067dd52a5ba4515cc35abd35b96b Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Wed, 26 Jan 2022 15:47:02 +0000
-Subject: [PATCH 17/18] configure: Only use OC_* for building executables
-
-Fedora >= 36 fills LD_FLAGS with lots of cruft, particularly stuff for
-"package notes" which contains build paths.
-
-In any case it seems pointless having both the OC_* variables and also
-including the regular CFLAGS/LDFLAGS.  Give me full control over what
-ocamlopt uses.
---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8068de3cfc..19b23f9400 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -36,7 +36,7 @@ CONFIGURE_ARGS="$*"
- # rely on $CFLAGS because these cannot be processed by flexlink (and are not
- # passed)
- mkexe_cmd='$(CC)'
-mkexe_cflags='$(OC_CFLAGS) $(CFLAGS)'
-+mkexe_cflags='$(OC_CFLAGS)'
- mkexe_extra_flags=''
- mkexe_via_cc_extra_cmd=''
- mkexe_ldflags_prefix=''
-@@ -2208,7 +2208,7 @@ ${mkdll_ldflags}"
-   ],[
-     mkdll_ldflags='$(OC_DLL_LDFLAGS) $(LDFLAGS)'
-     mkdll_ldflags_exp="${oc_dll_ldflags} ${LDFLAGS}"
-    mkexe="${mkexe} \$(OC_LDFLAGS) \$(LDFLAGS)"
-+    mkexe="${mkexe} \$(OC_LDFLAGS)"
-     mkexe_exp="${mkexe_exp} ${oc_ldflags} ${LDFLAGS}"
-   ])
-   mkdll="$mkdll $mkdll_ldflags"
-- 
-2.41.0
-
--- a/ocaml.spec
+++ b/ocaml.spec
@ -37,7 +37,7 @@ ExcludeArch: %{ix86}

 Name:           ocaml
 Version:        5.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}

 Summary:        OCaml compiler and programming environment

@ -81,11 +81,10 @@ Patch: 0014-Merge-pull-request-12286-from-smorimoto-replace-set-.patch
 # Fedora-specific patches
 Patch: 0015-Don-t-add-rpaths-to-libraries.patch
 Patch: 0016-configure-Allow-user-defined-C-compiler-flags.patch
-Patch: 0017-configure-Only-use-OC_-for-building-executables.patch

 # Fix skiplist test failure
 # https://github.com/ocaml/ocaml/pull/12346
-Patch: 0018-Fix-skiplist-test-failure-12346.patch
+Patch: 0017-Fix-skiplist-test-failure-12346.patch

 BuildRequires:  make
 BuildRequires:  git
@ -438,7 +437,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/ocaml


 %changelog
-* Wed Jun 14 2023 Jerry James <loganjerry@gmail.com> - 5.0.0-1
+* Wed Jun 14 2023 Jerry James <loganjerry@gmail.com> - 5.0.0-2
 - Version 5.0.0
 - Convert License tag to SPDX
 - Ship HTML documentation instead of asciidoc source