[Pkg-mono-svn-commits] rev 3261 - in mono/trunk/debian: . patches
Mirco Bauer
meebey-guest at alioth.debian.org
Mon Aug 6 21:05:39 UTC 2007
Author: meebey-guest
Date: 2007-08-06 21:05:38 +0000 (Mon, 06 Aug 2007)
New Revision: 3261
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/patches/kfreebsd_support.dpatch
mono/trunk/debian/rules
Log:
- flush
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2007-08-06 10:31:46 UTC (rev 3260)
+++ mono/trunk/debian/changelog 2007-08-06 21:05:38 UTC (rev 3261)
@@ -1,5 +1,6 @@
mono (1.2.4-5) unstable; urgency=low
+ * The "there is more than Linux and X86" release
* Mirco 'meebey' Bauer:
+ debian/control:
- Replaced ${Source-Version} with ${source:Version} and ${binary:Version}
@@ -15,6 +16,8 @@
- Fix memory leak for delegates passed to unmanaged land, taken from
upstream SVN. (Closes: #428781)
(Thanks to Chris Howie <cdhowie at nerdshack.com> for investigation)
+ + debian/patches/kfreebsd_support.dpatch:
+ - Updated, added support for kfreebsd-amd64
+ debian/rules:
- Use softfloat on armel.
* Sebastian 'slomo' Dröge:
Modified: mono/trunk/debian/patches/kfreebsd_support.dpatch
===================================================================
--- mono/trunk/debian/patches/kfreebsd_support.dpatch 2007-08-06 10:31:46 UTC (rev 3260)
+++ mono/trunk/debian/patches/kfreebsd_support.dpatch 2007-08-06 21:05:38 UTC (rev 3261)
@@ -5,14 +5,12 @@
## DP: kfreebsd support - mainly backport of gc 6.8
@DPATCH@
-
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/configure.in
-+++ mono-1.1.18/configure.in
-@@ -88,6 +88,16 @@
- libdl=
- libgc_threads=no
+diff -urNad mono-1.2.4~/configure.in mono-1.2.4/configure.in
+--- mono-1.2.4~/configure.in 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/configure.in 2007-07-29 22:20:20.000000000 +0200
+@@ -103,6 +103,16 @@
+ need_link_unlink=yes
+ with_sigaltstack=no
;;
+ *-*-kfreebsd*-gnu)
+ platform_win32=no
@@ -27,9 +25,9 @@
# these flags will work for all versions of -STABLE
#
*-*-*freebsd4*)
-@@ -1663,6 +1673,11 @@
- LIBC="libc.so.12"
- INTL="libintl.so.0"
+@@ -1810,6 +1820,11 @@
+ INTL="libc.so.0.1"
+ X11="libX11.so.6"
;;
+ *-*-kfreebsd*-gnu)
+ LIBC="libc.so.0.1"
@@ -39,10 +37,45 @@
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/libgc/configure.in
-+++ mono-1.1.18/libgc/configure.in
+diff -urNad mono-1.2.4~/libgc/configure mono-1.2.4/libgc/configure
+--- mono-1.2.4~/libgc/configure 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/libgc/configure 2007-07-29 22:20:20.000000000 +0200
+@@ -4632,6 +4632,32 @@
+
+ THREADDLLIBS="-lpthread -lrt"
+ ;;
++ *-*-kfreebsd*-gnu)
++ cat >>confdefs.h <<\_ACEOF
++#define GC_FREEBSD_THREADS 1
++_ACEOF
++
++ INCLUDES="$INCLUDES -pthread"
++ THREADDLLIBS=-pthread
++ cat >>confdefs.h <<\_ACEOF
++#define _REENTRANT 1
++_ACEOF
++
++ if test "${enable_parallel_mark}" = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define PARALLEL_MARK 1
++_ACEOF
++
++ fi
++ cat >>confdefs.h <<\_ACEOF
++#define THREAD_LOCAL_ALLOC 1
++_ACEOF
++
++ cat >>confdefs.h <<\_ACEOF
++#define USE_COMPILER_TLS 1
++_ACEOF
++
++ ;;
+ *-*-freebsd4*)
+ { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
+ echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
+diff -urNad mono-1.2.4~/libgc/configure.in mono-1.2.4/libgc/configure.in
+--- mono-1.2.4~/libgc/configure.in 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/libgc/configure.in 2007-07-29 22:20:20.000000000 +0200
@@ -103,6 +103,17 @@
AC_DEFINE(THREAD_LOCAL_ALLOC)
THREADDLLIBS="-lpthread -lrt"
@@ -61,10 +94,9 @@
*-*-freebsd4*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/libgc/dyn_load.c
-+++ mono-1.1.18/libgc/dyn_load.c
+diff -urNad mono-1.2.4~/libgc/dyn_load.c mono-1.2.4/libgc/dyn_load.c
+--- mono-1.2.4~/libgc/dyn_load.c 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/libgc/dyn_load.c 2007-07-29 22:20:20.000000000 +0200
@@ -26,7 +26,7 @@
* None of this is safe with dlclose and incremental collection.
* But then not much of anything is safe in the presence of dlclose.
@@ -83,10 +115,9 @@
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/libgc/include/gc.h
-+++ mono-1.1.18/libgc/include/gc.h
+diff -urNad mono-1.2.4~/libgc/include/gc.h mono-1.2.4/libgc/include/gc.h
+--- mono-1.2.4~/libgc/include/gc.h 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/libgc/include/gc.h 2007-07-29 22:20:20.000000000 +0200
@@ -484,7 +484,7 @@
# define GC_RETURN_ADDR (GC_word)__return_address
#endif
@@ -96,10 +127,9 @@
# include <features.h>
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
&& !defined(__ia64__)
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/libgc/include/private/gcconfig.h
-+++ mono-1.1.18/libgc/include/private/gcconfig.h
+diff -urNad mono-1.2.4~/libgc/include/private/gcconfig.h mono-1.2.4/libgc/include/private/gcconfig.h
+--- mono-1.2.4~/libgc/include/private/gcconfig.h 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/libgc/include/private/gcconfig.h 2007-07-29 22:20:20.000000000 +0200
@@ -55,7 +55,7 @@
# endif
@@ -109,7 +139,7 @@
# define FREEBSD
# endif
-@@ -1275,8 +1275,15 @@
+@@ -1279,8 +1279,15 @@
# ifndef GC_FREEBSD_THREADS
# define MPROTECT_VDB
# endif
@@ -127,9 +157,9 @@
# define FREEBSD_STACKBOTTOM
# ifdef __ELF__
# define DYNAMIC_LOADING
-@@ -1989,6 +1996,28 @@
- # define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
- # endif
+@@ -2031,6 +2038,28 @@
+ extern char * GC_FreeBSDGetDataStart();
+ # define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
# endif
+# ifdef FREEBSD
+# define OS_TYPE "FREEBSD"
@@ -156,7 +186,7 @@
# ifdef NETBSD
# define OS_TYPE "NETBSD"
# ifdef __ELF__
-@@ -2060,7 +2089,7 @@
+@@ -2102,7 +2131,7 @@
# define SUNOS5SIGS
# endif
@@ -165,7 +195,7 @@
# define SUNOS5SIGS
# endif
-@@ -2123,7 +2152,7 @@
+@@ -2165,7 +2194,7 @@
# define CACHE_LINE_SIZE 32 /* Wild guess */
# endif
@@ -174,7 +204,7 @@
# define REGISTER_LIBRARIES_EARLY
/* We sometimes use dl_iterate_phdr, which may acquire an internal */
/* lock. This isn't safe after the world has stopped. So we must */
-@@ -2204,7 +2233,7 @@
+@@ -2246,7 +2275,7 @@
#if defined(SPARC)
# define CAN_SAVE_CALL_ARGS
#endif
@@ -183,75 +213,27 @@
/* SAVE_CALL_CHAIN is supported if the code is compiled to save */
/* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
# define CAN_SAVE_CALL_ARGS
-
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/libgc/configure
-+++ mono-1.1.18/libgc/configure
-@@ -3974,6 +4636,32 @@
+diff -urNad mono-1.2.4~/mono/mini/exceptions-amd64.c mono-1.2.4/mono/mini/exceptions-amd64.c
+--- mono-1.2.4~/mono/mini/exceptions-amd64.c 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/mono/mini/exceptions-amd64.c 2007-07-29 22:20:20.000000000 +0200
+@@ -643,7 +643,7 @@
+ static inline guint64*
+ gregs_from_ucontext (ucontext_t *ctx)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
+ #else
+ guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
+diff -urNad mono-1.2.4~/mono/mini/mini-amd64.h mono-1.2.4/mono/mini/mini-amd64.h
+--- mono-1.2.4~/mono/mini/mini-amd64.h 2007-07-29 22:19:51.000000000 +0200
++++ mono-1.2.4/mono/mini/mini-amd64.h 2007-07-29 22:20:20.000000000 +0200
+@@ -210,7 +210,7 @@
- THREADDLLIBS="-lpthread -lrt"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ cat >>confdefs.h <<\_ACEOF
-+#define GC_FREEBSD_THREADS 1
-+_ACEOF
-+
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ cat >>confdefs.h <<\_ACEOF
-+#define _REENTRANT 1
-+_ACEOF
-+
-+ if test "${enable_parallel_mark}" = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define PARALLEL_MARK 1
-+_ACEOF
-+
-+ fi
-+ cat >>confdefs.h <<\_ACEOF
-+#define THREAD_LOCAL_ALLOC 1
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define USE_COMPILER_TLS 1
-+_ACEOF
-+
-+ ;;
- *-*-freebsd4*)
- { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-
-only in patch2:
-unchanged:
---- mono-1.1.18.orig/configure
-+++ mono-1.1.18/configure
-@@ -2245,6 +2828,16 @@
- libdl=
- libgc_threads=no
- ;;
-+ *-*-kfreebsd*-gnu)
-+ platform_win32=no
-+ CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread"
-+ libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread"
-+ libmono_ldflags="-lpthread -pthread"
-+ libdl="-ldl"
-+ libgc_threads=pthreads
-+ need_link_unlink=yes
-+ with_sigaltstack=no
-+ ;;
- # these flags will work for all versions of -STABLE
- #
- *-*-*freebsd4*)
-@@ -35603,6 +38772,11 @@
- LIBC="libc.so.12"
- INTL="libintl.so.0"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ LIBC="libc.so.0.1"
-+ INTL="libc.so.0.1"
-+ X11="libX11.so.6"
-+ ;;
- *-*-*freebsd*)
- LIBC="libc.so"
- INTL="libintl.so"
+ #endif /* PLATFORM_WIN32 */
+
+-#ifdef __FreeBSD__
++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+ #define REG_RAX 7
+ #define REG_RCX 4
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2007-08-06 10:31:46 UTC (rev 3260)
+++ mono/trunk/debian/rules 2007-08-06 21:05:38 UTC (rev 3261)
@@ -64,12 +64,16 @@
configure-arch: patch configure-arch-stamp
configure-arch-stamp:
dh_testdir
+ #chmod +x debian/autogen.sh
+ #NOCONFIGURE=1 debian/autogen.sh
$(CONFIGURE) --disable-mcs-build
touch configure-arch-stamp
configure-indep: patch configure-indep-stamp
configure-indep-stamp:
dh_testdir
+ #chmod +x debian/autogen.sh
+ #NOCONFIGURE=1 debian/autogen.sh
$(CONFIGURE)
touch configure-indep-stamp
@@ -93,6 +97,8 @@
build: build-arch
clean: clean-patched unpatch
+ #rm -f configure
+
clean-patched:
dh_testdir
dh_testroot
More information about the Pkg-mono-svn-commits
mailing list