The package rpms/ocaml-mlgmpidl.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-mlgmpidl.git/commit/?id=426....
Change:
+%ifnarch %{ocaml_native_profiling}
Thanks.
Full change:
============
commit 4261363ed67ba4f6dc3b1fa3596ff310bfa48b46
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Nov 17 13:44:26 2017 +0000
Add back the no-profiling patch for aarch64 and s390x.
diff --git a/0001-Patch-makefile-to-take-custom-locations-for-librarie.patch
b/0001-Patch-makefile-to-take-custom-locations-for-librarie.patch
index 8932891..c95f169 100644
--- a/0001-Patch-makefile-to-take-custom-locations-for-librarie.patch
+++ b/0001-Patch-makefile-to-take-custom-locations-for-librarie.patch
@@ -1,7 +1,7 @@
From 4784d19f657c2b2eba6e4c516c6db9424a70088d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones(a)redhat.com>
Date: Thu, 9 Nov 2017 09:04:24 +0000
-Subject: [PATCH 1/4] Patch makefile to take custom locations for libraries and
+Subject: [PATCH 1/5] Patch makefile to take custom locations for libraries and
installing.
---
diff --git a/0002-Supply-compare_ext-functions-for-the-C-data-types.patch
b/0002-Supply-compare_ext-functions-for-the-C-data-types.patch
index 3cd61b9..419d4bc 100644
--- a/0002-Supply-compare_ext-functions-for-the-C-data-types.patch
+++ b/0002-Supply-compare_ext-functions-for-the-C-data-types.patch
@@ -1,7 +1,7 @@
From bc4a69353e853be0eda1f15bf564e94a1658257c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones(a)redhat.com>
Date: Thu, 9 Nov 2017 09:05:02 +0000
-Subject: [PATCH 2/4] Supply compare_ext functions for the C data types.
+Subject: [PATCH 2/5] Supply compare_ext functions for the C data types.
---
gmp_caml.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
diff --git a/0003-Eliminate-compiler-warnings-that-might-indicate-runt.patch
b/0003-Eliminate-compiler-warnings-that-might-indicate-runt.patch
index 83a6d5c..1d96290 100644
--- a/0003-Eliminate-compiler-warnings-that-might-indicate-runt.patch
+++ b/0003-Eliminate-compiler-warnings-that-might-indicate-runt.patch
@@ -1,7 +1,7 @@
From 94671390f2d516c75d810c246a4c80be4895db6b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones(a)redhat.com>
Date: Thu, 9 Nov 2017 09:05:39 +0000
-Subject: [PATCH 3/4] Eliminate compiler warnings that might indicate runtime
+Subject: [PATCH 3/5] Eliminate compiler warnings that might indicate runtime
bugs.
---
diff --git a/0004-Fix-for-immutable-strings-in-OCaml-4.06.patch
b/0004-Fix-for-immutable-strings-in-OCaml-4.06.patch
index f5c2884..9792ffc 100644
--- a/0004-Fix-for-immutable-strings-in-OCaml-4.06.patch
+++ b/0004-Fix-for-immutable-strings-in-OCaml-4.06.patch
@@ -1,7 +1,7 @@
From da459fc76f2f8bd4f843e3948b09a038824b7a42 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones(a)redhat.com>
Date: Thu, 9 Nov 2017 09:13:50 +0000
-Subject: [PATCH 4/4] Fix for immutable strings in OCaml 4.06.
+Subject: [PATCH 4/5] Fix for immutable strings in OCaml 4.06.
---
mpfr.idl | 4 +++-
diff --git a/0005-Remove-profiling-only-applied-on-aarch64-and-s390x.patch
b/0005-Remove-profiling-only-applied-on-aarch64-and-s390x.patch
new file mode 100644
index 0000000..ceb46b3
--- /dev/null
+++ b/0005-Remove-profiling-only-applied-on-aarch64-and-s390x.patch
@@ -0,0 +1,57 @@
+From aaf9662deec9d03974253e6c22fda09fe5281ff5 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones(a)redhat.com>
+Date: Fri, 17 Nov 2017 13:41:51 +0000
+Subject: [PATCH 5/5] Remove profiling [only applied on aarch64 and s390x].
+
+---
+ Makefile | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 61a98b5..79bb9a4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -77,14 +77,13 @@ LDFLAGS += \
+
+ CCMODULES = $(IDLMODULES:%=%_caml) gmp_caml
+
+-CCLIB = libgmp_caml.a libgmp_caml.p.a
++CCLIB = libgmp_caml.a
+ ifneq ($(HAS_SHARED),)
+ CCLIB += dllgmp_caml.so
+ endif
+
+ ifneq ($(HAS_OCAMLOPT),)
+- MLLIBx = $(MLMODULES:%=%.cmx) gmp.cmxa gmp.a \
+- $(MLMODULES:%=%.p.cmx) gmp.p.cmxa gmp.p.a
++ MLLIBx = $(MLMODULES:%=%.cmx) gmp.cmxa gmp.a
+ ifneq ($(HAS_NATIVE_PLUGINS),)
+ MLLIBx += gmp.cmxs
+ endif
+@@ -107,14 +106,13 @@ endif
+ # Rules
+ #---------------------------------------
+
+-all: byte opt prof
++all: byte opt
+
+ byte: $(MLMODULES:%=%.cmi) gmp.cma
+ opt: $(MLMODULES:%=%.cmx) gmp.cmxa
+ ifneq ($(HAS_NATIVE_PLUGINS),)
+ opt: gmp.cmxs
+ endif
+-prof: $(MLMODULES:%=%.p.cmx) gmp.p.cmxa
+
+ # Example of compilation command with ocamlfind
+ %.byte: %.ml
+@@ -167,7 +165,6 @@ META:
+ echo "archive(byte,plugin) = \"gmp.cma\"" >>META
+ echo "archive(native) = \"gmp.cmxa\"" >>META
+ echo "archive(native,plugin) = \"gmp.cmxs\"" >>META
+- echo "archive(native,gprof) = \"gmp.p.cmxa\"" >>META
+
+ ifeq ($(OCAMLFIND),)
+ install:
+--
+2.13.1
+
diff --git a/ocaml-mlgmpidl.spec b/ocaml-mlgmpidl.spec
index 3d3ffca..a98e451 100644
--- a/ocaml-mlgmpidl.spec
+++ b/ocaml-mlgmpidl.spec
@@ -1,6 +1,6 @@
Name: ocaml-mlgmpidl
Version: 1.2.4
-Release: 1
+Release: 2
Summary: OCaml interface to GMP and MPFR libraries
# The license includes a static linking exception
License: LGPLv2 with exceptions
@@ -19,13 +19,15 @@ Patch2:
0002-Supply-compare_ext-functions-for-the-C-data-types.patch
Patch3: 0003-Eliminate-compiler-warnings-that-might-indicate-runt.patch
# Fix for immutable strings in OCaml 4.06.
Patch4: 0004-Fix-for-immutable-strings-in-OCaml-4.06.patch
+%ifnarch %{ocaml_native_profiling}
+# Eliminate profiling on architectures which don't support it.
+Patch5: 0005-Remove-profiling-only-applied-on-aarch64-and-s390x.patch
+%endif
# These patches were removed because they were too difficult to
# apply to the 1.2.4 sources.
# Build a shared library in addition to a static library
#Patch4: mlgmpidl-1.2.1-cmxs.patch
-# Eliminate profiling on platforms which don't support it.
-#Patch5: mlgmpidl-1.2.1-no-profiling.patch
BuildRequires: gcc
BuildRequires: ocaml
@@ -177,6 +179,9 @@ mv $RPM_BUILD_ROOT%{my_ocaml_lib_dir}/gmp_caml.h
$RPM_BUILD_ROOT%{_includedir}
%changelog
+* Fri Nov 17 2017 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.4-2
+- Add back the no-profiling patch for aarch64 and s390x.
+
* Thu Nov 09 2017 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.4-1
- New upstream version 1.2.4.