sed: get rid of host-sed variant

And all the infrastructure surrounding it. A broken sed implementation
is quite rare nowadays, as seen by the fact that the current host-sed
support has been broken for a while, so just get rid of it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard
2010-09-30 23:09:39 +02:00
parent 57bc22c6b7
commit d0c3d1cf43
10 changed files with 19 additions and 180 deletions

View File

@@ -1,29 +0,0 @@
diff -Nru sed-4.1.5.orig/configure sed-4.1.5/configure
--- sed-4.1.5.orig/configure 2006-02-03 11:24:40.000000000 +0200
+++ sed-4.1.5/configure 2007-02-23 14:03:55.000000000 +0200
@@ -10147,8 +10147,6 @@
LINGUAS="${LINGUAS-%UNSET%}"
- install_sh="$install_sh"
-
_ACEOF
@@ -11265,14 +11263,10 @@
esac
done ;;
gettext-fix )
- sed -e '/^mkinstalldirs *=/a\' \
- -e "install_sh=$install_sh" \
- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
+ sed -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
intl/Makefile > intl/Makefile.tmp
mv intl/Makefile.tmp intl/Makefile
- sed -e '/^mkinstalldirs *=/a\' \
- -e "install_sh=$install_sh" \
- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
+ sed -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
po/Makefile > po/Makefile.tmp
mv po/Makefile.tmp po/Makefile ;;
esac

View File

@@ -7,18 +7,12 @@ SED_VERSION:=4.2.1
SED_SOURCE:=sed-$(SED_VERSION).tar.gz
SED_SITE:=$(BR2_GNU_MIRROR)/sed
SED_CAT:=$(ZCAT)
SED_DIR1:=$(TOOLCHAIN_DIR)/sed-$(SED_VERSION)
SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION)
SED_BINARY:=sed/sed
SED_TARGET_BINARY:=bin/sed
ifeq ($(BR2_LARGEFILE),y)
SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
endif
#HOST_SED_DIR:=$(STAGING_DIR)
HOST_SED_DIR:=$(TOOLCHAIN_DIR)
SED:=$(HOST_SED_DIR)/bin/sed -i -e
HOST_SED_BINARY:=$(shell package/sed/sedcheck.sh)
HOST_SED_IF_ANY=$(shell toolchain/dependencies/check-host-sed.sh)
$(DL_DIR)/$(SED_SOURCE):
mkdir -p $(DL_DIR)
@@ -26,78 +20,6 @@ $(DL_DIR)/$(SED_SOURCE):
sed-source: $(DL_DIR)/$(SED_SOURCE)
#############################################################
#
# build sed for use on the host system
#
#############################################################
$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
mkdir -p $(TOOLCHAIN_DIR)
mkdir -p $(HOST_SED_DIR)/bin
$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SED_DIR1) package/sed/ configure.patch
$(CONFIG_UPDATE) $(SED_DIR1)/config
touch $@
$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
(cd $(SED_DIR1); rm -rf config.cache; \
./configure $(QUIET) \
--prefix=/usr \
)
touch $@
$(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 $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ]; then \
rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); \
fi
@if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
-o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
-ot $(SED_DIR1)/$(SED_BINARY) ]; then \
set -x; \
mkdir -p $(HOST_SED_DIR)/bin; \
$(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \
mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \
rm -rf $(HOST_SED_DIR)/share/locale; \
rm -rf $(HOST_SED_DIR)/usr/share/doc; \
fi
$(HOST_SED_DIR)/$(SED_TARGET_BINARY):
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
.PHONY: sed host-sed use-sed-host-binary
use-sed-host-binary: $(HOST_SED_DIR)/$(SED_TARGET_BINARY)
host-sed: $(HOST_SED_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
host-sed-dirclean:
rm -rf $(SED_DIR1)
else
host-sed-clean host-sed-dirclean:
endif
#############################################################
#
# 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) $(TAR_OPTIONS) -
$(CONFIG_UPDATE) $(SED_DIR2)/build-aux

View File

@@ -1,11 +0,0 @@
#!/bin/sh
# Make sure the host sed supports '-i' (in-place).
# If it doesn't, we'll build and use our own.
SED=$(toolchain/dependencies/check-host-sed.sh)
if [ -z "$SED" ] ; then
echo build-sed-host-binary
else
echo use-sed-host-binary
fi