mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
always build sed, some systems have a broken one where it's hard to detect
SVN-Revision: 5043
This commit is contained in:
parent
0a36264eb5
commit
b58704c5af
@ -16,16 +16,10 @@ PKG_CAT:=zcat
|
|||||||
|
|
||||||
PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
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
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
ifeq ($(HOST_SED_TARGET),build-sed-host-binary)
|
override SHELL:=$(BASH)
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
|
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
|
||||||
./configure \
|
./configure \
|
||||||
@ -50,14 +44,5 @@ ifeq ($(HOST_SED_TARGET),build-sed-host-binary)
|
|||||||
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; \
|
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; \
|
||||||
fi
|
fi
|
||||||
endef
|
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
|
|
||||||
|
|
||||||
$(eval $(call HostBuild))
|
$(eval $(call HostBuild))
|
||||||
|
@ -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*
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user