diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-12 09:25:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-12 09:25:27 +0100 |
| commit | 69632c9c3291a7bb9d465495943aa1dbe12c5af2 (patch) | |
| tree | 8d812de9c8ed5079a758a8010a4392e93f211458 /external/firebird/firebird-macosx.patch.1 | |
| parent | cppcheck: Variable 'bOutlMode' is assigned a value that is never used (diff) | |
| download | core-69632c9c3291a7bb9d465495943aa1dbe12c5af2.tar.gz core-69632c9c3291a7bb9d465495943aa1dbe12c5af2.zip | |
Revert "Update firebird to version 2.5.4"
This reverts commit e63673f8991492aaf814665f58435bc6884ca06d.
Diffstat (limited to 'external/firebird/firebird-macosx.patch.1')
| -rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1 index 8a492898f96e..42007d50a38f 100644 --- a/external/firebird/firebird-macosx.patch.1 +++ b/external/firebird/firebird-macosx.patch.1 @@ -21,7 +21,7 @@ +PLAT_CLASSIC_POST_TARGET= -PLAT_SUPER_PRE_TARGET=darwin_setup_framework --PLAT_SUPER_POST_TARGET=darwin_finish_ss_framework +-PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework +PLAT_SUPER_PRE_TARGET= +PLAT_SUPER_POST_TRAGET= @@ -65,7 +65,7 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix. mkdir -p $(FB_FW)/Resources/doc --- firebird.org/builds/posix/prefix.darwin_i386 +++ firebird/builds/posix/prefix.darwin_i386 -@@ -24,7 +24,7 @@ +@@ -19,7 +19,7 @@ # 4. for CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386' # 5. export MACOSX_DEPLOYMENT_TARGET=10.6 @@ -74,19 +74,17 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix. export DYLD_LIBRARY_PATH MACOSX_DEPLOYMENT_TARGET=10.6 -@@ -32,9 +32,9 @@ +@@ -32,8 +32,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 + CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak 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 --- firebird.org/builds/posix/prefix.darwin_x86_64 +++ firebird/builds/posix/prefix.darwin_x86_64 @@ -19,7 +19,7 @@ |