mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

external/firebird: Use gb_Helper_extend_ld_path to add icu dir

Browse Source 
Change-Id: If51813fc559a78a54ae5dcae4b8b9213c5e1bae6
Reviewed-on: https://gerrit.libreoffice.org/29215
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2016-09-23 10:58:54 +02:00
parent b316edff1b
commit 3ed5847c3e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/firebird/ExternalProject_firebird.mk vendored
View File

@ -26,9 +26,7 @@ ifneq ($(OS),WNT)
INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
endif
MAKE_PRE=$(if $(filter WNT,$(OS)),\
PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
$(gb_Helper_set_ld_path))
MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)
MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
@ -75,7 +73,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
&& export $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \