[Pkg-ocaml-maint-commits] [lablgtk-extras] 01/01: Fix FTBFS on bytecode architectures.

Mehdi Dogguy mehdi at moszumanska.debian.org
Tue Dec 3 22:56:58 UTC 2013


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

mehdi pushed a commit to branch master
in repository lablgtk-extras.

commit d4a4cb775b7bae53a640ea63bc988cff0b15bdec
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Dec 3 23:10:06 2013 +0100

    Fix FTBFS on bytecode architectures.
---
 debian/changelog                                   |  8 ++++
 .../0001-Fix-FTBFS-on-bytecode-architectures.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bdcd999..7445788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lablgtk-extras (1.4-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Fix FTBFS on bytecode architectures.
+    + 0001-Fix-FTBFS-on-bytecode-architectures.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 03 Dec 2013 23:09:06 +0100
+
 lablgtk-extras (1.4-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0001-Fix-FTBFS-on-bytecode-architectures.patch b/debian/patches/0001-Fix-FTBFS-on-bytecode-architectures.patch
new file mode 100644
index 0000000..d583b37
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-on-bytecode-architectures.patch
@@ -0,0 +1,45 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 3 Dec 2013 23:07:03 +0100
+Subject: Fix FTBFS on bytecode architectures
+
+---
+ src/Makefile |   13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 8c57bc0..bb52bc0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,7 +52,10 @@ CWLIB_CMOFILES=configwin_keys.cmo \
+ CWLIB_CMIFILES=$(CWLIB_CMOFILES:.cmo=.cmi)
+ CWLIB_CMXFILES=$(CWLIB_CMOFILES:.cmo=.cmx)
+ 
+-all: byte opt
++all:: byte
++ifneq ($(wildcard /usr/bin/ocamlopt),)
++all:: opt
++endif
+ opt: $(GELIB) $(CWLIB)
+ byte:  $(GELIB_BYTE) $(CWLIB_BYTE)
+ 
+@@ -96,11 +99,19 @@ camlget:
+ dummy:
+ 
+ install:
++ifneq ($(wildcard /usr/bin/ocamlopt),)
+ 	@$(OCAMLFIND) install $(PACKAGE_NAME) META \
+ 	  $(GELIB) $(GELIB_BYTE) $(GELIB:.cmxa=.a) $(GELIB_CMIFILES) \
+ 	  $(GELIB_CMOFILES) $(GELIB_CMXFILES) \
+ 	  $(GELIB_CMXFILES:.cmx=.o) $(GELIB_CMIFILES:.cmi=.mli) \
+ 	  $(CWLIB) $(CWLIB_BYTE) $(CWLIB:.cmxa=.a) $(CWLIB:.cmxa=.cmi) $(CWLIB:.cmxa=.mli)
++else
++	@$(OCAMLFIND) install $(PACKAGE_NAME) META \
++	  $(GELIB_BYTE) $(GELIB_CMIFILES) $(GELIB_CMOFILES) \
++	  $(GELIB_CMIFILES:.cmi=.mli) \
++	  $(CWLIB_BYTE) $(CWLIB_CMIFILES) $(CWLIB_CMOFILES) \
++	  $(CWLIB_BYTE:.cma=.mli)
++endif
+ 
+ uninstall:
+ 	@$(OCAMLFIND) remove $(PACKAGE_NAME)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a144978
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-FTBFS-on-bytecode-architectures.patch

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



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