external/firebird/ExternalProject_firebird.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 75530a7bbffbfd911f3481d5e0127da877da36b0
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Mar 22 14:41:44 2017 +0100
Fix building external/firebird with arbitrary locales
At least on Linux, building it with LANG=tr_TR.UTF-8 failed for me with
...
> make[5]: Entering directory '.../workdir/UnpackedTarball/firebird/gen'
> rm -f metadata.fdb
> .../workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql -q -i
.../workdir/UnpackedTarball/firebird/src/dbs/metadata.sql
> .../workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/gfix -mode
read_only metadata.fdb
> .../workdir/UnpackedTarball/firebird/gen/Debug/firebird/databases.conf:
illegal line <employee.fdb = $(dir_sampleDb)/employee.fdb>
> Makefile:325: recipe for target 'metadata.fdb' failed
> make[5]: *** [metadata.fdb] Segmentation fault
> make[5]: *** Deleting file 'metadata.fdb'
> make[5]: Leaving directory '.../workdir/UnpackedTarball/firebird/gen'
> Makefile:166: recipe for target 'master_process' failed
...
Change-Id: I1784aaa790e527d382e8449f8007b0ae2dc14698
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 762e94de8fb4..361fffc86c64 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -26,7 +26,7 @@ ifneq ($(OS),WNT)
INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
endif
-MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)
+MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib) LC_ALL=C
MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl
OOO \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
