[Pkg-ocaml-maint-commits] r5118 - in /trunk/packages/ocaml-csv/trunk/debian: changelog patches/01_Makefile_extlib.dpatch

Wed Feb 6 23:53:34 UTC 2008

Author: glondu-guest
Date: Wed Feb  6 23:53:33 2008
New Revision: 5118

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5118
Log:
 * Fix 01_Makefile_extlib.dpatch to handle architectures where
   native code is not available.

Modified:
    trunk/packages/ocaml-csv/trunk/debian/changelog
    trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch

Modified: trunk/packages/ocaml-csv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/changelog?rev=5118&op=diff
==============================================================================

--- trunk/packages/ocaml-csv/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-csv/trunk/debian/changelog Wed Feb  6 23:53:33 2008
@@ -1,3 +1,10 @@
+ocaml-csv (1.1.6-3) UNRELEASED; urgency=low
+
+  * Fix 01_Makefile_extlib.dpatch to handle architectures where
+    native code is not available.
+
+ -- Stephane Glondu <steph at glondu.net>  Thu, 07 Feb 2008 00:48:45 +0100
+
 ocaml-csv (1.1.6-2) unstable; urgency=low
 
   * Fix libcsv-ocaml-dev.install.in (did not work for achitectures

Modified: trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch?rev=5118&op=diff
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch (original)
+++ trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch Wed Feb  6 23:53:33 2008
@@ -5,31 +5,20 @@
 ## DP: Use Extlib, add opt, byte and install targets to Makefile
 
 @DPATCH@
-diff -x '*~' -x '*#*' -urN ocaml-csv-1.1.6-orig/csv.ml ocaml-csv-1.1.6/csv.ml
---- ocaml-csv-1.1.6-orig/csv.ml	2006-12-05 23:23:03.000000000 +0100
-+++ ocaml-csv-1.1.6/csv.ml	2008-01-16 13:10:28.000000000 +0100
-@@ -45,7 +45,7 @@
- (* Uncomment the next line to enable Extlib's List function.  These
-  * avoid stack overflows on really huge CSV files.
-  *)
--(*open ExtList*)
-+open ExtList
- 
- type t = string list list
- 
-diff -x '*~' -x '*#*' -urN ocaml-csv-1.1.6-orig/Makefile ocaml-csv-1.1.6/Makefile
---- ocaml-csv-1.1.6-orig/Makefile	2006-12-05 23:23:03.000000000 +0100
-+++ ocaml-csv-1.1.6/Makefile	2008-01-16 13:46:47.000000000 +0100
-@@ -5,6 +5,8 @@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2006-12-05 23:23:03.000000000 +0100
++++ trunk/Makefile	2008-02-07 00:39:04.000000000 +0100
+@@ -5,6 +5,9 @@
  # To enable support for Extlib, also uncomment 'open ExtList' at the top
  # of file csv.ml.
  
 +PREFIX		:= /usr/local
++NATIVELIBS	:= $(if $(wildcard *.cmxa),csv.cmxa csv.a)
 +OCAMLLIBDIR	:= $(shell ocamlc -where)
  OCAMLCINCS	:=
  #OCAMLCINCS	:= -package extlib
  OCAMLCFLAGS	:= -g
-@@ -21,7 +23,10 @@
+@@ -21,7 +24,10 @@
  
  OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
  
@@ -41,7 +30,7 @@
  
  csv.cma: $(OBJS)
  	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) -a -o $@ $^
-@@ -29,6 +34,9 @@
+@@ -29,6 +35,9 @@
  csv.cmxa: $(XOBJS)
  	ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) -a -o $@ $^
  
@@ -51,7 +40,7 @@
  example: csv.cma example.ml
  	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
  
-@@ -36,9 +44,12 @@
+@@ -36,9 +45,12 @@
  	ocamlfind ocamlc $^ -o $@
  	./test
  
@@ -65,7 +54,7 @@
  # Common rules for building OCaml objects.
  
  .mli.cmi:
-@@ -53,7 +64,8 @@
+@@ -53,7 +65,8 @@
  # Clean.
  
  clean:
@@ -75,13 +64,13 @@
  
  # Dependencies.
  
-@@ -90,11 +102,21 @@
+@@ -90,11 +103,21 @@
  	rm -f .orig-manifest .check-manifest; \
  	exit $$rv
  
 +install:
 +	install -m 0755 -o root -g root -d $(DESTDIR)$(OCAMLLIBDIR)
-+	-ocamlfind install csv -destdir $(DESTDIR)$(OCAMLLIBDIR) META csv.mli csv.cma csv.cmi csv.cmxa csv.a
++	ocamlfind install csv -destdir $(DESTDIR)$(OCAMLLIBDIR) META csv.mli csv.cma csv.cmi $(NATIVELIBS)
 +	install -m 0755 -o root -g root -d $(DESTDIR)$(PREFIX)/bin
 +	if [ -f csvtool.opt ]; then \
 +	  install -m 0755 -o root -g root csvtool.opt $(DESTDIR)$(PREFIX)/bin/csvtool; \
@@ -99,3 +88,15 @@
  
 -.PHONY: depend dist check-manifest doc
 +.PHONY: depend dist check-manifest doc all opt byte install
+diff -urNad trunk~/csv.ml trunk/csv.ml
+--- trunk~/csv.ml	2006-12-05 23:23:03.000000000 +0100
++++ trunk/csv.ml	2008-02-07 00:19:31.000000000 +0100
+@@ -45,7 +45,7 @@
+ (* Uncomment the next line to enable Extlib's List function.  These
+  * avoid stack overflows on really huge CSV files.
+  *)
+-(*open ExtList*)
++open ExtList
+ 
+ type t = string list list
+ 


