KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

always build sed, some systems have a broken one where it's hard to detect

Browse source 
SVN-Revision: 5043
This commit is contained in:
Felix Fietkau 2006-10-10 22:29:46 +00:00
parent 0a36264eb5
commit b58704c5af
2 changed files with 8 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
openwrt/tools/sed/Makefile
View file

@ -16,29 +16,23 @@ 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 \
--prefix=$(STAGING_DIR) \ --prefix=$(STAGING_DIR) \
--prefix=/usr \ --prefix=/usr \
); );
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
endef endef
define Build/Install define Build/Install
@if [ -L $(STAGING_DIR)/bin/sed ] ; then \ @if [ -L $(STAGING_DIR)/bin/sed ] ; then \
rm -f $(STAGING_DIR)/bin/sed; fi; 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 \ @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 \ rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
$(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))

24
openwrt/tools/sed/sedcheck.sh
View file

@ -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*