[Pkg-mono-svn-commits] rev 3272 - in mono/trunk/debian: . patches
Mirco Bauer
meebey-guest at alioth.debian.org
Thu Aug 9 17:56:03 UTC 2007
Author: meebey-guest
Date: 2007-08-09 17:56:03 +0000 (Thu, 09 Aug 2007)
New Revision: 3272
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/patches/kfreebsd_support.dpatch
Log:
mono 1.2.4-6 release
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2007-08-07 18:44:33 UTC (rev 3271)
+++ mono/trunk/debian/changelog 2007-08-09 17:56:03 UTC (rev 3272)
@@ -1,3 +1,14 @@
+mono (1.2.4-6) unstable; urgency=medium
+
+ * Mirco 'meebey' Bauer:
+ + debian/patches/kfreebsd_support.dpatch:
+ - Patch configure script too, as we are not re-autogening.
+ This made kfreebsd-* FTBFS.
+ + Urgency set to medium, as the last upload fixes an important crash
+ bug (#428190) for PPC.
+
+ -- Mirco Bauer <meebey at debian.org> Thu, 09 Aug 2007 19:36:21 +0200
+
mono (1.2.4-5) unstable; urgency=low
* The "there is more than Linux and X86" release
Modified: mono/trunk/debian/patches/kfreebsd_support.dpatch
===================================================================
--- mono/trunk/debian/patches/kfreebsd_support.dpatch 2007-08-07 18:44:33 UTC (rev 3271)
+++ mono/trunk/debian/patches/kfreebsd_support.dpatch 2007-08-09 17:56:03 UTC (rev 3272)
@@ -6,10 +6,10 @@
@DPATCH@
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
+--- mono-1.2.4~/configure.in 2007-04-25 20:48:44.000000000 +0200
++++ mono-1.2.4/configure.in 2007-08-09 19:37:54.000000000 +0200
+@@ -93,6 +93,16 @@
+ libgc_threads=pthreads
with_sigaltstack=no
;;
+ *-*-kfreebsd*-gnu)
@@ -25,9 +25,9 @@
# these flags will work for all versions of -STABLE
#
*-*-*freebsd4*)
-@@ -1810,6 +1820,11 @@
- INTL="libc.so.0.1"
- X11="libX11.so.6"
+@@ -1795,6 +1805,11 @@
+ LIBC="libc.so.12"
+ INTL="libintl.so.0"
;;
+ *-*-kfreebsd*-gnu)
+ LIBC="libc.so.0.1"
@@ -37,9 +37,229 @@
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
+diff -urNad mono-1.2.4~/configure mono-1.2.4/configure
+--- mono-1.2.4~/configure 2007-05-14 19:21:16.000000000 +0200
++++ mono-1.2.4/configure 2007-08-09 19:42:28.000000000 +0200
+@@ -2847,6 +2847,16 @@
+ libgc_threads=pthreads
+ with_sigaltstack=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*)
+@@ -6531,7 +6541,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6534 "configure"' > conftest.$ac_ext
++ echo '#line 6544 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9330,11 +9340,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9333: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9343: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9337: \$? = $ac_status" >&5
++ echo "$as_me:9347: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9598,11 +9608,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9611: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9605: \$? = $ac_status" >&5
++ echo "$as_me:9615: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9702,11 +9712,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9705: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9715: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9709: \$? = $ac_status" >&5
++ echo "$as_me:9719: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -12154,7 +12164,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12157 "configure"
++#line 12167 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12254,7 +12264,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12257 "configure"
++#line 12267 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14622,11 +14632,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14625: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14635: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14629: \$? = $ac_status" >&5
++ echo "$as_me:14639: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -14726,11 +14736,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14739: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14733: \$? = $ac_status" >&5
++ echo "$as_me:14743: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16296,11 +16306,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16299: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16309: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16303: \$? = $ac_status" >&5
++ echo "$as_me:16313: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16400,11 +16410,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16403: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16413: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16407: \$? = $ac_status" >&5
++ echo "$as_me:16417: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18630,11 +18640,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18633: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18643: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18637: \$? = $ac_status" >&5
++ echo "$as_me:18647: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18898,11 +18908,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18901: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18911: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18905: \$? = $ac_status" >&5
++ echo "$as_me:18915: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -19002,11 +19012,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:19005: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19015: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:19009: \$? = $ac_status" >&5
++ echo "$as_me:19019: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -39479,6 +39489,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"
+diff -urNad mono-1.2.4~/libgc/configure.in mono-1.2.4/libgc/configure.in
+--- mono-1.2.4~/libgc/configure.in 2007-04-25 20:48:40.000000000 +0200
++++ mono-1.2.4/libgc/configure.in 2007-08-09 19:37:54.000000000 +0200
+@@ -103,6 +103,17 @@
+ AC_DEFINE(THREAD_LOCAL_ALLOC)
+ THREADDLLIBS="-lpthread -lrt"
+ ;;
++ *-*-kfreebsd*-gnu)
++ AC_DEFINE(GC_FREEBSD_THREADS)
++ INCLUDES="$INCLUDES -pthread"
++ THREADDLLIBS=-pthread
++ AC_DEFINE(_REENTRANT)
++ if test "${enable_parallel_mark}" = yes; then
++ AC_DEFINE(PARALLEL_MARK)
++ fi
++ AC_DEFINE(THREAD_LOCAL_ALLOC)
++ AC_DEFINE(USE_COMPILER_TLS)
++ ;;
+ *-*-freebsd4*)
+ AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
+ AC_DEFINE(GC_FREEBSD_THREADS)
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
+--- mono-1.2.4~/libgc/configure 2007-05-14 19:21:22.000000000 +0200
++++ mono-1.2.4/libgc/configure 2007-08-09 19:37:54.000000000 +0200
@@ -4632,6 +4632,32 @@
THREADDLLIBS="-lpthread -lrt"
@@ -73,30 +293,9 @@
*-*-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"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ AC_DEFINE(GC_FREEBSD_THREADS)
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ AC_DEFINE(_REENTRANT)
-+ if test "${enable_parallel_mark}" = yes; then
-+ AC_DEFINE(PARALLEL_MARK)
-+ fi
-+ AC_DEFINE(THREAD_LOCAL_ALLOC)
-+ AC_DEFINE(USE_COMPILER_TLS)
-+ ;;
- *-*-freebsd4*)
- AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
- AC_DEFINE(GC_FREEBSD_THREADS)
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
+--- mono-1.2.4~/libgc/dyn_load.c 2007-04-25 20:48:40.000000000 +0200
++++ mono-1.2.4/libgc/dyn_load.c 2007-08-09 19:37:54.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.
@@ -116,8 +315,8 @@
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
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
+--- mono-1.2.4~/libgc/include/gc.h 2007-04-25 20:48:40.000000000 +0200
++++ mono-1.2.4/libgc/include/gc.h 2007-08-09 19:37:54.000000000 +0200
@@ -484,7 +484,7 @@
# define GC_RETURN_ADDR (GC_word)__return_address
#endif
@@ -128,8 +327,8 @@
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
&& !defined(__ia64__)
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
+--- mono-1.2.4~/libgc/include/private/gcconfig.h 2007-04-25 20:48:40.000000000 +0200
++++ mono-1.2.4/libgc/include/private/gcconfig.h 2007-08-09 19:37:55.000000000 +0200
@@ -55,7 +55,7 @@
# endif
@@ -157,7 +356,7 @@
# define FREEBSD_STACKBOTTOM
# ifdef __ELF__
# define DYNAMIC_LOADING
-@@ -2031,6 +2038,28 @@
+@@ -2009,6 +2016,28 @@
extern char * GC_FreeBSDGetDataStart();
# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
# endif
@@ -186,7 +385,7 @@
# ifdef NETBSD
# define OS_TYPE "NETBSD"
# ifdef __ELF__
-@@ -2102,7 +2131,7 @@
+@@ -2080,7 +2109,7 @@
# define SUNOS5SIGS
# endif
@@ -195,7 +394,7 @@
# define SUNOS5SIGS
# endif
-@@ -2165,7 +2194,7 @@
+@@ -2143,7 +2172,7 @@
# define CACHE_LINE_SIZE 32 /* Wild guess */
# endif
@@ -204,7 +403,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 */
-@@ -2246,7 +2275,7 @@
+@@ -2224,7 +2253,7 @@
#if defined(SPARC)
# define CAN_SAVE_CALL_ARGS
#endif
@@ -214,8 +413,8 @@
/* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
# define CAN_SAVE_CALL_ARGS
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
+--- mono-1.2.4~/mono/mini/exceptions-amd64.c 2007-04-25 20:48:42.000000000 +0200
++++ mono-1.2.4/mono/mini/exceptions-amd64.c 2007-08-09 19:37:55.000000000 +0200
@@ -643,7 +643,7 @@
static inline guint64*
gregs_from_ucontext (ucontext_t *ctx)
@@ -226,8 +425,8 @@
#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
+--- mono-1.2.4~/mono/mini/mini-amd64.h 2007-04-25 20:48:42.000000000 +0200
++++ mono-1.2.4/mono/mini/mini-amd64.h 2007-08-09 19:37:55.000000000 +0200
@@ -210,7 +210,7 @@
#endif /* PLATFORM_WIN32 */
More information about the Pkg-mono-svn-commits
mailing list