diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-10 22:29:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-10 22:29:46 +0000 |
| commit | b58704c5afd455e6f0900234825df0603e88781e (patch) | |
| tree | f2f3bf13ed9cad44ce980a3830bf1511510e2b15 | |
| parent | 0a36264eb552380c0322be5f00ce856772e962d6 (diff) | |
| download | upstream-b58704c5afd455e6f0900234825df0603e88781e.tar.gz upstream-b58704c5afd455e6f0900234825df0603e88781e.tar.bz2 upstream-b58704c5afd455e6f0900234825df0603e88781e.zip | |
always build sed, some systems have a broken one where it's hard to detect
SVN-Revision: 5043
| -rw-r--r-- | openwrt/tools/sed/Makefile | 31 | ||||
| -rwxr-xr-x | openwrt/tools/sed/sedcheck.sh | 24 |
2 files changed, 8 insertions, 47 deletions
diff --git a/openwrt/tools/sed/Makefile b/openwrt/tools/sed/Makefile index b3169918b4..61c7acbb00 100644 --- a/openwrt/tools/sed/Makefile +++ b/openwrt/tools/sed/Makefile @@ -16,29 +16,23 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -HOST_SED_TARGET=$(strip $(shell ./sedcheck.sh)) - -ifneq ($(HOST_SED_TARGET),build-sed-host-binary) - PKG_SOURCE:= - PKG_CAT:= -endif - include $(INCLUDE_DIR)/host-build.mk -ifeq ($(HOST_SED_TARGET),build-sed-host-binary) - define Build/Configure +override SHELL:=$(BASH) + +define Build/Configure (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ ./configure \ --prefix=$(STAGING_DIR) \ --prefix=/usr \ ); - endef +endef - define Build/Compile +define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) - endef +endef - define Build/Install +define Build/Install @if [ -L $(STAGING_DIR)/bin/sed ] ; then \ rm -f $(STAGING_DIR)/bin/sed; fi; @if [ ! -f $(STAGING_DIR)/bin/sed -o $(STAGING_DIR)/bin/sed -ot $(PKG_BUILD_DIR)/sed/sed ]; then \ @@ -49,15 +43,6 @@ ifeq ($(HOST_SED_TARGET),build-sed-host-binary) rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; \ fi - endef -else - define Build/Compile - endef - define Build/Install - rm -rf $(STAGING_DIR)/bin/sed - mkdir -p $(STAGING_DIR)/bin - ln -s `which sed` $(STAGING_DIR)/bin/sed - endef -endif +endef $(eval $(call HostBuild)) diff --git a/openwrt/tools/sed/sedcheck.sh b/openwrt/tools/sed/sedcheck.sh deleted file mode 100755 index f5a09fde08..0000000000 --- a/openwrt/tools/sed/sedcheck.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ -x /usr/bin/sed ]; then - SED="/usr/bin/sed"; -else - if [ -x /bin/sed ]; then - SED="/bin/sed"; - fi; -fi; - -echo "HELLO" > .sedtest -$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1 - -case "$1" in - *) - if [ $? != 0 ] ; then - echo build-sed-host-binary - else - echo use-sed-host-binary - fi; - ;; -esac -rm -f .sedtest* - |