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

[Stephan Bergmann]

 external/firebird/ExternalProject_firebird.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 15f92676f74d58b0af8578d6c45d0faa3de19164
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 14 16:18:49 2016 +0200

    external/firebird: Hack around detection of clock_gettime on Mac OS X
    
    ...where the 10.12 SDK includes clock_gettime, marked as
    
      __attribute__((availability(macosx,introduced=10.12)))
    
    in time.h.  However, the way firebird's configure checks for it, it gets
    detected as available regardless of the used -mmacosx-version-min value (and
    even if the configure check would go via the time.h header, the availability
    attribute would only cause a -Wpartial-availability warning, not an error, so
    we'd need to pass CFLAGS=-Werror=partial-availability into firebird's
    configure.)
    
    Change-Id: I67e12743e1df0574e7fc4b2121add9fe1fb7677b

diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 2fe2e8bc..09c4463 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -86,6 +86,11 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			, \
 				--enable-shared --disable-static \
 			) \
+			$(if $(filter MACOSX,$(OS)), \
+				$(if $(filter 1, \
+						$(shell expr '$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
+							'<' 101200)), \
+					ac_cv_func_clock_gettime=no)) \
 		&& if [ -n "$${FB_CPU_ARG}" ]; then \
 			   $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)' $(MAKE_POST); \
 			else \