From: <ale...@us...> - 2010-06-09 08:37:31
|
Revision: 51233 http://firebird.svn.sourceforge.net/firebird/?rev=51233&view=rev Author: alexpeshkoff Date: 2010-06-09 08:37:25 +0000 (Wed, 09 Jun 2010) Log Message: ----------- Paul's changes from CVS - Mac port Modified Paths: -------------- firebird/branches/B2_5_Release/builds/posix/postfix.darwin firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386 firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64 firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin Modified: firebird/branches/B2_5_Release/builds/posix/postfix.darwin =================================================================== --- firebird/branches/B2_5_Release/builds/posix/postfix.darwin 2010-06-08 14:44:45 UTC (rev 51232) +++ firebird/branches/B2_5_Release/builds/posix/postfix.darwin 2010-06-09 08:37:25 UTC (rev 51233) @@ -82,7 +82,6 @@ cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin - cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin @@ -149,7 +148,6 @@ cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin - #cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin #cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin Modified: firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386 =================================================================== --- firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386 2010-06-08 14:44:45 UTC (rev 51232) +++ firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386 2010-06-09 08:37:25 UTC (rev 51233) @@ -22,27 +22,27 @@ # 2. dnl the CPU_TYPE # 3. edit extern/icu/source/config and set the right 32bit flags (-arch i386) # 4. for CFLAGS, CXXFLAGS. LDFLAGS export '-m32 -arch i386' -# 5. export MACOSX_DEPLOYMENT_TARGET=10.4 +# 5. export MACOSX_DEPLOYMENT_TARGET=10.6 DYLD_LIBRARY_PATH=$(FIREBIRD)/lib export DYLD_LIBRARY_PATH -MACOSX_DEPLOYMENT_TARGET=10.4 +MACOSX_DEPLOYMENT_TARGET=10.6 export MACOSX_DEPLOYMENT_TARGET OS_ServerFiles=inet_server.cpp -PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.4 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.4 +PROD_FLAGS=-O3 -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 -EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr -CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \ +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 Physical_IO_Module=os/posix/unix.cpp PLATFORM_PATH=os/darwin LINK_OPTS:=-m32 -LD_FLAGS+=-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk +LD_FLAGS+=-m32 -arch i386 include $(ROOT)/gen/darwin.defaults Modified: firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64 =================================================================== --- firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64 2010-06-08 14:44:45 UTC (rev 51232) +++ firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64 2010-06-09 08:37:25 UTC (rev 51233) @@ -22,16 +22,16 @@ DYLD_LIBRARY_PATH=$(FIREBIRD)/lib export DYLD_LIBRARY_PATH -MACOSX_DEPLOYMENT_TARGET=10.5 +MACOSX_DEPLOYMENT_TARGET=10.6 export MACOSX_DEPLOYMENT_TARGET OS_ServerFiles=inet_server.cpp -PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.5 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5 +PROD_FLAGS=-O3 -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 -EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr -CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \ +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 Physical_IO_Module=os/posix/unix.cpp Modified: firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin =================================================================== --- firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin 2010-06-08 14:44:45 UTC (rev 51232) +++ firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin 2010-06-09 08:37:25 UTC (rev 51233) @@ -17,9 +17,9 @@ # Set CFLAGS and CXXFLAGS for relevant MacOS architecture # and backwards compatibility. Set accordingly before building. -# Default 64 bit Leopard/Snow Leopard - intel (MacOS 10.5+) -CFLAGS += -arch x86_64 -CXXFLAGS += -arch x86_64 +# Default 64 bit Snow Leopard - intel (MacOS 10.6+) +CFLAGS += -arch x86_64 -mmacosx-version-min=10.6 +CXXFLAGS += -arch x86_64 -mmacosx-version-min=10.6 # 64 bit powerpc #CFLAGS += -arch ppc64 -mmacosx-version-min=10.5 @@ -27,8 +27,8 @@ # 32bit intel default # DARWIN flag added because of problem with putil.c -#CFLAGS += -arch i386 -mmacosx-version-min=10.4 -DDARWIN -#CXXFLAGS += -arch i386 -mmacosx-version-min=10.4 +#CFLAGS += -arch i386 -mmacosx-version-min=10.6 -DDARWIN +#CXXFLAGS += -arch i386 -mmacosx-version-min=10.6 # 32 bit powerpc #CFLAGS += -arch ppc -mmacosx-version-min=10.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |