[Pkg-ocaml-maint-commits] r1984 - in trunk/packages/ocaml/trunk/debian: . patches

[Julien Cristau]

Author: jcristau-guest
Date: 2005-11-10 15:53:17 +0000 (Thu, 10 Nov 2005)
New Revision: 1984

Added:
   trunk/packages/ocaml/trunk/debian/patches/kbsd-gnu.dpatch
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/control
   trunk/packages/ocaml/trunk/debian/patches/00list
Log:
New patch kbsd-gnu.dpatch to add support for GNU/Hurd and GNU/k*BSD on
i386 (thanks to Robert Millan and Aur?\195?\169lien Jarno; Closes: #216886).


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-11-10 15:44:04 UTC (rev 1983)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-11-10 15:53:17 UTC (rev 1984)
@@ -2,8 +2,10 @@
 
   * Modified debian/rules to exit with an error when native compiler build
     fails, instead of building a broken package.
+  * New patch kbsd-gnu.dpatch to add support for GNU/Hurd and GNU/k*BSD on
+    i386 (thanks to Robert Millan and Aurélien Jarno; Closes: #216886).
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 10 Nov 2005 16:39:42 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 10 Nov 2005 16:52:58 +0100
 
 ocaml (3.09.0-1) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/control
===================================================================
--- trunk/packages/ocaml/trunk/debian/control	2005-11-10 15:44:04 UTC (rev 1983)
+++ trunk/packages/ocaml/trunk/debian/control	2005-11-10 15:53:17 UTC (rev 1984)
@@ -95,7 +95,7 @@
  you do not require any graphical capilities for your runtime.
 
 Package: ocaml-native-compilers
-Architecture: alpha amd64 arm hppa i386 ia64 powerpc sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc
 Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}
 Provides: ocaml-best-compilers
 Description: Native code compilers of the ocaml suite (the .opt ones)

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list	2005-11-10 15:44:04 UTC (rev 1983)
+++ trunk/packages/ocaml/trunk/debian/patches/00list	2005-11-10 15:53:17 UTC (rev 1984)
@@ -1,3 +1,4 @@
 versioned_libdir
 objinfo
 man-ocamlmklib
+kbsd-gnu

Added: trunk/packages/ocaml/trunk/debian/patches/kbsd-gnu.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/kbsd-gnu.dpatch	2005-11-10 15:44:04 UTC (rev 1983)
+++ trunk/packages/ocaml/trunk/debian/patches/kbsd-gnu.dpatch	2005-11-10 15:53:17 UTC (rev 1984)
@@ -0,0 +1,32 @@
+#! /bin/sh -e 
+## kbsd-gnu.dpatch by Aurelien Jarno <aurel32 at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Port to GNU/k*BSD
+
+if [ $# -ne 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;	
+    *)
+	echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+	exit 1;;
+esac
+
+exit 0
+ at DPATCH@
+--- ocaml-3.09.0/configure	2005-11-10 00:50:29.000000000 +0100
++++ ocaml-3.09.0/configure	2005-11-10 00:53:37.000000000 +0100
+@@ -480,7 +480,7 @@
+ 
+ if test $withsharedlibs = "yes"; then
+   case "$host" in
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*)
++    *-*-linux-gnu|*-*-linux|*-*-k*bsd*-gnu|*-*-gnu*|*-*-freebsd[3-9]*)
+       sharedcccompopts="-fPIC"
+       mksharedlib="$bytecc -shared -o"
+       bytecclinkopts="$bytecclinkopts -Wl,-E"
+