[Pkg-ocaml-maint-commits] r3005 - in /trunk/packages/ocaml-sha1/trunk/debian: changelog rules

[ecc-guest at users.alioth.debian.org]

Author: ecc-guest
Date: Sun Aug  6 18:28:20 2006
New Revision: 3005

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3005
Log:
fix FTBFS on architectures without ocamlopt

Modified:
    trunk/packages/ocaml-sha1/trunk/debian/changelog
    trunk/packages/ocaml-sha1/trunk/debian/rules

Modified: trunk/packages/ocaml-sha1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/changelog?rev=3005&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/changelog Sun Aug  6 18:28:20 2006
@@ -1,3 +1,11 @@
+ocaml-sha1 (0.9-2) unstable; urgency=low
+
+  * Work around incorrect OCamlMakefile libinstall on architectures
+    without ocamlopt (ocaml-tools bug #381638)
+  * Closes: #381620
+
+ -- Eric Cooper <ecc at cmu.edu>  Sun,  6 Aug 2006 14:26:19 -0400
+
 ocaml-sha1 (0.9-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/ocaml-sha1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/rules?rev=3005&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/rules (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/rules Sun Aug  6 18:28:20 2006
@@ -11,12 +11,20 @@
 
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -f debian/Makefile
 
-NATIVECODE = $(shell [ -x /usr/bin/ocamlopt ] && echo native-code-library)
-DEB_MAKE_BUILD_TARGET = byte-code-library $(NATIVECODE)
+NATIVECODE = $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
+
+DEB_MAKE_BUILD_TARGET = byte-code-library \
+			$(if $(NATIVECODE),native-code-library)
 
 OCAMLLIBDIR = $(shell ocamlc -where)
 DESTDIR=$(CURDIR)/debian/lib$(PKG)-ocaml-dev/$(OCAMLLIBDIR)
 STUBDIR=$(CURDIR)/debian/lib$(PKG)-ocaml/$(OCAMLLIBDIR)/stublibs
+
+ifneq ($(NATIVECODE),yes)
+    # override incorrect value set by OCamlMakefile
+    export LIBINSTALL_FILES = $(PKG).mli $(PKG).cmi $(PKG).cma \
+			      lib$(PKG)_stubs.a dll$(PKG)_stubs.so
+endif
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 
@@ -33,4 +41,4 @@
 
 common-install-impl::
 	mkdir -p $(STUBDIR)
-	mv $(DESTDIR)/$(PKG)/*.so $(STUBDIR)
+	mv $(DESTDIR)/$(PKG)/dll$(PKG)_stubs.so $(STUBDIR)