[Pkg-mono-svn-commits] rev 1628 - in mono/branches/1.1/debian: . patches

Mirco Bauer meebey-guest@costa.debian.org
Sat, 16 Apr 2005 15:23:10 +0000


Author: meebey-guest
Date: 2005-04-16 15:23:10 +0000 (Sat, 16 Apr 2005)
New Revision: 1628

Added:
   mono/branches/1.1/debian/patches/07_no_libc_fun.dpatch
Modified:
   mono/branches/1.1/debian/changelog
   mono/branches/1.1/debian/patches/00list
Log:
- libc fix.



Modified: mono/branches/1.1/debian/changelog
===================================================================
--- mono/branches/1.1/debian/changelog	2005-04-16 15:07:12 UTC (rev 1627)
+++ mono/branches/1.1/debian/changelog	2005-04-16 15:23:10 UTC (rev 1628)
@@ -1,4 +1,4 @@
-mono (1.1.6-0pre4) experimental; urgency=low
+mono (1.1.6-0pre5) experimental; urgency=low
 
   * New upstream release
     + New version (Closes: #296353, #301268)
@@ -27,6 +27,8 @@
     + Removed icu28-dev from buil-dependencies (ICU is not recommended by
       upstream anymore, and does break things).
     + Added pkg-config to "Recommends" of mono-mcs. (Closes: #294606)
+    + created 07_no_libc_fun.dpatch
+      (Mono 1.1.x tries to use internal libc symbols, which is not required)
      
  -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sat, 2 Apr 2005 12:48:09 +0200
 

Modified: mono/branches/1.1/debian/patches/00list
===================================================================
--- mono/branches/1.1/debian/patches/00list	2005-04-16 15:07:12 UTC (rev 1627)
+++ mono/branches/1.1/debian/patches/00list	2005-04-16 15:23:10 UTC (rev 1628)
@@ -0,0 +1 @@
+07_no_libc_fun

Added: mono/branches/1.1/debian/patches/07_no_libc_fun.dpatch
===================================================================
--- mono/branches/1.1/debian/patches/07_no_libc_fun.dpatch	2005-04-16 15:07:12 UTC (rev 1627)
+++ mono/branches/1.1/debian/patches/07_no_libc_fun.dpatch	2005-04-16 15:23:10 UTC (rev 1628)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_no_libc_fun.dpatch by Mirco Bauer <meebey@meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad mono-1.1.6/libgc/os_dep.c /tmp/dpep.XXSckM/mono-1.1.6/libgc/os_dep.c
+--- mono-1.1.6/libgc/os_dep.c	2005-03-30 23:23:15.000000000 +0200
++++ /tmp/dpep.XXSckM/mono-1.1.6/libgc/os_dep.c	2005-04-16 17:19:07.286471504 +0200
+@@ -939,7 +939,7 @@
+     /* since the correct value of __libc_stack_end never	*/
+     /* becomes visible to us.  The second test works around 	*/
+     /* this.							*/  
+-      if (0 != &__libc_stack_end && 0 != __libc_stack_end ) {
++      if (0) {
+ #       ifdef IA64
+ 	  /* Some versions of glibc set the address 16 bytes too	*/
+ 	  /* low while the initialization code is running.		*/


Property changes on: mono/branches/1.1/debian/patches/07_no_libc_fun.dpatch
___________________________________________________________________
Name: svn:executable
   + *