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).

diff --git a/debian/changelog b/debian/changelog
index 387f066000e6ca33ef4ec49cf974d11ee3cc32c0..4af30376d5a3144842fd56169ae6dd73b11d4827 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ocaml (3.09.0-2) unstable; urgency=low
 
   * 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@ens-lyon.org>  Thu, 10 Nov 2005 16:39:42 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Thu, 10 Nov 2005 16:52:58 +0100
 
 ocaml (3.09.0-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 1fc6a7a33f4d80b38be62efc16208a0eb98047f4..837c559c30320f46691d3466474cac40ea14e22d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -95,7 +95,7 @@ Description: Runtime system for ocaml bytecode executables
  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)

diff --git a/debian/patches/00list b/debian/patches/00list
index 858d13e00b771b0f7df5c91b3c014dfae92d73f6..d1507087129aa092ccba9e10b21894e8c48c27d3 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 versioned_libdir
 objinfo
 man-ocamlmklib
+kbsd-gnu

diff --git a/debian/patches/kbsd-gnu.dpatch b/debian/patches/kbsd-gnu.dpatch
new file mode 100644 (file)
index 0000000..92aa0d1
--- /dev/null
+++ b/debian/patches/kbsd-gnu.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh -e 
+## kbsd-gnu.dpatch by Aurelien Jarno <aurel32@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
+@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"
+