diff options
Diffstat (limited to 'external/firebird/firebird-macosx.patch.1')
| -rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 185 |
1 files changed, 116 insertions, 69 deletions
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1 index b9473734a6f6..75f86e238bc0 100644 --- a/external/firebird/firebird-macosx.patch.1 +++ b/external/firebird/firebird-macosx.patch.1 @@ -1,35 +1,46 @@ -# -*- Mode: Diff -*- ---- firebird.org/builds/posix/darwin.defaults -+++ firebird/builds/posix/darwin.defaults -@@ -32,17 +32,17 @@ - LINK_EMPTY_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/empty.darwin.vers - LINK_FIREBIRD_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.vers - --LIB_LINK_RPATH:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Libraries/ --LIB_EMBED_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird --LIB_CLIENT_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird --FBEMBED_LINK:=-F../gen/firebird -framework Firebird -L$(LIB) -lfbembed $(ICU_LIBS) -+LIB_LINK_RPATH:= -+LIB_EMBED_LINK_OPTIONS:=-install_name @__________________________________________________OOO/libfbembed.dylib -+LIB_CLIENT_LINK_OPTIONS:= -+FBEMBED_LINK:=-L$(LIB) -lfbembed $(ICU_LIBS) - PLATFORM_FALLBACK=os/posix - --PLAT_CLASSIC_PRE_TARGET=darwin_setup_framework --PLAT_CLASSIC_POST_TARGET=darwin_finish_cs_framework -+PLAT_CLASSIC_PRE_TARGET= -+PLAT_CLASSIC_POST_TARGET= - --PLAT_SUPER_PRE_TARGET=darwin_setup_framework --PLAT_SUPER_POST_TARGET=darwin_finish_ss_framework -+PLAT_SUPER_PRE_TARGET= -+PLAT_SUPER_POST_TRAGET= - - PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target - -diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin ---- firebird.org/builds/posix/postfix.darwin 2013-07-12 20:55:46.000000000 +0200 -+++ firebird/builds/posix/postfix.darwin 2013-07-15 12:07:36.000000000 +0200 +--- firebird.org/extern/cloop/src/tests/test1/CTest.c 2016-08-01 22:55:35.000000000 +0200 ++++ firebird/extern/cloop/src/tests/test1/CTest.c 2016-08-02 21:11:31.000000000 +0200 +@@ -20,7 +20,7 @@ + */ + + #include "CalcCApi.h" +-#include <malloc.h> ++#include <stdlib.h> + #include <stdio.h> + + #ifdef WIN32 +--- firebird.org/builds/posix/prefix.darwin_x86_64 2016-08-01 20:02:48.000000000 +0200 ++++ firebird/builds/posix/prefix.darwin_x86_64 2016-08-01 21:42:45.000000000 +0200 +@@ -19,7 +19,7 @@ + # + # Default build from 10.7 using Clang + +-DYLD_LIBRARY_PATH=$(HOME)/icu54/icu/source/lib ++DYLD_LIBRARY_PATH:=$(HOME)/icu54/icu/source/lib:$(DYLD_LIBRARY_PATH) + export DYLD_LIBRARY_PATH + + #DYLD_PRINT_ENV=1 +@@ -31,15 +31,15 @@ + MACOSX_DEPLOYMENT_TARGET=10.7 + export MACOSX_DEPLOYMENT_TARGET + +-PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=10.7 +-DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.7 -Wno-non-virtual-dtor ++PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common ++DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor + CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden + + EXE_LINK_OPTIONS:= + UNDEF_PLATFORM= + + LINK_LIBS+=-liconv +-MATHLIB=/opt/local/lib/libtommath.a ++MATHLIB=-ltommath + SO_LINK_LIBS+=-liconv + + include $(ROOT)/gen/darwin.defaults +--- firebird.org/builds/posix/postfix.darwin 2016-08-01 20:02:48.000000000 +0200 ++++ firebird/builds/posix/postfix.darwin 2016-08-01 22:17:49.000000000 +0200 @@ -54,9 +54,9 @@ cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird @@ -37,9 +48,9 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix. - cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib - cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib - cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib -+ #cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib -+ #cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib -+ #cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib ++# cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib ++# cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib ++# cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib cp ../gen/firebird/firebird.msg \ $(FB_FW)/Resources/English.lproj/var/firebird.msg @@ -54,48 +65,84 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix. cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var mkdir -p $(FB_FW)/Resources/doc ---- firebird.org/builds/posix/prefix.darwin_i386 -+++ firebird/builds/posix/prefix.darwin_i386 -@@ -24,7 +24,7 @@ +--- firebird.org/builds/posix/prefix.darwin_i386 2016-08-01 22:55:34.000000000 +0200 ++++ firebird/builds/posix/prefix.darwin_i386 2016-08-01 23:02:46.000000000 +0200 +@@ -26,14 +26,14 @@ # 4. for CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386' - # 5. export MACOSX_DEPLOYMENT_TARGET=10.7 + # 5. export MACOSX_DEPLOYMENT_TARGET=10.7 -DYLD_LIBRARY_PATH=$(FIREBIRD)/lib +DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH) export DYLD_LIBRARY_PATH MACOSX_DEPLOYMENT_TARGET=10.7 -@@ -34,8 +34,8 @@ - - OS_ServerFiles=inet_server.cpp - --PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.7 --DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.7 -+PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 - CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden - EMBED_UTIL_TARGETS=gstat gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr - CLIENT_UTIL_TARGETS=gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr fbtracemgr ---- firebird.org/builds/posix/prefix.darwin_x86_64 -+++ firebird/builds/posix/prefix.darwin_x86_64 -@@ -19,7 +19,7 @@ - # - # Default build from 10.7 using Clang + export MACOSX_DEPLOYMENT_TARGET --DYLD_LIBRARY_PATH=$(FIREBIRD)/lib -+DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH) - export DYLD_LIBRARY_PATH +-PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.7 +-DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.7 -Wno-non-virtual-dtor ++PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386 ++DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 -Wno-non-virtual-dtor + CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak - MACOSX_DEPLOYMENT_TARGET=10.7 -@@ -27,8 +27,8 @@ + EXE_LINK_OPTIONS:=-m32 +--- firebird.org/builds/posix/Makefile.in 2016-08-08 17:58:20.000000000 +0200 ++++ firebird/builds/posix/Makefile.in 2016-08-08 17:57:17.000000000 +0200 +@@ -191,6 +191,9 @@ + $(MAKE) plugins + $(MAKE) examples + $(MAKE) rest ++ install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.3.0.0 $(LIB)/libfbclient.dylib ++ install_name_tool -id @__________________________________________________OOO/libEngine12.dylib $(PLUGINS)/libEngine12.dylib ++ install_name_tool -change $(LIB)/libfbclient.dylib.3.0.0 @loader_path/libfbclient.dylib.3.0.0 $(PLUGINS)/libEngine12.dylib - OS_ServerFiles=inet_server.cpp --PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=10.7 --DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.7 -+PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -+DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall - CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden - EMBED_UTIL_TARGETS=gstat gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr - CLIENT_UTIL_TARGETS=gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr fbtracemgr - + cross_process: +--- 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 @@ + #elif defined(DARWIN) + //const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib"; + //const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib"; +-const char* const inTemplate = "libicui18n.dylib"; +-const char* const ucTemplate = "libicuuc.dylib"; ++const char* const inTemplate = "libicui18n.dylib.%s"; ++const char* const ucTemplate = "libicuuc.dylib.%s"; + #elif defined(HPUX) + const char* const inTemplate = "libicui18n.sl.%s"; + const char* const ucTemplate = "libicuuc.sl.%s"; +@@ -353,6 +353,12 @@ + s.printf("%d%d", majorVersion, minorVersion); + + filename.printf(templateName, s.c_str()); ++ const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB"); ++ if(envpath != nullptr) ++ { ++ s = filename.c_str(); ++ PathUtils::concatPath(filename, envpath, s.c_str()); ++ } + } + + +--- firebird.org/src/common/utils.cpp 2016-08-16 10:11:10.000000000 +0200 ++++ firebird/src/common/utils.cpp 2016-08-16 11:27:09.000000000 +0200 +@@ -1027,10 +1027,18 @@ + return s; + } + +- // Set relative path to Engine12 dynamic library ++ // Set path to Engine12 dynamic library. + if(prefType == Firebird::IConfigManager::DIR_PLUGINS) + { +- s = name; ++ const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB"); ++ if(envpath != nullptr) ++ { ++ PathUtils::concatPath(s, envpath, name); ++ } ++ else ++ { ++ s = name; ++ } + return s; + } + } |