[Pkg-mono-svn-commits] rev 3774 - in mono/trunk/debian: . patches

[Jo Shields]

Author: directhex-guest
Date: 2008-11-19 23:14:54 +0000 (Wed, 19 Nov 2008)
New Revision: 3774

Added:
   mono/trunk/debian/patches/armel-glibc-2.8.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
Log:
Fix armel FTBFS on glibc 2.8


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2008-11-16 22:37:26 UTC (rev 3773)
+++ mono/trunk/debian/changelog	2008-11-19 23:14:54 UTC (rev 3774)
@@ -1,5 +1,11 @@
 mono (2.0.1-1~pre2) experimental; urgency=low
 
+  [ Jo Shields ]
+  * debian/patches/armel-glibc-2.8.dpatch:
+    + Fix build failure on armel architecture on libc6 2.8 (Thanks
+      to Michael Casadevall <sonicmctails at gmail.com> for the patch)
+
+  [ Mirco Bauer ]
   * New upstream (bugfix) release.
   * debian/mono-1.0-devel.manpages:
     + Removed mcs1 as it's already shipped in mono-mcs.

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2008-11-16 22:37:26 UTC (rev 3773)
+++ mono/trunk/debian/patches/00list	2008-11-19 23:14:54 UTC (rev 3774)
@@ -6,5 +6,6 @@
 fix-mono-nunit.pc.in
 fix_BigInteger_overflow_CVE-2007-5197
 fix_implicit_pointer_conversions
+armel-glibc-2.8
 build_genxs_2.0
 99_autoreconf

Added: mono/trunk/debian/patches/armel-glibc-2.8.dpatch
===================================================================
--- mono/trunk/debian/patches/armel-glibc-2.8.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/armel-glibc-2.8.dpatch	2008-11-19 23:14:54 UTC (rev 3774)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## armel-glibc-2.8.dpatch by Michael Casadevall  <sonicmctails at gmail.com>
+## tweaked for 2.0.1 by Jo Shields <directhex at apebox.org>
+##
+## DP: Moved the location files are included to prevent a FTBFS
+## DP: since in 2.8, you can't include headers within a function
+## DP: and expect it to work
+ at DPATCH@
+diff -urNad mono-2.0.1~/mono/arch/arm/tramp.c mono-2.0.1/mono/arch/arm/tramp.c
+--- mono-2.0.1~/mono/arch/arm/tramp.c	2008-11-19 23:05:19.000000000 +0000
++++ mono-2.0.1/mono/arch/arm/tramp.c	2008-11-19 23:07:02.000000000 +0000
+@@ -10,6 +10,9 @@
+ 
+ #if defined(_WIN32_WCE) || defined (UNDER_CE)
+ #	include <windows.h>
++#else
++#include <unistd.h>
++#include <sys/mman.h>
+ #endif
+ 
+ #if !defined(PLATFORM_MACOSX)
+@@ -76,8 +79,6 @@
+ 	code_buff = malloc(code_size);
+ 	VirtualProtect(code_buff, code_size, PAGE_EXECUTE_READWRITE, &old_prot);
+ #else
+-#include <unistd.h>
+-#include <sys/mman.h>
+ 	int page_size = sysconf(_SC_PAGESIZE);
+ 	int new_code_size;
+