[Pkg-ocaml-maint-commits] [dose3] 01/01: fix FTBFS with ocaml 4.02.3, and gcc 6.2.0-7

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository dose3.

commit 3edc357f3bf59fa56c0babe4dbafd0b825abbe8c
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Oct 26 20:25:21 2016 +0200

    fix FTBFS with ocaml 4.02.3, and gcc 6.2.0-7
---
 debian/changelog                      |  7 +++++++
 debian/patches/ocaml-4.02.3+gcc-6.2.0 | 16 ++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3969a89..86ae526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dose3 (5.0.1-5) UNRELEASED; urgency=medium
+
+  * New patch ocaml-4.02.3+gcc-6.2.0 as provided by Josch: fix FTBFS. This
+    patch should probably be removed when we transition to ocaml 4.03.
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 26 Oct 2016 20:23:47 +0200
+
 dose3 (5.0.1-4) unstable; urgency=medium
 
   * Revert the change introduced by 5.0.1-3, since it makes the
diff --git a/debian/patches/ocaml-4.02.3+gcc-6.2.0 b/debian/patches/ocaml-4.02.3+gcc-6.2.0
new file mode 100644
index 0000000..2080087
--- /dev/null
+++ b/debian/patches/ocaml-4.02.3+gcc-6.2.0
@@ -0,0 +1,16 @@
+Author: Johannes Schauer <josch at debian.org>
+Description: fix FTBFS with ocaml 4.02.3-7 and gcc 6.2.0-7
+
+Index: dose3/Makefile
+===================================================================
+--- dose3.orig/Makefile	2016-10-26 08:17:24.227969682 +0200
++++ dose3/Makefile	2016-10-26 20:20:57.527325311 +0200
+@@ -8,7 +8,7 @@
+ DIST_TARBALL = $(DIST_DIR).tar.gz
+ 
+ #VERBOSE := -classic-display
+-OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY
++OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY -lflags -runtime-variant,_pic
+ APPFLAGS := $(VERBOSE) -j 10
+ #OBFLAGS := $(OBFLAGS) -tag debug
+ #OBFLAGS := $(OBFLAGS) -tag profile
diff --git a/debian/patches/series b/debian/patches/series
index ecef88b..292df09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ binaries-prefix-edos
 0007-applications-deb-buildcheck.ml-fix-regression-that-l.patch
 0008-Catch-expection-in-diagnostic.ml.patch
 input-xz-files
+ocaml-4.02.3+gcc-6.2.0

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