[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-5-11-g8b533c2

Stefano Zacchiroli zack at upsilon.cc
Thu Feb 26 18:25:38 UTC 2009


The following commit has been merged in the master branch:
commit d6bffaf8b96b69d8165309dc13dcfebdf5908ea3
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Feb 26 19:06:54 2009 +0100

    new patch: enable_struct_ucred: make 'struct ucred' visible

diff --git a/debian/changelog b/debian/changelog
index e1e2f6f..13ff719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ocamlnet (2.2.9-6) unstable; urgency=low
   * debian/patches/*
     - disable patches to build against camlp5: build_w_camlp5,
       camlp5_5_alias_pat. Now ocamlnet can be built using camlp4
+    - add patch enable_struct_ucred to make 'struct ucred' from
+      <sys/socket.h> visible (it requires GNU extensions)
 
  -- Stefano Zacchiroli <zack at debian.org>  Thu, 26 Feb 2009 18:34:40 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index ae17d5f..5cc7594 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
+enable_struct_ucred.dpatch
 camlrun_shared.dpatch
 rpath-apache.dpatch
 dont_install_gpl.dpatch
diff --git a/debian/patches/enable_struct_ucred.dpatch b/debian/patches/enable_struct_ucred.dpatch
new file mode 100755
index 0000000..a7a90ef
--- /dev/null
+++ b/debian/patches/enable_struct_ucred.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## make_struct_ucred_visible.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: "struct ucred" is defined only if GNU extensions are enabled,
+## DP: hence enable them (fix FTBFS with gcc)
+
+ at DPATCH@
+diff -urNad ocamlnet~/src/rpc-auth-local/rpclocal.c ocamlnet/src/rpc-auth-local/rpclocal.c
+--- ocamlnet~/src/rpc-auth-local/rpclocal.c	2009-02-26 19:03:10.000000000 +0100
++++ ocamlnet/src/rpc-auth-local/rpclocal.c	2009-02-26 19:04:42.267606017 +0100
+@@ -3,6 +3,8 @@
+  *
+  */
+ 
++#define _GNU_SOURCE 1
++
+ #include "caml/mlvalues.h"
+ #include "caml/alloc.h"
+ #include "caml/memory.h"

-- 
ocamlnet packaging



More information about the Pkg-ocaml-maint-commits mailing list