From d33c33118cd8df4693310388249932c2597ec8d7 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 30 Nov 2002 20:11:52 +0000 Subject: Fix build on -CURRENT and with bison 1.75. Reported by: bento --- lang/mono/Makefile | 6 +-- lang/mono/files/patch-mono_io-layer_daemon.c | 20 +++++++++ .../files/patch-mono_io-layer_handles-private.h | 29 +++++++++++++ lang/mono/files/patch-mono_io-layer_handles.c | 47 ++++++++++++++++++++++ lang/mono/files/patch-mono_io-layer_wapi-private.h | 20 +++++++++ lang/mono/files/patch-mono_monoburg_monoburg.y | 11 +++++ 6 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 lang/mono/files/patch-mono_io-layer_daemon.c create mode 100644 lang/mono/files/patch-mono_io-layer_handles-private.h create mode 100644 lang/mono/files/patch-mono_io-layer_handles.c create mode 100644 lang/mono/files/patch-mono_io-layer_wapi-private.h create mode 100644 lang/mono/files/patch-mono_monoburg_monoburg.y (limited to 'lang') diff --git a/lang/mono/Makefile b/lang/mono/Makefile index b443d7759c95..0e6bb6627774 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -22,7 +22,7 @@ USE_AUTOCONF= yes USE_REINPLACE= yes USE_BISON= yes CONFIGURE_ARGS= --program-transform-name=\'\' -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} @@ -30,9 +30,9 @@ MAN1= mcs.1 mint.1 mono.1 monoburg.1 monodis.1 monostyle.1 MAN5= mono-config.5 pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - @find ${WRKSRC}/mono -name *.c | xargs ${REINPLACE_CMD} -e \ + @find ${WRKSRC}/mono -name *.c | xargs ${REINPLACE_CMD} -e \ 's|gc/gc.h|'${LOCALBASE}/'include/gc.h|g' .include diff --git a/lang/mono/files/patch-mono_io-layer_daemon.c b/lang/mono/files/patch-mono_io-layer_daemon.c new file mode 100644 index 000000000000..919cc9128c1f --- /dev/null +++ b/lang/mono/files/patch-mono_io-layer_daemon.c @@ -0,0 +1,20 @@ +--- mono/io-layer/daemon.c.orig Sat Nov 30 14:40:33 2002 ++++ mono/io-layer/daemon.c Sat Nov 30 14:43:38 2002 +@@ -384,7 +384,7 @@ + + thread_handle->exitstatus=0; + +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + _wapi_handle_lock_handle (handle); + _wapi_handle_set_signal_state (handle, TRUE, TRUE); + _wapi_handle_unlock_handle (handle); +@@ -442,7 +442,7 @@ + _wapi_time_t_to_filetime (time (NULL), + &process_handle_data->exit_time); + +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + _wapi_handle_lock_handle (process_handle); + _wapi_handle_set_signal_state (process_handle, TRUE, TRUE); + _wapi_handle_unlock_handle (process_handle); diff --git a/lang/mono/files/patch-mono_io-layer_handles-private.h b/lang/mono/files/patch-mono_io-layer_handles-private.h new file mode 100644 index 000000000000..a548017ff553 --- /dev/null +++ b/lang/mono/files/patch-mono_io-layer_handles-private.h @@ -0,0 +1,29 @@ +--- mono/io-layer/handles-private.h.orig Sat Nov 30 14:47:32 2002 ++++ mono/io-layer/handles-private.h Sat Nov 30 14:48:28 2002 +@@ -103,7 +103,7 @@ + /* Tell everyone blocking on multiple handles that something + * was signalled + */ +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + mono_mutex_lock (&_wapi_shared_data->signal_mutex); + pthread_cond_broadcast (&_wapi_shared_data->signal_cond); + mono_mutex_unlock (&_wapi_shared_data->signal_mutex); +@@ -138,7 +138,7 @@ + #ifdef DEBUG + g_message (G_GNUC_PRETTY_FUNCTION ": lock global signal mutex"); + #endif +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + return(mono_mutex_lock (&_wapi_shared_data->signal_mutex)); + #else + return(mono_mutex_lock (&_wapi_private_data->signal_mutex)); +@@ -150,7 +150,7 @@ + #ifdef DEBUG + g_message (G_GNUC_PRETTY_FUNCTION ": unlock global signal mutex"); + #endif +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + return(mono_mutex_unlock (&_wapi_shared_data->signal_mutex)); + #else + return(mono_mutex_unlock (&_wapi_private_data->signal_mutex)); diff --git a/lang/mono/files/patch-mono_io-layer_handles.c b/lang/mono/files/patch-mono_io-layer_handles.c new file mode 100644 index 000000000000..163a8b978973 --- /dev/null +++ b/lang/mono/files/patch-mono_io-layer_handles.c @@ -0,0 +1,47 @@ +--- mono/io-layer/handles.c.orig Sat Nov 30 14:40:33 2002 ++++ mono/io-layer/handles.c Sat Nov 30 14:45:13 2002 +@@ -153,7 +153,7 @@ + pthread_mutexattr_init (&mutex_shared_attr); + pthread_condattr_init (&cond_shared_attr); + +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + pthread_mutexattr_setpshared (&mutex_shared_attr, + PTHREAD_PROCESS_SHARED); + pthread_condattr_setpshared (&cond_shared_attr, +@@ -881,7 +881,7 @@ + */ + int _wapi_handle_wait_signal (void) + { +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + return(mono_cond_wait (&_wapi_shared_data->signal_cond, + &_wapi_shared_data->signal_mutex)); + #else +@@ -903,7 +903,7 @@ + + int _wapi_handle_timedwait_signal (struct timespec *timeout) + { +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + return(mono_cond_timedwait (&_wapi_shared_data->signal_cond, + &_wapi_shared_data->signal_mutex, + timeout)); +@@ -935,7 +935,7 @@ + + int _wapi_handle_wait_signal_handle (gpointer handle) + { +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + guint32 idx=GPOINTER_TO_UINT (handle); + + return(mono_cond_wait (&_wapi_shared_data->handles[idx].signal_cond, +@@ -961,7 +961,7 @@ + int _wapi_handle_timedwait_signal_handle (gpointer handle, + struct timespec *timeout) + { +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + guint32 idx=GPOINTER_TO_UINT (handle); + + return(mono_cond_timedwait (&_wapi_shared_data->handles[idx].signal_cond, diff --git a/lang/mono/files/patch-mono_io-layer_wapi-private.h b/lang/mono/files/patch-mono_io-layer_wapi-private.h new file mode 100644 index 000000000000..92b95f17b136 --- /dev/null +++ b/lang/mono/files/patch-mono_io-layer_wapi-private.h @@ -0,0 +1,20 @@ +--- mono/io-layer/wapi-private.h.orig Sat Jul 20 14:31:18 2002 ++++ mono/io-layer/wapi-private.h Sat Nov 30 14:42:43 2002 +@@ -105,7 +105,7 @@ + guchar daemon[MONO_SIZEOF_SUNPATH]; + _wapi_daemon_status daemon_running; + +-#ifdef _POSIX_THREAD_PROCESS_SHARED ++#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1 + mono_mutex_t signal_mutex; + pthread_cond_t signal_cond; + #endif +@@ -133,7 +133,7 @@ + */ + struct _WapiHandlePrivate_list + { +-#ifndef _POSIX_THREAD_PROCESS_SHARED ++#if !defined(_POSIX_THREAD_PROCESS_SHARED) || _POSIX_THREAD_PROCESS_SHARED == -1 + mono_mutex_t signal_mutex; + pthread_cond_t signal_cond; + #endif diff --git a/lang/mono/files/patch-mono_monoburg_monoburg.y b/lang/mono/files/patch-mono_monoburg_monoburg.y new file mode 100644 index 000000000000..3d2c66f682d2 --- /dev/null +++ b/lang/mono/files/patch-mono_monoburg_monoburg.y @@ -0,0 +1,11 @@ +--- mono/monoburg/monoburg.y.orig Sat Nov 30 14:21:57 2002 ++++ mono/monoburg/monoburg.y Sat Nov 30 14:22:31 2002 +@@ -50,7 +50,7 @@ + | IDENT ':' tree optcost optcode optcfunc { create_rule ($1, $3, $5, $4, $6); } decls + ; + +-optcode : /* empty */ { $$ = NULL } ++optcode : /* empty */ { $$ = NULL; } + | CODE + ; + -- cgit