diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2016-01-29 13:29:19 +0100 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-01-30 01:30:03 +0000 |
commit | 9784ff3d878eaa21491fbd779e57d7d4710f5449 (patch) | |
tree | e01efbd939c3b98d64753e219018a2b30c1ae5d9 /external/firebird | |
parent | 1296f9dc9e502abd8422dfeee1ac7747a82aee17 (diff) |
new upstream version Firebird 2.5.5
Change-Id: I89e30eb340d84c942046a18e6f4acc7fb376def6
Reviewed-on: https://gerrit.libreoffice.org/21904
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'external/firebird')
-rw-r--r-- | external/firebird/ExternalPackage_firebird.mk | 4 | ||||
-rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 2 | ||||
-rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
-rw-r--r-- | external/firebird/firebird-c++11.patch.1 | 214 | ||||
-rw-r--r-- | external/firebird/firebird-c++11replfn.patch.0 | 50 | ||||
-rw-r--r-- | external/firebird/firebird-cygwin-msvc.patch.1 | 31 | ||||
-rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 54 |
7 files changed, 28 insertions, 328 deletions
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 3b921edfada3..6e757d8d9744 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -14,9 +14,9 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) ifeq ($(OS)-$(COM),WNT-MSC) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.4)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.5)) else ifeq ($(DISABLE_DYNLOADING),) -$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.4)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.5)) endif $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/firebird/firebird.msg)) diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 8d09a255ba4d..353786a83a93 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -63,6 +63,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(MAKE) CPU=$(PARALLELISM) 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.4) \ + $(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 9701fc2f0108..d04a350a66c2 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0)) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-rpath.patch.0 \ external/firebird/firebird-c++11.patch.1 \ - external/firebird/firebird-c++11replfn.patch.0 \ external/firebird/firebird.disable-ib-util-not-found.patch.1 \ external/firebird/firebird-c++14.patch \ )) diff --git a/external/firebird/firebird-c++11.patch.1 b/external/firebird/firebird-c++11.patch.1 index 289057766016..8f22616862e0 100644 --- a/external/firebird/firebird-c++11.patch.1 +++ b/external/firebird/firebird-c++11.patch.1 @@ -14,163 +14,6 @@ blr_eoc }; static FB_API_HANDLE req_handle; ---- firebird/src/gpre/c_cxx.cpp -+++ firebird/src/gpre/c_cxx.cpp -@@ -876,7 +876,7 @@ - if (based_on->bas_flags & BAS_segment) - { - if (*variable != '*') -- fprintf(gpreGlob.out_file, "[%"SLONGFORMAT"]", length); -+ fprintf(gpreGlob.out_file, "[%" SLONGFORMAT "]", length); - } - else if (field->fld_array_info) - { -@@ -885,7 +885,7 @@ - for (const dim* dimension = field->fld_array_info->ary_dimension; - dimension; dimension = dimension->dim_next) - { -- fprintf(gpreGlob.out_file, " [%"SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1); -+ fprintf(gpreGlob.out_file, " [%" SLONGFORMAT "]", dimension->dim_upper - dimension->dim_lower + 1); - } - - if (field->fld_array_info->ary_dtype <= dtype_varying && field->fld_length > 1) -@@ -1577,7 +1577,7 @@ - const gpre_dbb* db = (gpre_dbb*) action->act_object; - align(column); - -- fprintf(gpreGlob.out_file, "isc_drop_database (%s, %"SIZEFORMAT", \"%s\", rdb$k_db_type_gds);", -+ fprintf(gpreGlob.out_file, "isc_drop_database (%s, %" SIZEFORMAT ", \"%s\", rdb$k_db_type_gds);", - status_vector(action), - strlen(db->dbb_filename), db->dbb_filename); - set_sqlcode(action, column); -@@ -3471,7 +3471,7 @@ - - static void gen_type( const act* action, int column) - { -- printa(column, "%"SLONGFORMAT, (SLONG)(IPTR)action->act_object); -+ printa(column, "%" SLONGFORMAT, (SLONG)(IPTR)action->act_object); - } - - -@@ -3623,7 +3623,7 @@ - for (const dim* dimension = field->fld_array_info->ary_dimension; dimension; - dimension = dimension->dim_next) - { -- fprintf(gpreGlob.out_file, " [%"SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1); -+ fprintf(gpreGlob.out_file, " [%" SLONGFORMAT "]", dimension->dim_upper - dimension->dim_lower + 1); - } - - if (field->fld_array_info->ary_dtype <= dtype_varying) ---- firebird/src/gpre/exp.cpp -+++ firebird/src/gpre/exp.cpp -@@ -398,7 +398,7 @@ - if (gpreGlob.token_global.tok_type != tok_number) - CPR_s_error("<number>"); - -- const char format[8] = "%"SQUADFORMAT; -+ const char format[8] = "%" SQUADFORMAT; - SINT64 n; - sscanf(gpreGlob.token_global.tok_string, format, &n); - -@@ -428,7 +428,7 @@ - - const SLONG n = atoi(gpreGlob.token_global.tok_string); - char buffer[32]; -- sprintf(buffer, "%"SLONGFORMAT, n); -+ sprintf(buffer, "%" SLONGFORMAT, n); - if (strcmp(buffer, gpreGlob.token_global.tok_string) != 0) - PAR_error("Numeric value out of range"); - -@@ -478,7 +478,7 @@ - - const ULONG n = atoi(gpreGlob.token_global.tok_string); - char buffer[32]; -- sprintf(buffer, "%"ULONGFORMAT, n); -+ sprintf(buffer, "%" ULONGFORMAT, n); - if (strcmp(buffer, gpreGlob.token_global.tok_string) != 0) - PAR_error("Numeric value out of range"); - ---- firebird/src/gpre/gpre.cpp -+++ firebird/src/gpre/gpre.cpp -@@ -2525,9 +2525,9 @@ - if (line_pending) - { - if (line == 1) -- fprintf(gpreGlob.out_file, "#line %"SLONGFORMAT" \"%s\"\n", line, backlash_fixed_file_name); -+ fprintf(gpreGlob.out_file, "#line %" SLONGFORMAT " \"%s\"\n", line, backlash_fixed_file_name); - else -- fprintf(gpreGlob.out_file, "\n#line %"SLONGFORMAT" \"%s\"", line, backlash_fixed_file_name); -+ fprintf(gpreGlob.out_file, "\n#line %" SLONGFORMAT " \"%s\"", line, backlash_fixed_file_name); - - line_pending = false; - } -@@ -2668,7 +2668,7 @@ - { - if (c == '\n' && line_pending) - { -- fprintf(gpreGlob.out_file, "\n#line %"SLONGFORMAT" \"%s\"", line + 1, backlash_fixed_file_name); -+ fprintf(gpreGlob.out_file, "\n#line %" SLONGFORMAT " \"%s\"", line + 1, backlash_fixed_file_name); - line_pending = false; - } - if (c == EOF) ---- firebird/src/gpre/int_cxx.cpp -+++ firebird/src/gpre/int_cxx.cpp -@@ -290,7 +290,7 @@ - fprintf(gpreGlob.out_file, "if (!%s)", request->req_handle); - align(column); - fprintf(gpreGlob.out_file, -- "%s = CMP_compile2 (tdbb, (UCHAR*) jrd_%"ULONGFORMAT", sizeof(jrd_%"ULONGFORMAT"), true);", -+ "%s = CMP_compile2 (tdbb, (UCHAR*) jrd_%" ULONGFORMAT ", sizeof(jrd_%" ULONGFORMAT "), true);", - request->req_handle, request->req_ident, request->req_ident); - } - -@@ -478,7 +478,7 @@ - { - - fprintf(gpreGlob.out_file, -- "EXE_receive (tdbb, %s, %d, %d, (UCHAR*) &jrd_%"ULONGFORMAT");", -+ "EXE_receive (tdbb, %s, %d, %d, (UCHAR*) &jrd_%" ULONGFORMAT ");", - request->req_handle, port->por_msg_number, port->por_length, - port->por_ident); - } -@@ -495,7 +495,7 @@ - if (!(request->req_flags & REQ_exp_hand)) - fprintf(gpreGlob.out_file, "static void\t*%s;\t// request handle \n", request->req_handle); - -- fprintf(gpreGlob.out_file, "static const UCHAR\tjrd_%"ULONGFORMAT" [%d] =", -+ fprintf(gpreGlob.out_file, "static const UCHAR\tjrd_%" ULONGFORMAT " [%d] =", - request->req_ident, request->req_length); - align(INDENT); - fprintf(gpreGlob.out_file, "{\t// blr string \n"); -@@ -588,7 +588,7 @@ - } - align(column); - -- fprintf(gpreGlob.out_file, "EXE_send (tdbb, %s, %d, %d, (UCHAR*) &jrd_%"ULONGFORMAT");", -+ fprintf(gpreGlob.out_file, "EXE_send (tdbb, %s, %d, %d, (UCHAR*) &jrd_%" ULONGFORMAT ");", - request->req_handle, port->por_msg_number, port->por_length, port->por_ident); - } - -@@ -716,7 +716,7 @@ - fprintf(gpreGlob.out_file, fmtstr, reference->ref_ident, name); - } - align(column); -- fprintf(gpreGlob.out_file, "} jrd_%"ULONGFORMAT";", port->por_ident); -+ fprintf(gpreGlob.out_file, "} jrd_%" ULONGFORMAT ";", port->por_ident); - } - - ---- firebird/src/gpre/pat.cpp -+++ firebird/src/gpre/pat.cpp -@@ -417,7 +417,7 @@ - } - } - else if (long_flag) { -- sprintf(p, "%"SLONGFORMAT, long_value); -+ sprintf(p, "%" SLONGFORMAT , long_value); - } - else { - sprintf(p, "%d", value); --- firebird/src/gpre/sqe.cpp +++ firebird/src/gpre/sqe.cpp @@ -2529,7 +2529,7 @@ @@ -182,60 +25,3 @@ MSC_match(KW_PLUS); ---- firebird/src/common/classes/alloc.cpp -+++ firebird/src/common/classes/alloc.cpp -@@ -1100,7 +1100,7 @@ - if (blk->mbk_flags & MBK_LAST) - break; - } -- fprintf(file, "Blocks %"SIZEFORMAT" min %"SIZEFORMAT" max %"SIZEFORMAT" size %"SIZEFORMAT" \n\n", -+ fprintf(file, "Blocks %" SIZEFORMAT " min %" SIZEFORMAT " max %" SIZEFORMAT " size %" SIZEFORMAT " \n\n", - cnt, min, max, sum); - } - -@@ -1303,7 +1303,7 @@ - FreeMemoryBlock* freeBlock = blockToPtr<FreeMemoryBlock*>(blk); - freeBlock->fbk_next_fragment = NULL; - -- BlockInfo temp = {blockLength, freeBlock}; -+ BlockInfo temp = {static_cast<size_t>(blockLength), freeBlock}; - pool->freeBlocks.add(temp); - if (!pool->parent_redirect) - { ---- firebird/src/common/cvt.cpp -+++ firebird/src/common/cvt.cpp -@@ -144,7 +144,7 @@ - - #ifndef NATIVE_QUAD - #ifndef WORDS_BIGENDIAN --static const SQUAD quad_min_int = { 0, SLONG_MIN }; -+static const SQUAD quad_min_int = { 0, static_cast<ULONG>(SLONG_MIN) }; - static const SQUAD quad_max_int = { -1, SLONG_MAX }; - #else - static const SQUAD quad_min_int = { SLONG_MIN, 0 }; ---- firebird/src/jrd/perf.cpp -+++ firebird/src/jrd/perf.cpp -@@ -164,20 +164,20 @@ - case 'b': - case 'c': - case 'x': -- sprintf(p, "%"SQUADFORMAT, delta); -+ sprintf(p, "%" SQUADFORMAT , delta); - while (*p) - p++; - break; - - case 'u': - case 's': -- sprintf(p, "%"SQUADFORMAT".%.2"SQUADFORMAT, delta / TICK, (delta % TICK) * 100 / TICK); -+ sprintf(p, "%" SQUADFORMAT ".%.2" SQUADFORMAT , delta / TICK, (delta % TICK) * 100 / TICK); - while (*p) - p++; - break; - - case 'e': -- sprintf(p, "%"SQUADFORMAT".%.2"SQUADFORMAT, delta / 100, delta % 100); -+ sprintf(p, "%" SQUADFORMAT ".%.2" SQUADFORMAT , delta / 100, delta % 100); - while (*p) - p++; - break; diff --git a/external/firebird/firebird-c++11replfn.patch.0 b/external/firebird/firebird-c++11replfn.patch.0 deleted file mode 100644 index 53b1dd0d045c..000000000000 --- a/external/firebird/firebird-c++11replfn.patch.0 +++ /dev/null @@ -1,50 +0,0 @@ ---- src/common/classes/alloc.h -+++ src/common/classes/alloc.h -@@ -489,23 +489,7 @@ - inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; } - - // Global versions of operators new and delete --inline void* operator new(size_t s) THROW_BAD_ALLOC --{ -- return Firebird::MemoryPool::globalAlloc(s); --} --inline void* operator new[](size_t s) THROW_BAD_ALLOC --{ -- return Firebird::MemoryPool::globalAlloc(s); --} - --inline void operator delete(void* mem) throw() --{ -- Firebird::MemoryPool::globalFree(mem); --} --inline void operator delete[](void* mem) throw() --{ -- Firebird::MemoryPool::globalFree(mem); --} - - #ifdef DEBUG_GDS_ALLOC - inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line) ---- src/common/classes/alloc.cpp -+++ src/common/classes/alloc.cpp -@@ -2080,3 +2080,21 @@ - #endif - - } // namespace Firebird -+ -+void* operator new(size_t s) THROW_BAD_ALLOC -+{ -+ return Firebird::MemoryPool::globalAlloc(s); -+} -+void* operator new[](size_t s) THROW_BAD_ALLOC -+{ -+ return Firebird::MemoryPool::globalAlloc(s); -+} -+ -+void operator delete(void* mem) throw() -+{ -+ Firebird::MemoryPool::globalFree(mem); -+} -+void operator delete[](void* mem) throw() -+{ -+ Firebird::MemoryPool::globalFree(mem); -+} diff --git a/external/firebird/firebird-cygwin-msvc.patch.1 b/external/firebird/firebird-cygwin-msvc.patch.1 index 653360cd262b..565e178a156f 100644 --- a/external/firebird/firebird-cygwin-msvc.patch.1 +++ b/external/firebird/firebird-cygwin-msvc.patch.1 @@ -302,10 +302,10 @@ diff -ur firebird.org/builds/posix/prefix.mingw firebird/builds/posix/prefix.min # # -Wno-unused-variable is used due to unused gpre generated variables --PROD_FLAGS=-O2 -march=i586 -DMINGW -mno-cygwin -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads --DEV_FLAGS=-ggdb -march=i586 -DMINGW -mno-cygwin -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads -+PROD_FLAGS=-O2 -march=i586 -DMINGW -mno-cygwin -Wall -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads -+DEV_FLAGS=-ggdb -march=i586 -DMINGW -mno-cygwin -Wall -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads +-PROD_FLAGS=-O2 -march=i586 -DMINGW -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads +-DEV_FLAGS=-ggdb -march=i586 -DMINGW -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads ++PROD_FLAGS=-O2 -march=i586 -DMINGW -Wall -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads ++DEV_FLAGS=-ggdb -march=i586 -DMINGW -Wall -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads PLATFORM_PATH=os/win32 @@ -338,15 +338,6 @@ diff -ur firebird.org/builds/posix/prefix.mingw firebird/builds/posix/prefix.min diff -ur firebird.org/configure firebird/configure --- firebird.org/configure 2015-07-30 18:57:33.826760500 +0200 +++ firebird/configure 2015-07-30 19:29:23.873496600 +0200 -@@ -2878,7 +2878,7 @@ - SHRLIB_EXT=so - ;; - -- *-*-mingw*) -+ *-*-mingw* | *-*-cygwin*) - MAKEFILE_PREFIX=mingw - PLATFORM=win32 - @@ -9016,6 +9016,9 @@ mingw*) opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp @@ -476,20 +467,6 @@ diff -ur firebird.org/src/jrd/isc.cpp firebird/src/jrd/isc.cpp #include <windows.h> #include <aclapi.h> #include <lmcons.h> -diff -ur firebird.org/src/jrd/os/win32/mod_loader.cpp firebird/src/jrd/os/win32/mod_loader.cpp ---- firebird.org/src/jrd/os/win32/mod_loader.cpp 2015-07-30 18:57:24.014278400 +0200 -+++ firebird/src/jrd/os/win32/mod_loader.cpp 2015-07-30 19:29:44.029786700 +0200 -@@ -95,6 +95,10 @@ - "msvcr90.dll", - #elif _MSC_VER == 1600 - "msvcr100.dll", -+#elif _MSC_VER == 1700 -+ "msvcr110.dll", -+#elif _MSC_VER == 1800 -+ "mscvr120.dll", - #else - #error Specify CRT DLL name here ! - #endif diff -ur firebird.org/src/misc/makeHeader.cpp firebird/src/misc/makeHeader.cpp --- firebird.org/src/misc/makeHeader.cpp 2015-07-30 18:57:26.498503700 +0200 +++ firebird/src/misc/makeHeader.cpp 2015-07-30 19:29:24.279812900 +0200 diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1 index 8a492898f96e..b9473734a6f6 100644 --- a/external/firebird/firebird-macosx.patch.1 +++ b/external/firebird/firebird-macosx.patch.1 @@ -27,15 +27,6 @@ PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target -@@ -57,7 +57,7 @@ - - LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS) - --LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\ -+LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\ - $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME) - - ifeq (@VOID_PTR_SIZE@,8) 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 @@ -67,47 +58,44 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix. +++ firebird/builds/posix/prefix.darwin_i386 @@ -24,7 +24,7 @@ # 4. for CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386' - # 5. export MACOSX_DEPLOYMENT_TARGET=10.6 + # 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.6 -@@ -32,9 +32,9 @@ + 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.6 --DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6 --CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak -+PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -+CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden - EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr - CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \ - fbtracemgr +-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.6 + # Default build from 10.7 using Clang -DYLD_LIBRARY_PATH=$(FIREBIRD)/lib +DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH) export DYLD_LIBRARY_PATH - MACOSX_DEPLOYMENT_TARGET=10.6 -@@ -27,9 +27,9 @@ + MACOSX_DEPLOYMENT_TARGET=10.7 +@@ -27,8 +27,8 @@ OS_ServerFiles=inet_server.cpp --PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6 --DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6 --CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak -+PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -+CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden - EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr - CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \ - fbtracemgr +-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 + |