[Pkg-ocaml-maint-commits] [ppx-deriving] 04/05: Fix FTBFS on bytecode architectures

Stéphane Glondu glondu at moszumanska.debian.org
Thu Aug 4 08:17:57 UTC 2016


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

glondu pushed a commit to branch master
in repository ppx-deriving.

commit 71e2539e34e493b3b5b5a3a0e191445717709746
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 4 10:09:09 2016 +0200

    Fix FTBFS on bytecode architectures
---
 debian/patches/0001-Fix-install-target.patch | 4 ++--
 debian/rules                                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0001-Fix-install-target.patch b/debian/patches/0001-Fix-install-target.patch
index c0a006a..0e02cb6 100644
--- a/debian/patches/0001-Fix-install-target.patch
+++ b/debian/patches/0001-Fix-install-target.patch
@@ -7,7 +7,7 @@ Subject: Fix install target
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index aeb1341..2798eda 100644
+index aeb1341..12c5d82 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -57,6 +57,6 @@ install:
@@ -15,6 +15,6 @@ index aeb1341..2798eda 100644
  		sed -e 's:"?*::g'  | \
  		xargs ocamlfind install ppx_deriving
 -	mv `ocamlfind query ppx_deriving -suffix /ppx_deriving_main.native` `ocamlfind query ppx_deriving -suffix /ppx_deriving$(EXE)`
-+	mv $(OCAMLFIND_DESTDIR)/ppx_deriving/ppx_deriving_main.native $(OCAMLFIND_DESTDIR)/ppx_deriving/ppx_deriving$(EXE)
++	mv $(OCAMLFIND_DESTDIR)/ppx_deriving/ppx_deriving_main.$(OCAMLBUILD_BEST) $(OCAMLFIND_DESTDIR)/ppx_deriving/ppx_deriving$(EXE)
  
  .PHONY: gh-pages release
diff --git a/debian/rules b/debian/rules
index 4f5c420..e764d6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ DESTDIR=$(CURDIR)/debian/tmp
 include /usr/share/ocaml/ocamlvars.mk
 
 export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLBUILD_BEST
 
 BUILD_ARGS :=
 

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



More information about the Pkg-ocaml-maint-commits mailing list