external/firebird/ExternalProject_firebird.mk | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 64ccdbe5060986feda35d035012b1ed1016139a7
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Wed Aug 17 17:25:49 2016 +0200
fixup firebird with internal icu: link time
Let us see whether firebird uses LDFLAGS on MacOSX now...
Change-Id: If1a2d1f11f1c17d8e4cc21f0bae87ec042333e8e
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 670041b..11a289b 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -35,7 +35,6 @@ MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/plugins/libEngine12.dylib
\
$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/lib/libfbclient.dylib.3.0.0)
-# do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
$(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
@@ -53,7 +52,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,icu)/source
\
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/common \
- -L$(call
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
&& export CXXFLAGS=" \
@@ -65,15 +63,22 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,icu)/source
\
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/common \
- -L$(call
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath)
\
) \
" \
+ && export LDFLAGS=" \
+ $(if $(SYSTEM_ICU),$(ICU_LIBS), \
+ -L$(call
gb_UnpackedTarball_get_dir,icu)/source/lib \
+ ) \
+ " \
$(if $(filter MACOSX,$(OS)), \
&& export DYLD_LIBRARY_PATH="$(call
gb_UnpackedTarball_get_dir,icu)/source/lib" \
)\
+ $(if $(filter-out WNT MACOSX IOS,$(OS)), \
+ && export LD_LIBRARY_PATH="$(call
gb_UnpackedTarball_get_dir,icu)/source/lib" \
+ )\
&& MAKE=$(MAKE) ./configure \
--without-editline \
--without-fbsample --without-fbsample-db \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
