NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paul Fox writes:

Browse Source 
hi erik --

bash versions 2.04.11 and 2.04.21 (at least -- they're the only
non-2.05 versions i have) seem to get the "older than" (test -ot)
answer wrong if one of the files is missing.

this patch explicitly bypasses the test if the "older" file is missing.

paul
This commit is contained in:
Eric Andersen 2003-12-19 23:59:04 +00:00
parent 21a6d6102a
commit 0af92f5e6f
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
make/sed.mk
View File

@ -50,12 +50,13 @@ $(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY) build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
@if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \ @if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \
rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi; rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi;
@if [ $(STAGING_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \ @if [ ! -f $(STAGING_DIR)/$(SED_TARGET_BINARY) -o $(STAGING_DIR)/$(SED_TARGET_BINARY) \
set -x; \ -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \ set -x; \
mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \
rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
use-sed-host-binary: use-sed-host-binary:
@if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \ @if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \
@ -113,12 +114,14 @@ $(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
sed-target_binary: $(SED_DIR2)/$(SED_BINARY) sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \ @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \
rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi; rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi;
@if [ $(TARGET_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
set -x; \ @if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \ -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \ set -x; \
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi
sed: uclibc sed-target_binary sed: uclibc sed-target_binary