[Pkg-ocaml-maint-commits] [dose3] 01/01: pic options on native architectures only

[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 e3d33208fa9da41e92599daedd64d0f33011f634
Author: Ralf Treinen <treinen at irif.fr>
Date:   Thu Nov 3 13:24:57 2016 +0100

    pic options on native architectures only
---
 debian/changelog                      |  6 ++++++
 debian/patches/ocaml-4.02.3+gcc-6.2.0 | 36 ++++++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5862d5..875c245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dose3 (5.0.1-7) unstable; urgency=medium
+
+  * use pic options only on native architectures.
+
+ -- Ralf Treinen <treinen at debian.org>  Thu, 03 Nov 2016 13:23:49 +0100
+
 dose3 (5.0.1-6) unstable; urgency=medium
 
   * New patch ocaml-4.02.3+gcc-6.2.0 as provided by Josch: fix FTBFS. This
diff --git a/debian/patches/ocaml-4.02.3+gcc-6.2.0 b/debian/patches/ocaml-4.02.3+gcc-6.2.0
index 964114b..51fa592 100644
--- a/debian/patches/ocaml-4.02.3+gcc-6.2.0
+++ b/debian/patches/ocaml-4.02.3+gcc-6.2.0
@@ -1,25 +1,47 @@
 Author: Johannes Schauer <josch at debian.org>
 Description: fix FTBFS with ocaml 4.02.3-7 and gcc 6.2.0-7
 
---- a/Makefile
-+++ b/Makefile
-@@ -8,8 +8,8 @@ DIST_DIR = $(NAME)-$(VERSION)
+Index: dose3/Makefile
+===================================================================
+--- dose3.orig/Makefile	2016-11-03 13:18:32.215962368 +0100
++++ dose3/Makefile	2016-11-03 13:22:07.251879961 +0100
+@@ -8,8 +8,8 @@
  DIST_TARBALL = $(DIST_DIR).tar.gz
  
  #VERBOSE := -classic-display
 -OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY
 -APPFLAGS := $(VERBOSE) -j 10
-+OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY -lflags -runtime-variant,_pic
-+APPFLAGS := $(VERBOSE) -j 10 -lflags -runtime-variant,_pic
++OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY $(PICOPTS)
++APPFLAGS := $(VERBOSE) -j 10 $(PICOPTS)
  #OBFLAGS := $(OBFLAGS) -tag debug
  #OBFLAGS := $(OBFLAGS) -tag profile
  #OBFLAGS := $(OBFLAGS) -classic-display
-@@ -274,7 +274,7 @@ credits:
+@@ -274,7 +274,7 @@
  	@git log --pretty=format:'%aN        %aE' | LC_ALL=C sort -u | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
  
  doc: all
 -	$(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT)
-+	$(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT) -lflags -runtime-variant,_pic
++	$(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT) $(PICOPTS)
  	scripts/doc.sh $(OCAMLEXT)
  	dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
  	(cd doc && $(MAKE) all)
+Index: dose3/Makefile.config.in
+===================================================================
+--- dose3.orig/Makefile.config.in	2016-11-03 13:17:13.419992557 +0100
++++ dose3/Makefile.config.in	2016-11-03 13:20:57.299906755 +0100
+@@ -64,6 +64,7 @@
+ 
+ ifeq ("@OCAMLEXT@","native")
+   OCAMLBUILD=@OCAMLBUILD@
++  PICOPTS=-lflags -runtime-variant,_pic
+   ifeq ("@OCAML_SYSTEM@","mingw")
+     INSTALLOPTS=-s --strip-program=i686-w64-mingw32-strip
+   else
+@@ -79,6 +80,7 @@
+   endif
+ else
+   OCAMLBUILD=@OCAMLBUILD@ -byte-plugin
++  PICOPTS=
+   INSTALLOPTS=
+ endif
+ 

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