- honor BR2_PTHREAD_DEBUG

  Stop asking any thread related questions while at it.

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 64ee0c225129a00bbe7a81f3182ae7025ed64c5a..224570978906963ccb89f42d3447476f05379a6e 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -149,18 +149,35 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 else
        $(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=y\nHAS_FPU=y\nUCLIBC_HAS_FLOATS=y\n,g' $(UCLIBC_DIR)/.config
 endif
-ifneq ($(BR2_PTHREADS_NONE),y)
-       $(SED) 's,# UCLIBC_HAS_THREADS is not set,UCLIBC_HAS_THREADS=y,g' $(UCLIBC_DIR)/.config
-       $(SED) 's,# PTHREADS_DEBUG_SUPPORT is not set,PTHREADS_DEBUG_SUPPORT=y,g' $(UCLIBC_DIR)/.config
+       $(SED) '/UCLIBC_HAS_THREADS/d' $(UCLIBC_DIR)/.config
+       $(SED) '/LINUXTHREADS/d' $(UCLIBC_DIR)/.config
+       $(SED) '/LINUXTHREADS_OLD/d' $(UCLIBC_DIR)/.config
+       $(SED) '/PTHREADS_DEBUG_SUPPORT/d' $(UCLIBC_DIR)/.config
+       $(SED) '/UCLIBC_HAS_THREADS_NATIVE/d' $(UCLIBC_DIR)/.config
+ifeq ($(BR2_PTHREADS_NONE),y)
+       echo "# UCLIBC_HAS_THREADS is not set" >> $(UCLIBC_DIR)/.config
+else
+       echo "UCLIBC_HAS_THREADS=y" >> $(UCLIBC_DIR)/.config
 endif
 ifeq ($(BR2_PTHREADS),y)
-       $(SED) 's,# LINUXTHREADS is not set,LINUXTHREADS=y,g' $(UCLIBC_DIR)/.config
+       echo "LINUXTHREADS=y" >> $(UCLIBC_DIR)/.config
+else
+       echo "# LINUXTHREADS is not set" >> $(UCLIBC_DIR)/.config
 endif
 ifeq ($(BR2_PTHREADS_OLD),y)
-       $(SED) 's,# LINUXTHREADS_OLD is not set,LINUXTHREADS_OLD=y,g' $(UCLIBC_DIR)/.config
+       echo "LINUXTHREADS_OLD=y" >> $(UCLIBC_DIR)/.config
+else
+       echo "# LINUXTHREADS_OLD is not set" >> $(UCLIBC_DIR)/.config
 endif
 ifeq ($(BR2_PTHREADS_NATIVE),y)
-       $(SED) 's,# UCLIBC_HAS_THREADS_NATIVE is not set,UCLIBC_HAS_THREADS_NATIVE=y,g' $(UCLIBC_DIR)/.config
+       echo "UCLIBC_HAS_THREADS_NATIVE=y" >> $(UCLIBC_DIR)/.config
+else
+       echo "# UCLIBC_HAS_THREADS_NATIVE is not set" >> $(UCLIBC_DIR)/.config
+endif
+ifeq ($(BR2_PTHREAD_DEBUG),y)
+       echo "PTHREADS_DEBUG_SUPPORT=y" >> $(UCLIBC_DIR)/.config
+else
+       echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.config
 endif
 ifeq ($(BR2_ENABLE_LOCALE),y)
        $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.config