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 d104ce1..f801f3d 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -11,8 +11,6 @@ UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2
 #"
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
 else
 #"
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
 else

-# Note: 0.9.26 has known problems.  So best use a snapshot until .27 is out.
-# Anticipate the change.

 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.27
 UCLIBC_SOURCE:=uClibc-0.9.27.tar.bz2
 UCLIBC_SITE:=http://www.uclibc.org/downloads
 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.27
 UCLIBC_SOURCE:=uClibc-0.9.27.tar.bz2
 UCLIBC_SITE:=http://www.uclibc.org/downloads


@@ -35,19 +33,20 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
        mkdir -p $(DL_DIR)
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
        mkdir -p $(DL_DIR)

-       $(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(UCLIBC_SOURCE) x $(UCLIBC_SITE)

 
 $(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
        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
 ifeq ($(BR2_ENABLE_LOCALE),y)
        touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
 ifeq ($(BR2_ENABLE_LOCALE),y)

-       cp toolchain/uClibc/uClibc.config-locale $(UCLIBC_DIR)/.config
+       cp ./uClibc.config-locale $(UCLIBC_DIR)/.config

 else
 else

-       cp toolchain/uClibc/uClibc.config $(UCLIBC_DIR)/.config
+       cp ./uClibc.config $(UCLIBC_DIR)/.config

 endif
        $(SED) 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
                $(UCLIBC_DIR)/.config
 endif
        $(SED) 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
                $(UCLIBC_DIR)/.config


@@ -100,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),)


@@ -126,7 +125,7 @@ endif
 
 uclibc-configured: $(UCLIBC_DIR)/.configured
 
 
 uclibc-configured: $(UCLIBC_DIR)/.configured
 

-uclibc: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/lib/libc.a \
+uclibc: $(STAGING_DIR)/lib/libc.a \

        $(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
        $(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)


@@ -137,7 +136,7 @@ uclibc-clean:
        -$(MAKE1) -C $(UCLIBC_DIR) clean
        rm -f $(UCLIBC_DIR)/.config
 
        -$(MAKE1) -C $(UCLIBC_DIR) clean
        rm -f $(UCLIBC_DIR)/.config
 

-uclibc-dirclean:
+uclibc-toolclean:

        rm -rf $(UCLIBC_DIR)
 
 uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
        rm -rf $(UCLIBC_DIR)
 
 uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd