mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 18:43:02 +01:00
Apply MacOS changes to HEAD
This commit is contained in:
paulbeach
parent
6b61e31320
commit
91c4f3734e
@ -15,27 +15,29 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.darwin: $(VERSION) @PLATFORM@
|
||||
#
|
||||
#$Id: prefix.darwin_i386,v 1.2 2007-12-19 13:25:49 paulbeach Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
#
|
||||
|
||||
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
|
||||
export DYLD_LIBRARY_PATH
|
||||
|
||||
MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
export MACOSX_DEPLOYMENT_TARGET
|
||||
|
||||
OS_ServerFiles=inet_server.cpp
|
||||
|
||||
PROD_FLAGS=-O3 -DNDEBUG -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386
|
||||
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386
|
||||
EMBED_UTIL_TARGETS=gstat gds_drop gsec nbackup fb_lock_print
|
||||
CLIENT_UTIL_TARGETS=gds_drop gstat gsec fbguard fbmgr_bin nbackup fb_lock_print
|
||||
PROD_FLAGS=-O3 -DNDEBUG -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
|
||||
EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec nbackup fb_lock_print
|
||||
CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print
|
||||
|
||||
Physical_IO_Module=os/posix/unix.cpp
|
||||
PLATFORM_PATH=os/darwin
|
||||
|
||||
LINK_OPTS:=-Wl,-macosx_version_min -Wl,10.4
|
||||
LINK_OPTS:=
|
||||
LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
|
||||
LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace
|
||||
LIB_LINK_SONAME:=-current_version 2.1.0 -compatibility_version 2.1.0 -seg1addr 0x30000000
|
||||
LIB_LINK_SONAME:=-current_version 2.0.0 -compatibility_version 2.0.0 -seg1addr 0x30000000
|
||||
LIB_LINK_MAPFILE:=-Wl,-exported_symbols_list,
|
||||
LINK_FIREBIRD_EMBED_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.embed.vers
|
||||
LINK_FIREBIRD_CLIENT_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.client.vers
|
||||
57
builds/posix/prefix.darwin_powerpc
Normal file
57
builds/posix/prefix.darwin_powerpc
Normal file
@ -0,0 +1,57 @@
|
||||
# The contents of this file are subject to the Interbase Public
|
||||
# License Version 1.0 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy
|
||||
# of the License at http://www.Inprise.com/IPL.html
|
||||
#
|
||||
# Software distributed under the License is distributed on an
|
||||
# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
|
||||
# or implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code was created by Inprise Corporation
|
||||
# and its predecessors. Portions created by Inprise Corporation are
|
||||
#
|
||||
# Copyright (C) 2000 Inprise Corporation
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.darwin: $(VERSION) @PLATFORM@
|
||||
#$Id: prefix.darwin_powerpc,v 1.2 2007-12-19 13:25:49 paulbeach Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
|
||||
export DYLD_LIBRARY_PATH
|
||||
|
||||
MACOSX_DEPLOYMENT_TARGET=10.2
|
||||
export MACOSX_DEPLOYMENT_TARGET
|
||||
|
||||
OS_ServerFiles=inet_server.cpp
|
||||
|
||||
PROD_FLAGS=-O3 -DNDEBUG -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.2
|
||||
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.2
|
||||
EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec nbackup fb_lock_print
|
||||
CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print
|
||||
|
||||
Physical_IO_Module=os/posix/unix.cpp
|
||||
PLATFORM_PATH=os/darwin
|
||||
|
||||
LINK_OPTS:=
|
||||
LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
|
||||
LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace
|
||||
LIB_LINK_SONAME:=-current_version 2.0.0 -compatibility_version 2.0.0 -seg1addr 0x30000000
|
||||
LIB_LINK_MAPFILE:=-Wl,-exported_symbols_list,
|
||||
LINK_FIREBIRD_EMBED_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.embed.vers
|
||||
LINK_FIREBIRD_CLIENT_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.client.vers
|
||||
LINK_FBINTL_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/fbintl.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
|
||||
PLATFORM_FALLBACK=os/posix
|
||||
PLAT_CLASSIC_PRE_TARGET=darwin_setup_framework
|
||||
PLAT_CLASSIC_POST_TARGET=darwin_finish_cs_framework
|
||||
|
||||
PLAT_SUPER_PRE_TARGET=darwin_setup_framework
|
||||
PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework
|
||||
|
||||
PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
|
||||
24
configure.in
24
configure.in
@ -48,14 +48,30 @@ dnl Test for realtime library presence?
|
||||
RT_LIB_CHECK=false
|
||||
|
||||
case "$target" in
|
||||
*-*-darwin*)
|
||||
MAKEFILE_PREFIX=darwin
|
||||
i686-*-darwin*)
|
||||
MAKEFILE_PREFIX=darwin_i386
|
||||
MAKEFILE_POSTFIX=darwin
|
||||
PLATFORM=DARWIN
|
||||
INSTALL_PREFIX=darwin
|
||||
AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN])
|
||||
XE_APPEND(-framework CoreFoundation,LIBS)
|
||||
LOCK_MANAGER_FLG=Y
|
||||
EDITLINE_FLG=Y
|
||||
SHRLIB_EXT=dylib
|
||||
ICU_PLATFORM=MacOSX
|
||||
;;
|
||||
|
||||
powerpc-*-darwin*)
|
||||
MAKEFILE_PREFIX=darwin_ppc
|
||||
MAKEFILE_POSTFIX=darwin
|
||||
PLATFORM=DARWIN
|
||||
INSTALL_PREFIX=darwin
|
||||
AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN])
|
||||
XE_APPEND(-framework CoreFoundation,LIBS)
|
||||
LOCK_MANAGER_FLG=Y
|
||||
EDITLINE_FLG=Y
|
||||
SHRLIB_EXT=dylib
|
||||
ICU_PLATFORM=MacOSX
|
||||
;;
|
||||
|
||||
amd64-*-freebsd*)
|
||||
@ -1076,8 +1092,8 @@ case "$PLATFORM" in
|
||||
DARWIN)
|
||||
;;
|
||||
esac
|
||||
if test -f ${MAKE_SRC_DIR}/postfix.${MAKEFILE_PREFIX};then
|
||||
POSTFIX_FILE=gen/make.platform.postfix:${MAKE_SRC_DIR}/postfix.${MAKEFILE_PREFIX}
|
||||
if test -f ${MAKE_SRC_DIR}/postfix.${MAKEFILE_POSTFIX};then
|
||||
POSTFIX_FILE=gen/make.platform.postfix:${MAKE_SRC_DIR}/postfix.${MAKEFILE_POSTFIX}
|
||||
POSTFIX_INCLUDE='include $(ROOT)/gen/make.platform.postfix'
|
||||
else
|
||||
POSTFIX_FILE=
|
||||
|
||||
Loading…
Reference in New Issue
Block a user