shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix build under Estonian locale"

--- a/build/make/gen_asm_deps.sh

+++ b/build/make/gen_asm_deps.sh

@@ -42,7 +42,7 @@

 [ -n "$srcfile" ] || show_help

 sfx=${sfx:-asm}

-includes=$(egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |

+includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |

            perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")

 #" restore editor state

 for inc in ${includes}; do

--- a/libs.mk

+++ b/libs.mk

@@ -285,17 +285,17 @@

 ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC))

     $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S

-	grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@

+	LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@

     $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S: $(VP8_PREFIX)common/asm_com_offsets.c

     CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S

     $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S

-	grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@

+	LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@

     $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S: $(VP8_PREFIX)encoder/asm_enc_offsets.c

     CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S

     $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S

-	grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@

+	LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@

     $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S: $(VP8_PREFIX)decoder/asm_dec_offsets.c

     CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S

 else

-- 

⑨