Add a pgsql-cli subpackage, extend help in Config.in, standardize Makefile

[openwrt.git] / toolchain / uClibc / uclibc.mk

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index f7b6d2b..f801f3d 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -38,6 +38,7 @@ $(DL_DIR)/$(UCLIBC_SOURCE):
 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
        mkdir -p $(TOOL_BUILD_DIR)
        bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
        mkdir -p $(TOOL_BUILD_DIR)
        bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -

+       $(PATCH) $(UCLIBC_DIR) ./patches

        touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
        touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked


@@ -98,11 +99,11 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_dev
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_dev

-       # Build the host utils.  Need to add an install target...
-       $(MAKE1) -C $(UCLIBC_DIR)/utils \
-               PREFIX=$(STAGING_DIR) \
-               HOSTCC="$(HOSTCC)" \
-               hostutils
+       # Build the host utils.  Need to add an install target... - disabled
+#      $(MAKE1) -C $(UCLIBC_DIR)/utils \
+#              PREFIX=$(STAGING_DIR) \
+#              HOSTCC="$(HOSTCC)" \
+#              hostutils

        touch -c $(STAGING_DIR)/lib/libc.a
 
 ifneq ($(TARGET_DIR),)
        touch -c $(STAGING_DIR)/lib/libc.a
 
 ifneq ($(TARGET_DIR),)