Commit 7e1cdc67 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- s/HOST_SED_TARGET/HOST_SED_BINARY/g for clarity 

- make sure that we have a working sed for the uclibc-menuconfig target
parent 15177a6e

package/sed/sed.mk

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ endif 
#HOST_SED_DIR:=$(STAGING_DIR)

HOST_SED_DIR:=$(TOOL_BUILD_DIR)

SED:=$(HOST_SED_DIR)/bin/sed -i -e

HOST_SED_TARGET=$(shell package/sed/sedcheck.sh)

HOST_SED_BINARY=$(shell package/sed/sedcheck.sh)

HOST_SED_IF_ANY=$(shell toolchain/dependencies/check-host-sed.sh)



$(DL_DIR)/$(SED_SOURCE):
@@ -63,15 +63,15 @@ build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY) 
		    $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi



use-sed-host-binary:

	@if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \

	if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \

		mkdir -p "$(HOST_SED_DIR)/bin"; \

		rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \

		ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \

	fi



host-sed: $(HOST_SED_TARGET)

host-sed: $(HOST_SED_BINARY)



ifeq ($(HOST_SED_TARGET),build-sed-host-binary)

ifeq ($(HOST_SED_BINARY),build-sed-host-binary)

host-sed-clean:

	$(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) uninstall

	-$(MAKE) -C $(SED_DIR1) clean

toolchain/uClibc/uclibc.mk

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET) 
		all

	touch -c $(UCLIBC_DIR)/lib/libc.a



uclibc-menuconfig: $(UCLIBC_DIR)/.config host-sed

uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config

	$(MAKE1) -C $(UCLIBC_DIR) \

		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \

		DEVEL_PREFIX=/usr/ \