[Pkg-cli-libs-commits] [SCM] dbus-sharp branch, master, updated. debian/0.7.0-4-5-gb4b0e67

Iain Lane laney at debian.org
Tue Jan 24 22:22:43 UTC 2012


The following commit has been merged in the master branch:
commit ad1254b553d061be3400d75ba710ce33c54f838d
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jan 23 15:58:18 2012 +0000

    Reverse the way the dllmap for libsocket is handled, by using libc
    (mapped by /etc/mono/config) the default, and remapping this to
    libsocket.so.1 on Solaris. This neatly avoids the dllmap-using-dllmap
    problem introduced in c66aebc7ff1c257140662380c9a51cddd45b825f.
    (cherry picked from commit 1561585d601058392d5864e3add2bac3c67e14a7)
    
    Conflicts:
    
    	src/dbus-sharp.dll.config

diff --git a/src/Unix.cs b/src/Unix.cs
index 5cd6879..e641a58 100644
--- a/src/Unix.cs
+++ b/src/Unix.cs
@@ -197,7 +197,7 @@ namespace DBus.Unix
 
 		// Solaris provides socket functionality in libsocket rather than libc.
 		// We use a dllmap in the .config to deal with this.
-		internal const string LIBSOCKET = "libsocket";
+		internal const string LIBSOCKET = "libc";
 
 		public const short AF_UNIX = 1;
 		// FIXME: SOCK_STREAM is 2 on Solaris
diff --git a/src/dbus-sharp.dll.config b/src/dbus-sharp.dll.config
index 39995ef..f5c1b86 100644
--- a/src/dbus-sharp.dll.config
+++ b/src/dbus-sharp.dll.config
@@ -1,3 +1,14 @@
 <configuration>
   <dllmap dll="libsocket" os="!solaris" target="libc.so.6"/>
+  <dllmap dll="libc">
+    <dllentry os="solaris" dll="libsocket.so.1" name="socket" target="socket"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="connect" target="connect"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="bind" target="bind"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="listen" target="listen"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="accept" target="accept"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="getsockopt" target="getsockopt"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="setsockopt" target="setsockopt"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="recvmsg" target="recvmsg"/>
+    <dllentry os="solaris" dll="libsocket.so.1" name="sendmsg" target="sendmsg"/>
+  </dllmap>
 </configuration>

-- 
dbus-sharp



More information about the Pkg-cli-libs-commits mailing list