From 49d3f0f7e18cb6232eb6b25d024e57e43d4fba13 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Thu, 20 Aug 2009 10:09:02 +0200
Subject: [PATCH] use git to handle BR2_USE_UPDATES

  adjust some defaults for current master

Signed-off-by: aldot <rep.dot.nop@gmail.com>
---
 toolchain/uClibc/uClibc-0.9.30.config |  4 ++++
 toolchain/uClibc/uclibc.mk            | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/toolchain/uClibc/uClibc-0.9.30.config b/toolchain/uClibc/uClibc-0.9.30.config
index 699a957..94b17f3 100644
--- a/toolchain/uClibc/uClibc-0.9.30.config
+++ b/toolchain/uClibc/uClibc-0.9.30.config
@@ -79,6 +79,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 # COMPAT_ATEXIT is not set
 # UCLIBC_SUSV3_LEGACY is not set
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_SUSV4_LEGACY is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
@@ -129,6 +130,8 @@ UCLIBC_HAS_IPV4=y
 UCLIBC_USE_NETLINK=y
 UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
 
 #
 # String and Stdio Support
@@ -190,6 +193,7 @@ UCLIBC_HAS_GNU_GLOB=y
 SHARED_LIB_LOADER_PREFIX="/lib"
 RUNTIME_PREFIX="/"
 DEVEL_PREFIX="/usr/"
+HARDWIRED_ABSPATH=y
 
 #
 # Security options
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 4f3cfd1..b5569d9 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -133,7 +133,7 @@ $(wildcard $(BR2_DEPENDS_DIR)/br2/uclibc/*/*.h)
 # Some targets may wish to provide their own UCLIBC_CONFIG_FILE...
 $(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE) $(UCLIBC_CONFIGURED_PREREQ)
 ifeq ($(BR2_USE_UPDATES),y)
-	(cd $(@D) && $(SVN_UP))
+	(test -d $(@D)/.git && cd $(@D) && $(GIT) pull --rebase)
 endif
 	cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.oldconfig
 	$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
@@ -532,10 +532,16 @@ uclibc-menuconfig libc-menuconfig: host-sed $(UCLIBC_DIR)/.config
 BR2_UCLIBC_CONFIG_FOR_BUILDROOT=$(BASE_DIR)/.buildroot.uclibc_config
 $(BR2_UCLIBC_CONFIG_FOR_BUILDROOT): $(dependencies) host-sed $(UCLIBC_DIR)/.config
 	# Create BR2__UCLIBC_SYM=val
-	cat $(UCLIBC_DIR)/.config > $(BR2_UCLIBC_CONFIG_FOR_BUILDROOT)
-	$(SED) '/#/d' -e '/^$$/d' -e 's,\([^=]*\)=\(.*\),BR2__UCLIBC_\1=\2,g' \
-		$(BR2_UCLIBC_CONFIG_FOR_BUILDROOT)
-	touch -c $@
+	set -e; cat $(UCLIBC_DIR)/.config > $@.new; \
+		$(SED) '/#/d' \
+			-e '/^$$/d' \
+			-e 's,\([^=]*\)=\(.*\),BR2__UCLIBC_\1=\2,g' $@.new; \
+	test -s $@.new; \
+	if cmp $@ $@.new >/dev/null 2>&1; then \
+		rm -f $@.new; \
+	else \
+		mv -f $@.new $@; \
+	fi
 
 ifeq ($(BR2__UCLIBC_HAVE_DOT_CONFIG),)
 ifeq ($(filter uclibc-menuconfig libc-menuconfig,$(MAKECMDGOALS)),)
-- 
2.11.4.GIT