diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-06 20:37:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-07 20:09:00 +0100 |
| commit | 6998eacf542e6d6d9ec587aff3a38c3644e83c7f (patch) | |
| tree | 8c8487c81a3b254d44f390ec91e2e361b41df500 /external | |
| parent | f8b9b5454d34f87e5402d5799cf1fb02ab31294d (diff) | |
firebird: set -mmacosx-version-min to 10.15
Building on macOS Sonoma fails when this flag is set to 10.9 or
is unset. But setting this flag to 10.15 which matches the lowest
-mmacosx-version-min that LibreOffice builds with on Mac Intel
avoids all of the new deprecation warnings that turn into errors
that started with Xcode 14.
Also, fix runtime failure, at least on macOS, when the firebird
build runs the isql command by adding $(firebird_BUILDDIR)/lib to
LIBO_TUNNEL_LIBRARY_PATH.
Change-Id: Id77d2949f56ecc63dfb085f762acf2c1cc081060
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161727
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plubius@libreoffice.org>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 2 | ||||
| -rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 5b39fd82b1e3..09c5bbd69272 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -88,7 +88,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): && LC_ALL=C $(MAKE) \ $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \ MATHLIB="$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \ - LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)))' \ + LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)$(call gb_Helper_extend_ld_path,$(firebird_BUILDDIR)/lib)))' \ $(if $(filter MACOSX,$(OS)), \ && install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.$(firebird_VERSION) \ -delete_rpath @loader_path/.. \ diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1 index c9c41c000c65..a9877b98fd43 100644 --- a/external/firebird/firebird-macosx.patch.1 +++ b/external/firebird/firebird-macosx.patch.1 @@ -21,6 +21,21 @@ #DYLD_PRINT_ENV=1 #export DYLD_PRINT_ENV +@@ -36,11 +33,11 @@ + #DYLD_PRINT_LIBRARIES=1 + #export DYLD_PRINT_LIBRARIES + +-MACOSX_DEPLOYMENT_TARGET=10.9 ++MACOSX_DEPLOYMENT_TARGET=10.15 + export MACOSX_DEPLOYMENT_TARGET + +-PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=10.9 +-DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.9 -Wno-non-virtual-dtor ++PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=10.15 ++DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.15 -Wno-non-virtual-dtor + CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -stdlib=libc++ -msse4 + + UNDEF_PLATFORM= --- firebird.org/src/common/unicode_util.cpp 2016-07-07 13:55:55.992234709 +0200 +++ firebird/src/common/unicode_util.cpp 2016-08-10 11:25:46.422331020 +0200 @@ -63,8 +63,8 @@ |