Changeset 2091 in kBuild

Timestamp:

Nov 19, 2008 11:21:53 PM (17 years ago)

Author:

bird

Message:

kmk: Don't bootstrap with threads and disable them for FreeBSD.x86 since that doesn't work in my 6.3 jail.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• incdep.c (modified) (9 diffs)

trunk/src/kmk/Makefile.am

@@ -125 +125 @@
         -DCONFIG_WITH_EXTENDED_NOTPARALLEL \
         -DCONFIG_WITH_INCLUDEDEP \
+        -DCONFIG_WITHOUT_THREADS \
         -DCONFIG_WITH_VALUE_LENGTH \
         -DCONFIG_WITH_RSORT \

trunk/src/kmk/Makefile.kmk

@@ -214 +214 @@
 #kmk_DEFS.solaris += HAVE_MALLINFO
 
-kmk_LIBS.freebsd = pthread
+kmk_LIBS.freebsd.amd64 = pthread
+kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
 
 #

trunk/src/kmk/incdep.c

@@ -344 +344 @@
 incdep_lock(void)
 {
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   pthread_mutex_lock (&incdep_mtx);
 #elif defined (WINDOWS32)
@@ -357 +357 @@
 incdep_unlock(void)
 {
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   pthread_mutex_unlock (&incdep_mtx);
 #elif defined(WINDOWS32)
@@ -370 +370 @@
 incdep_signal_done (void)
 {
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   pthread_cond_broadcast (&incdep_cond_done);
 #elif defined (WINDOWS32)
@@ -385 +385 @@
 incdep_wait_done (void)
 {
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   pthread_cond_wait (&incdep_cond_done, &incdep_mtx);
 
@@ -411 +411 @@
 incdep_signal_todo (void)
 {
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   pthread_cond_broadcast (&incdep_cond_todo);
 #elif defined(WINDOWS32)
@@ -426 +426 @@
 incdep_wait_todo (void)
 {
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   pthread_cond_wait (&incdep_cond_todo, &incdep_mtx);
 
@@ -594 +594 @@
 incdep_are_threads_enabled (void)
 {
+#if defined (CONFIG_WITHOUT_THREADS)
+  return 0;
+#endif
+
   if (getenv("KMK_THREADS_DISABLED"))
     return 0;
@@ -656 +660 @@
   /* create the mutex and two condition variables / event objects. */
 
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
   rc = pthread_mutex_init (&incdep_mtx, NULL);
   if (rc)
@@ -729 +733 @@
 
           /* create the thread. */
-#ifdef HAVE_PTHREAD
+#if defined (HAVE_PTHREAD) && !defined (CONFIG_WITHOUT_THREADS)
           rc = pthread_attr_init (&attr);
           if (rc)