Re: [mono-list] Patch to Mono HEAD for approval -- libgc/configure.in

2004-07-28 Thread Duncan Mak
On Tue, 2004-07-27 at 23:47, John Merryweather Cooper wrote:
> See attached Changelog in patch for details.  This patch selects the
> correct compiler flags for compiling libgc with pthreads on FreeBSD.
> 

You had a stray quote char in this patch and that broke the build.

Duncan.
___
Mono-list maillist  -  [EMAIL PROTECTED]
http://lists.ximian.com/mailman/listinfo/mono-list


[mono-list] Patch to Mono HEAD for approval -- libgc/configure.in

2004-07-27 Thread John Merryweather Cooper
See attached Changelog in patch for details.  This patch selects the
correct compiler flags for compiling libgc with pthreads on FreeBSD.
jmc
Index: ChangeLog
===
RCS file: /cvs/public/libgc/ChangeLog,v
retrieving revision 1.46
diff -u -r1.46 ChangeLog
--- ChangeLog   1 Jul 2004 11:49:11 -   1.46
+++ ChangeLog   28 Jul 2004 02:44:33 -
@@ -1,3 +1,8 @@
+2004-07-27  John Merryweather Cooper <[EMAIL PROTECTED]>
+
+   * configure.in:  Fix to properly select flags for pthreads
+   on FreeBSD 4.x (aka -STABLE) and 5.x (aka -CURRENT).
+   
 2004-07-01  Zoltan Varga  <[EMAIL PROTECTED]>
 
* include/install-sh doc/install-sh: New files.
Index: configure.in
===
RCS file: /cvs/public/libgc/configure.in,v
retrieving revision 1.20
diff -u -r1.20 configure.in
--- configure.in19 May 2004 16:18:32 -  1.20
+++ configure.in28 Jul 2004 02:44:33 -
@@ -98,11 +98,31 @@
AC_DEFINE(THREAD_LOCAL_ALLOC)
THREADLIBS="-lpthread -lrt"
;;
- *-*-freebsd*)
+ *-*-freebsd4*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
-   INCLUDES="$INCLUDES -pthread"
-   THREADLIBS=-pthread
+   if test "x$PTHREAD_CFLAGS" = "x"; then
+   INCLUDES="$INCLUDES -pthread"
+   else
+   INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
+   fi
+   if test "x$PTHREAD_LIBS" = "x"; then
+   THREADLIBS=-pthread
+   else
+   THREADLIBS=$PTHREAD_LIBS"
+   fi"
+   ;;
+ *-*-freebsd5*)
+   AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
+   AC_DEFINE(GC_FREEBSD_THREADS)
+   if test "x$PTHREAD_CFLAGS" != "x"; then
+   INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
+   fi
+   if test "x$PTHREAD_LIBS" = "x"; then
+   THREADLIBS=-lpthread
+   else
+   THREADLIBS="$PTHREAD_LIBS"
+   fi
;;
  *-*-solaris*)
AC_DEFINE(GC_SOLARIS_THREADS)


pgpbxPKEZiLpZ.pgp
Description: PGP signature