[Pkg-ocaml-maint-commits] r5315 - in /trunk/packages/ocaml-magic/trunk/debian: changelog patches/fix_bytecode_build.patch

[toots at users.alioth.debian.org]

Author: toots
Date: Fri Mar  7 15:08:03 2008
New Revision: 5315

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5315
Log:
Fixed previous patch....

Modified:
    trunk/packages/ocaml-magic/trunk/debian/changelog
    trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch

Modified: trunk/packages/ocaml-magic/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/changelog?rev=5315&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-magic/trunk/debian/changelog Fri Mar  7 15:08:03 2008
@@ -1,3 +1,9 @@
+ocaml-magic (0.6-3) unstable; urgency=low
+
+  * Fixed previous patch when compiling native code module binary. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Fri, 07 Mar 2008 16:05:17 +0100
+
 ocaml-magic (0.6-2) unstable; urgency=low
 
   * Fixed compilation on archs with no native compiler. 

Modified: trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch?rev=5315&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch (original)
+++ trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch Fri Mar  7 15:08:03 2008
@@ -1,5 +1,18 @@
---- ocaml-magic-0.6.orig/Makefile	2008-02-28 15:28:13.000000000 +0100
-+++ ocaml-magic-0.6/Makefile	2008-02-28 15:28:24.000000000 +0100
+Index: ocaml-magic-0.6/Makefile
+===================================================================
+--- ocaml-magic-0.6.orig/Makefile	2008-03-07 16:03:22.000000000 +0100
++++ ocaml-magic-0.6/Makefile	2008-03-07 16:03:41.000000000 +0100
+@@ -11,8 +11,8 @@
+ 
+ include Makefile.config
+ 
+-OCAMLFLAGS 	= -dtypes
+-OCAMLOPTFLAGS	= -inline 2
++OCAMLFLAGS 	= 
++OCAMLOPTFLAGS	= 
+ OCAMLDOCFLAGS	=
+ 
+ SOURCES = magic.ml
 @@ -37,9 +37,10 @@
  doc: html
  ex: $(DEMOS:.ml=.exe) $(DEMOS:.ml=.com)
@@ -14,7 +27,7 @@
  
  $(XARCHIVE): $(ARCHIVE)
  
-@@ -105,7 +106,7 @@
+@@ -105,17 +106,17 @@
  # Caml general dependencies
  .SUFFIXES: .ml .mli .cmo .cmi .cmx
  %.o: %.c
@@ -23,10 +36,17 @@
  %.cmi: %.mli
  	$(OCAMLC) $(OCAMLFLAGS) -c $<
  %.cmo: %.ml
-@@ -134,4 +135,4 @@
- 	find . -not -name *.sh -type f -perm -u=x -exec rm -f {} \;
+ 	$(OCAMLC) $(OCAMLFLAGS) -c $<
+ %.cma: # Dependencies to be set elsewhere
+ 	$(OCAMLC) -a -o $@ $(OCAMLFLAGS) $(filter %.cmo, $^)
+-.ml.cmx:
+-	$(OCAMLOPT) $(OCAMLOPTFLAGS) -c $<
+-%.cmxa: # Dependencies to be set elsewhere
+-	$(OCAMLOPT) -a -o $@ $(OCAMLOPTFLAGS) $(filter %.cmx, $^)
++%.ml.cmx: %.ml
++	$(OCAMLOPT) -o $@ $(OCAMLOPTFLAGS) -c $<
++%.cmxa: %.ml.cmx
++	$(OCAMLOPT) -a -cclib -lmagic_stub -cclib -lmagic -o $@ $(OCAMLOPTFLAGS) $(filter %.cmx, $^)
  
- dist-clean: clean
--	rm .depend
-\ Pas de fin de ligne à la fin du fichier.
-+	rm .depend
+ .PHONY: depend dep
+ dep: .depend