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

Pass --without-sigaltstack instead of patching.

Browse Source 
Remove checks for old OpenBSD.

ok robert@ (maintainer)
This commit is contained in:
ajacoutot 2016-11-07 15:22:38 +00:00
parent f9b12e1341
commit b81fd48ffa
4 changed files with 17 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lang/mono/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.104 2016/11/07 11:52:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.105 2016/11/07 15:22:38 ajacoutot Exp $
USE_WXNEEDED= Yes
@ -6,7 +6,7 @@ COMMENT= cross platform, open source .NET developement framework
V= 4.6.1
DISTNAME= mono-${V}.5
REVISION= 0
REVISION= 1
CATEGORIES= lang devel
@ -49,8 +49,7 @@ LIB_DEPENDS= converters/libiconv
TEST_DEPENDS= lang/python/${MODPY_VERSION}
AUTOCONF_VERSION=2.69
CONFIGURE_STYLE=autoconf
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
ac_cv_header_execinfo_h=no \
@ -63,9 +62,10 @@ CONFIGURE_ENV+= CFLAGS="-march=i586"
WRKDIST= ${WRKDIR}/mono-${V}
CONFIGURE_ARGS= --with-gc=included \
--with-sgen=no \
--enable-quiet-build=no \
--disable-shared-handles
--without-sgen \
--disable-quiet-build \
--disable-shared-handles \
--without-sigaltstack
TEST_TARGET=check
@ -78,11 +78,6 @@ DLLMAP_FILES= mcs/class/System.Windows.Forms/System.Windows.Forms/MimeIcon.cs \
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples
post-patch:
@cd ${WRKSRC}/eglib && \
${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} && \
${SETENV} ${AUTOCONF_ENV} ${AUTOHEADER}
pre-configure:
${SUBST_CMD} ${WRKSRC}/runtime/mono-wrapper.in \
${WRKSRC}/runtime/monodis-wrapper.in

11
lang/mono/patches/patch-configure_ac
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.3 2016/06/26 10:40:28 robert Exp $
--- configure.ac.orig Thu Jun 9 17:01:54 2016
+++ configure.ac Thu Jun 23 19:29:32 2016
@@ -170,7 +170,6 @@ case "$host" in
AC_DEFINE(PTHREAD_POINTER_ID)
libdl=
libgc_threads=pthreads
- with_sigaltstack=no
use_sigposix=yes
;;
*-*-linux-android*)

24
lang/mono/patches/patch-libgc_dyn_load_c
View File

@ -1,26 +1,12 @@
$OpenBSD: patch-libgc_dyn_load_c,v 1.2 2014/12/29 10:49:12 robert Exp $
--- libgc/dyn_load.c.orig Sun Dec 28 16:23:54 2014
+++ libgc/dyn_load.c Sun Dec 28 16:24:45 2014
@@ -91,6 +91,13 @@
# define ELFSIZE ARCH_ELFSIZE
#endif
+#if defined(OPENBSD)
+# include <sys/param.h>
+# if OpenBSD >= 200519
+# define HAVE_DL_ITERATE_PHDR
+# endif
+#endif /* OPENBSD */
+
#if (defined(LINUX) || defined(NACL)) && defined(__ELF__) || defined(SCO_ELF) || \
(defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
(defined(OPENBSD) && defined(__ELF__)) || \
@@ -396,7 +403,8 @@ GC_bool GC_register_main_static_data()
$OpenBSD: patch-libgc_dyn_load_c,v 1.3 2016/11/07 15:22:38 ajacoutot Exp $
--- libgc/dyn_load.c.orig Mon Nov 7 13:45:18 2016
+++ libgc/dyn_load.c Mon Nov 7 13:45:52 2016
@@ -396,7 +396,8 @@ GC_bool GC_register_main_static_data()
# if (defined(LINUX) || defined (__GLIBC__) || defined(NACL)) /* Are others OK here, too? */ \
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
+ || defined(OPENBSD)
/* We have the header files for a glibc that includes dl_iterate_phdr. */

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

@ -1,14 +1,12 @@
$OpenBSD: patch-libgc_include_private_gc_priv_h,v 1.3 2016/06/26 10:40:28 robert Exp $
--- libgc/include/private/gc_priv.h.orig Thu Jun 9 17:01:54 2016
+++ libgc/include/private/gc_priv.h Thu Jun 23 19:29:27 2016
@@ -1979,6 +1979,10 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
$OpenBSD: patch-libgc_include_private_gc_priv_h,v 1.4 2016/11/07 15:22:38 ajacoutot Exp $
--- libgc/include/private/gc_priv.h.orig Tue Oct 11 14:53:43 2016
+++ libgc/include/private/gc_priv.h Mon Nov 7 13:38:42 2016
@@ -1979,6 +1979,8 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
/* Linuxthreads itself uses SIGUSR1 and SIGUSR2. */
# define SIG_SUSPEND SIGPWR
# endif
+# elif defined(GC_OPENBSD_THREADS)
+# ifndef GC_OPENBSD_UTHREADS
+# define SIG_SUSPEND SIGXFSZ
+# endif
+# define SIG_SUSPEND SIGXFSZ
# else /* !GC_LINUX_THREADS */
# if defined(_SIGRTMIN)
# define SIG_SUSPEND _SIGRTMIN + 6