PatchSet 5505 
Date: 2005/02/08 19:33:56
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fix for FreeBSD -pthread problems

2005-02-08  Dalibor Topic  <[EMAIL PROTECTED]>

        * configure.ac: Added PTHREAD_CFLAGS to CFLAGS back.
        That fixes FreeBSD again. 'make CFLAGS=-Wall' still works now,
        though.

        * kaffe/kaffevm/Makefile.am (libkaffevm_la_LDFLAGS):
        Added PTHREAD_CFLAGS.

        * kaffe/kaffevm/systems/unix-pthreads/Makefile.am 
(libkthread_la_LDFLAGS):
        Added PTHREAD_CFLAGS.

        Reported by:  Ito Kazumitsu  <[EMAIL PROTECTED]>

Members: 
        ChangeLog:1.3549->1.3550 
        configure:1.421->1.422 
        configure.ac:1.111->1.112 
        kaffe/kaffevm/Makefile.am:1.72->1.73 
        kaffe/kaffevm/Makefile.in:1.191->1.192 
        kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.12->1.13 
        kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.104->1.105 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3549 kaffe/ChangeLog:1.3550
--- kaffe/ChangeLog:1.3549      Tue Feb  8 06:41:24 2005
+++ kaffe/ChangeLog     Tue Feb  8 19:33:56 2005
@@ -1,3 +1,17 @@
+2005-02-08  Dalibor Topic  <[EMAIL PROTECTED]>
+
+        * configure.ac: Added PTHREAD_CFLAGS to CFLAGS back. 
+       That fixes FreeBSD again. 'make CFLAGS=-Wall' still works now,
+       though.
+
+       * kaffe/kaffevm/Makefile.am (libkaffevm_la_LDFLAGS):
+       Added PTHREAD_CFLAGS.
+
+       * kaffe/kaffevm/systems/unix-pthreads/Makefile.am 
(libkthread_la_LDFLAGS):
+       Added PTHREAD_CFLAGS.
+
+       Reported by:  Ito Kazumitsu  <[EMAIL PROTECTED]>
+
 2005-02-08  Jim Huang  <[EMAIL PROTECTED]>
 
        * WHATSNEW: Add some successes.
Index: kaffe/configure
diff -u kaffe/configure:1.421 kaffe/configure:1.422
--- kaffe/configure:1.421       Tue Feb  8 00:15:01 2005
+++ kaffe/configure     Tue Feb  8 19:33:59 2005
@@ -28174,6 +28174,7 @@
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test x"$acx_pthread_ok" = xyes; then
         THREADLIBS="$PTHREAD_LIBS "
+                    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
                      CC="$PTHREAD_CC"
         :
 else
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.111 kaffe/configure.ac:1.112
--- kaffe/configure.ac:1.111    Tue Feb  8 00:15:11 2005
+++ kaffe/configure.ac  Tue Feb  8 19:34:04 2005
@@ -667,6 +667,7 @@
 dnl Check for thread libraries
 if test x$with_threads = xunix-pthreads ; then
        ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS "
+                    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
                      CC="$PTHREAD_CC"])
        AC_CHECK_LIB(semaphore,sem_init,SEMAPHORE_LIB="-lsemaphore")
        AC_SUBST(SEMAPHORE_LIB)
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.72 
kaffe/kaffe/kaffevm/Makefile.am:1.73
--- kaffe/kaffe/kaffevm/Makefile.am:1.72        Sat Feb  5 23:31:03 2005
+++ kaffe/kaffe/kaffevm/Makefile.am     Tue Feb  8 19:34:05 2005
@@ -49,6 +49,7 @@
        $(PTHREAD_CFLAGS)
 
 libkaffevm_la_LDFLAGS = \
+       $(PTHREAD_CFLAGS) \
         $(PTHREAD_LIBS) \
         $(SEMAPHORE_LIB) \
        $(KVMLIBFLAGS) \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.191 
kaffe/kaffe/kaffevm/Makefile.in:1.192
--- kaffe/kaffe/kaffevm/Makefile.in:1.191       Mon Feb  7 15:47:00 2005
+++ kaffe/kaffe/kaffevm/Makefile.in     Tue Feb  8 19:34:05 2005
@@ -447,6 +447,7 @@
        $(PTHREAD_CFLAGS)
 
 libkaffevm_la_LDFLAGS = \
+       $(PTHREAD_CFLAGS) \
         $(PTHREAD_LIBS) \
         $(SEMAPHORE_LIB) \
        $(KVMLIBFLAGS) \
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.12 
kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.13
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.12  Sat Feb  5 
19:42:11 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am       Tue Feb  8 
19:34:06 2005
@@ -16,6 +16,7 @@
 
 libkthread_la_LDFLAGS = \
        $(KVMLIBFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(PTHREAD_LIBS) \
        $(SEMAPHORE_LIB)
 
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.104 
kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.105
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.104 Mon Feb  7 
15:47:06 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in       Tue Feb  8 
19:34:06 2005
@@ -377,6 +377,7 @@
 
 libkthread_la_LDFLAGS = \
        $(KVMLIBFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(PTHREAD_LIBS) \
        $(SEMAPHORE_LIB)
 

_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

Reply via email to