cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the correct GET_CONTEXT macro otherwise we will get a 0 context

Browse Source 
and that will freak everything out and crash.
Define EOVERFLOW based on our headers and remove the Makefile hack
that we don't need anymore.
This commit is contained in:
robert 2010-03-26 10:40:44 +00:00
parent 87928e163c
commit e7939895f2
4 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/mono/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2010/03/24 17:57:50 robert Exp $
# $OpenBSD: Makefile,v 1.26 2010/03/26 10:40:44 robert Exp $
# sync with net/avahi,-mono
ONLY_FOR_ARCHS= amd64 i386 powerpc # arm
@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc # arm
COMMENT= cross platform, open source .NET developement framework
DISTNAME= mono-2.6.3
PKGNAME= ${DISTNAME}p6
PKGNAME= ${DISTNAME}p7
CATEGORIES= lang devel

12
lang/mono/patches/patch-mcs_docs_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mcs_docs_Makefile,v 1.1 2010/03/23 10:21:32 robert Exp $
--- mcs/docs/Makefile.orig Tue Mar 23 09:58:01 2010
+++ mcs/docs/Makefile Tue Mar 23 10:08:33 2010
@@ -140,7 +140,7 @@ Novell.tree: Makefile
cs-errors.zip : cs-errors.tree
cs-errors.tree: cs-errors.config Makefile
- $(MDOC) assemble -o cs-errors -f error $<
+ $(MDOC) assemble -o cs-errors -f error $< || true
ecma334.zip : ecma334.tree
ecma334.tree: Makefile

12
lang/mono/patches/patch-mono_mini_mini_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mono_mini_mini_h,v 1.1 2010/03/26 10:40:44 robert Exp $
--- mono/mini/mini.h.orig Fri Mar 26 11:38:09 2010
+++ mono/mini/mini.h Fri Mar 26 11:38:21 2010
@@ -1945,7 +1945,7 @@ gboolean mono_gdb_render_native_backtraces (void) MONO
#define GET_CONTEXT \
void *ctx = context;
#else
-#ifdef MONO_ARCH_USE_SIGACTION
+#if defined(MONO_ARCH_USE_SIGACTION) && defined(UCONTEXT_GREGS)
#define GET_CONTEXT \
void *ctx = context;
#else

37
lang/mono/patches/patch-support_mph_h
View File

@ -1,12 +1,29 @@
$OpenBSD: patch-support_mph_h,v 1.1.1.1 2008/10/15 13:34:10 robert Exp $
--- support/mph.h.orig Tue Oct 7 17:12:09 2008
+++ support/mph.h Tue Oct 7 17:12:13 2008
@@ -131,7 +131,7 @@ typedef gint64 suseconds_t;
$OpenBSD: patch-support_mph_h,v 1.2 2010/03/26 10:40:44 robert Exp $
--- support/mph.h.orig Fri Sep 25 16:58:14 2009
+++ support/mph.h Thu Mar 25 16:41:41 2010
@@ -36,7 +36,7 @@
#include <stdint.h> /* for SIZE_MAX */
#endif
#define _mph_return_val_if_cb_(val, ret, cb) G_STMT_START{ \
if (cb (val)) { \
- errno = EOVERFLOW; \
+ errno = EINVAL; \
return ret; \
}}G_STMT_END
-#if __APPLE__ || __BSD__ || __FreeBSD__
+#if __APPLE__ || __BSD__ || __FreeBSD__ || __OpenBSD__
#define MPH_ON_BSD
#endif
@@ -46,9 +46,13 @@
#define MPH_INTERNAL
#endif
-#if defined (PLATFORM_WIN32) && !defined (EOVERFLOW)
-#define EOVERFLOW 75
-#endif /* def PLATFORM_WIN32 && ndef EOVERFLOW */
+#if !defined(EOVERFLOW)
+# if defined(PLATFORM_WIN32)
+# define EOVERFLOW 75
+# elif defined(__OpenBSD__)
+# define EOVERFLOW 87
+# endif
+#endif /* !defined(EOVERFLOW) */
#if !defined (PLATFORM_WIN32)