[Pkg-ocaml-maint-commits] [cduce] 01/02: Set inlining level from debian/rules and decrease it only where necessary

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository cduce.

commit c1570f0abdb4016fc45cf9d0c6fde8554120c598
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Dec 23 10:41:34 2015 +0100

    Set inlining level from debian/rules and decrease it only where necessary
---
 debian/changelog                                   | 10 ++++++++++
 .../0002-Use-less-agrressive-inlining.patch        | 22 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       | 12 +++++++++++-
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c36f80f..4dd22e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cduce (0.6.0-5) UNRELEASED; urgency=medium
+
+  * Set inlining level from debian/rules and decrease it only where
+    necessary:
+    - armel and powerpc: 1000
+    - armhf: 100
+    - elsewhere: 10000
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 23 Dec 2015 10:39:28 +0100
+
 cduce (0.6.0-4) unstable; urgency=medium
 
   * Use less aggressive inlining to make cduce build on armel, armhf
diff --git a/debian/patches/0002-Use-less-agrressive-inlining.patch b/debian/patches/0002-Use-less-agrressive-inlining.patch
deleted file mode 100644
index f75f567..0000000
--- a/debian/patches/0002-Use-less-agrressive-inlining.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Tue, 22 Dec 2015 21:56:14 +0100
-Subject: Use less agrressive inlining
-
----
- Makefile.distrib | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.distrib b/Makefile.distrib
-index 3d92d59..1957a1d 100644
---- a/Makefile.distrib
-+++ b/Makefile.distrib
-@@ -48,7 +48,7 @@ ifeq ($(PROFILE), true)
-     DEPEND_OCAMLDEP =
-   endif
- else
--  CAMLOPT_P = ocamlopt -inline 10000
-+  CAMLOPT_P = ocamlopt -inline 1000
- endif
- 
- OPT = -warn-error FPSXY
--- 
diff --git a/debian/patches/series b/debian/patches/series
index e066dd5..a06cc00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Port-to-OCaml-4.02.3.patch
-0002-Use-less-agrressive-inlining.patch
diff --git a/debian/rules b/debian/rules
index 1bf2740..bb9dc86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,16 @@ else
   MAKE_OPTS := "NATIVE=false"
 endif
 
+ifeq ($(DEB_BUILD_ARCH), armhf)
+  CAMLOPT_P := "ocamlopt -inline 100"
+else ifeq ($(DEB_BUILD_ARCH), armel)
+  CAMLOPT_P := "ocamlopt -inline 1000"
+else ifeq ($(DEB_BUILD_ARCH), powerpc)
+  CAMLOPT_P := "ocamlopt -inline 1000"
+else
+  CAMLOPT_P := "ocamlopt -inline 10000"
+endif
+
 LIBDIR=$(CURDIR)/debian/cduce/$(OCAML_STDLIB_DIR)
 DOCDIR=$(CURDIR)/debian/cduce/usr/share/doc/cduce/html
 BINDIR=$(CURDIR)/debian/cduce/usr/bin
@@ -31,7 +41,7 @@ override_dh_auto_configure:
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE) $(MAKE_OPTS) all doc
+	$(MAKE) CAMLOPT_P=$(CAMLOPT_P) $(MAKE_OPTS) all doc
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cduce.git