automatically detect if we have a usable version of sed

installed.  If not, we will now build our own version.

1 files changed, 74 insertions, 15 deletions

diff --git a/make/sed.mk b/make/sed.mk
index c643f5b17..cb4379d76 100644
--- a/make/sed.mk
+++ b/make/sed.mk
@@ -3,27 +3,85 @@
 # sed
 #
 #############################################################
-SED_SOURCE:=sed-3.02.tar.gz
+SED_SOURCE:=sed-4.0.8.tar.gz
 SED_SITE:=ftp://ftp.gnu.org/gnu/sed
 SED_CAT:=zcat
-SED_DIR:=$(BUILD_DIR)/sed-3.02
+SED_DIR1:=$(TOOL_BUILD_DIR)/sed-4.0.8
+SED_DIR2:=$(BUILD_DIR)/sed-4.0.8
 SED_BINARY:=sed/sed
 SED_TARGET_BINARY:=bin/sed
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
 SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
 endif
+SED:=$(STAGING_DIR)/bin/sed -i -e
+
+HOST_SED_TARGET=$(shell ./sources/sedcheck.sh)
 
 $(DL_DIR)/$(SED_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE)
 
 sed-source: $(DL_DIR)/$(SED_SOURCE)
 
-$(SED_DIR)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+
+#############################################################
+#
+# build sed for use on the host system
+#
+#############################################################
+$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+	touch $(SED_DIR1)/.unpacked
+
+$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
+	(cd $(SED_DIR1); rm -rf config.cache; \
+		./configure \
+		--prefix=$(STAGING_DIR) \
+		--prefix=/usr \
+	);
+	touch  $(SED_DIR1)/.configured
+
+$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
+	$(MAKE) -C $(SED_DIR1)
+
+# This stuff is needed to work around GNU make deficiencies
+build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
+	@if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \
+		rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi;
+	@if [ $(STAGING_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
+	set -x; \
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \
+	mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
+	rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
+		$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
+
+use-sed-host-binary:
+	@if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \
+	    if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \
+	    mkdir -p $(STAGING_DIR)/bin; \
+	    rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); \
+	    ln -s $$SED $(STAGING_DIR)/$(SED_TARGET_BINARY)
+
+host-sed: $(HOST_SED_TARGET)
+
+host-sed-clean:
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) uninstall
+	-sed -C $(SED_DIR1) clean
+
+host-sed-dirclean:
+	rm -rf $(SED_DIR1)
+
+
+#############################################################
+#
+# build sed for use on the target system
+#
+#############################################################
+$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
 	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	touch $(SED_DIR)/.unpacked
+	touch $(SED_DIR2)/.unpacked
 
-$(SED_DIR)/.configured: $(SED_DIR)/.unpacked
-	(cd $(SED_DIR); rm -rf config.cache; \
+$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
+	(cd $(SED_DIR2); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="$(SED_CFLAGS)" \
@@ -43,18 +101,18 @@ $(SED_DIR)/.configured: $(SED_DIR)/.unpacked
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 	);
-	touch  $(SED_DIR)/.configured
+	touch  $(SED_DIR2)/.configured
 
-$(SED_DIR)/$(SED_BINARY): $(SED_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(SED_DIR)
+$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2)
 
 # This stuff is needed to work around GNU make deficiencies
-sed-target_binary: $(SED_DIR)/$(SED_BINARY)
+sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
 	@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \
 		rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi;
-	@if [ $(TARGET_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR)/$(SED_BINARY) ] ; then \
+	@if [ $(TARGET_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
 	set -x; \
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR) install; \
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
 	mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi
@@ -62,9 +120,10 @@ sed-target_binary: $(SED_DIR)/$(SED_BINARY)
 sed: uclibc sed-target_binary
 
 sed-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR) uninstall
-	-sed -C $(SED_DIR) clean
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) uninstall
+	-sed -C $(SED_DIR2) clean
 
 sed-dirclean:
-	rm -rf $(SED_DIR)
+	rm -rf $(SED_DIR2)
+