[Pkg-ocaml-maint-commits] r3473 - in
/trunk/packages/ocaml-sqlite3/trunk/debian:
libsqlite3-ocaml-dev.install.in patches/00list patches/gc.dpatch
patches/native-linking.dpatch
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Thu Jan 4 00:03:38 CET 2007
Author: smimram
Date: Thu Jan 4 00:03:38 2007
New Revision: 3473
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3473
Log:
Backport patches from 0.2.1.
Added:
trunk/packages/ocaml-sqlite3/trunk/debian/patches/gc.dpatch (with props)
trunk/packages/ocaml-sqlite3/trunk/debian/patches/native-linking.dpatch (with props)
Modified:
trunk/packages/ocaml-sqlite3/trunk/debian/libsqlite3-ocaml-dev.install.in
trunk/packages/ocaml-sqlite3/trunk/debian/patches/00list
Modified: trunk/packages/ocaml-sqlite3/trunk/debian/libsqlite3-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite3/trunk/debian/libsqlite3-ocaml-dev.install.in?rev=3473&op=diff
==============================================================================
--- trunk/packages/ocaml-sqlite3/trunk/debian/libsqlite3-ocaml-dev.install.in (original)
+++ trunk/packages/ocaml-sqlite3/trunk/debian/libsqlite3-ocaml-dev.install.in Thu Jan 4 00:03:38 2007
@@ -2,4 +2,3 @@
usr/lib/ocaml/@OCamlABI@/sqlite3/*.a
usr/lib/ocaml/@OCamlABI@/sqlite3/*.cm*
usr/lib/ocaml/@OCamlABI@/sqlite3/*.ml*
-usr/bin/sqlite3top
Modified: trunk/packages/ocaml-sqlite3/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite3/trunk/debian/patches/00list?rev=3473&op=diff
==============================================================================
--- trunk/packages/ocaml-sqlite3/trunk/debian/patches/00list (original)
+++ trunk/packages/ocaml-sqlite3/trunk/debian/patches/00list Thu Jan 4 00:03:38 2007
@@ -1,1 +1,3 @@
+native-linking
+gc
install-no-mktop
Added: trunk/packages/ocaml-sqlite3/trunk/debian/patches/gc.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite3/trunk/debian/patches/gc.dpatch?rev=3473&op=file
==============================================================================
--- trunk/packages/ocaml-sqlite3/trunk/debian/patches/gc.dpatch (added)
+++ trunk/packages/ocaml-sqlite3/trunk/debian/patches/gc.dpatch Thu Jan 4 00:03:38 2007
@@ -1,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gc.dpatch by Toby Allsopp
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix an issue with OCaml's GC.
+
+ at DPATCH@
+diff -urNad ocaml-sqlite3-0.2.0~/sqlite3.ml ocaml-sqlite3-0.2.0/sqlite3.ml
+--- ocaml-sqlite3-0.2.0~/sqlite3.ml 2005-10-22 02:23:38.000000000 +0200
++++ ocaml-sqlite3-0.2.0/sqlite3.ml 2007-01-04 00:00:14.000000000 +0100
+@@ -157,7 +157,7 @@
+ | RC_notadb -> "notadb"
+ | RC_row -> "row"
+ | RC_done -> "done"
+- | _ -> "unknown"
++ (* | _ -> "unknown" *)
+
+ let row_data stmt = Array.init (data_count stmt) (column stmt)
+
+diff -urNad ocaml-sqlite3-0.2.0~/sqlite3_stubs.c ocaml-sqlite3-0.2.0/sqlite3_stubs.c
+--- ocaml-sqlite3-0.2.0~/sqlite3_stubs.c 2005-10-20 00:58:04.000000000 +0200
++++ ocaml-sqlite3-0.2.0/sqlite3_stubs.c 2007-01-04 00:00:14.000000000 +0100
+@@ -517,8 +517,8 @@
+
+ const char *str = sqlite3_bind_parameter_name(stmt,i);
+ if( str ) {
+- result = alloc_small(1,0);
+ tmp = copy_string(str); /* tmp is needed to make GC happy! */
++ result = alloc_small(1,0);
+ Field(result,0) = tmp;
+ CAMLreturn(result);
+ } else {
+@@ -745,13 +745,13 @@
+ switch(sqlite3_column_type(stmt,i)) {
+ /* WARNING : we need the tmp variable to make GC happy! */
+ case SQLITE_INTEGER:
+- result = alloc_small(1,0);
+ tmp = copy_int64(sqlite3_column_int64(stmt,i));
++ result = alloc_small(1,0);
+ Field(result,0)=tmp;
+ break;
+ case SQLITE_FLOAT:
+- result = alloc_small(1,1);
+ tmp = copy_double(sqlite3_column_double(stmt,i));
++ result = alloc_small(1,1);
+ Field(result,0)=tmp;
+ break;
+ case SQLITE3_TEXT:
Propchange: trunk/packages/ocaml-sqlite3/trunk/debian/patches/gc.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/ocaml-sqlite3/trunk/debian/patches/native-linking.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite3/trunk/debian/patches/native-linking.dpatch?rev=3473&op=file
==============================================================================
--- trunk/packages/ocaml-sqlite3/trunk/debian/patches/native-linking.dpatch (added)
+++ trunk/packages/ocaml-sqlite3/trunk/debian/patches/native-linking.dpatch Thu Jan 4 00:03:38 2007
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## native-linking.dpatch by Andrew Peace
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correctly build cma and cmxa to avoid problems when linking statically.
+
+ at DPATCH@
+diff -urNad ocaml-sqlite3-0.2.0~/Makefile.in ocaml-sqlite3-0.2.0/Makefile.in
+--- ocaml-sqlite3-0.2.0~/Makefile.in 2005-10-17 04:25:28.000000000 +0200
++++ ocaml-sqlite3-0.2.0/Makefile.in 2007-01-04 00:00:01.000000000 +0100
+@@ -5,7 +5,7 @@
+ bindir=@bindir@
+
+ CC=@CC@
+-CFLAGS=@CPPFLAGS@ @CFLAGS@
++CFLAGS=-fPIC @CPPFLAGS@ @CFLAGS@
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+
+@@ -51,10 +51,10 @@
+ ocamlfind ocamlmktop -o sqlite3top sqlite3.cma
+
+ sqlite3.cma: sqlite3.cmo sqlite3_stubs.o
+- ocamlmklib -o sqlite3 sqlite3.cmo sqlite3_stubs.o $(LDFLAGS) $(LIBS) $(MKLIBFLAGS)
++ ocamlmklib -o sqlite3 -oc sqlite3_stubs sqlite3.cmo sqlite3_stubs.o $(LDFLAGS) $(LIBS) $(MKLIBFLAGS)
+
+ sqlite3.cmxa: sqlite3.cmx sqlite3_stubs.o
+- ocamlmklib -o sqlite3 sqlite3.cmx sqlite3_stubs.o $(LDFLAGS) $(LIBS) $(MKLIBFLAGS)
++ ocamlmklib -o sqlite3 -oc sqlite3_stubs sqlite3.cmx sqlite3_stubs.o $(LDFLAGS) $(LIBS) $(MKLIBFLAGS)
+
+ sqlite3.cmo: sqlite3.cmi sqlite3.ml
+
Propchange: trunk/packages/ocaml-sqlite3/trunk/debian/patches/native-linking.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list