[Libreoffice-commits] core.git: external/firebird

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |   29 +++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 198f20238330e60172f67e9c6a21aeefc50136c4
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Feb 4 01:21:09 2016 +0100

    firebird: avoid using ignored -m option to make
    
    Change-Id: Ic24c295a84f402ec5478bafbdebc54f976b1a72c
    Reviewed-on: https://gerrit.libreoffice.org/22092
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 6aa992f..cd89dfb 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -25,19 +25,22 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
 # note: this can intentionally only build against internal tommath
 
 ifneq ($(OS),WNT)
-SET_FCA=&& FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))'
+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_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5)
+
 # 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 \
-		$(SET_FCA) \
-		&& if [ -n "$${FB_CPU_ARG}" ]; then \
-		  FB_PRLL_ARG="CPU=\$$(EMPTY) $${FB_CPU_ARG}"; \
-		else \
-		  FB_PRLL_ARG="-m"; \
-		fi \
+		&& FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \
 		&& export PKG_CONFIG="" \
 		&& export CPPFLAGS=" \
 			$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \
@@ -67,12 +70,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			, \
 				--enable-shared --disable-static \
 			) \
-		&& $(if $(filter WNT,$(OS)),\
-			   PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
-			   $(gb_Helper_set_ld_path)) \
-		   $(MAKE) "$${FB_PRLL_ARG}" SHELL='$(SHELL)' firebird_embedded \
-		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
-			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
-			$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5) \
+		&& if [ -n "$${FB_CPU_ARG}" ]; then \
+			   $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)' firebird_embedded $(MAKE_POST); \
+			else \
+			   $(MAKE_PRE) $(MAKE) SHELL='$(SHELL)' firebird_embedded $(MAKE_POST); \
+			fi \
 	)
 # vim: set noet sw=4 ts=4: