external/firebird/firebird-macosx.patch.1

   1 # -*- Mode: Diff -*-
   2 --- firebird.org/builds/posix/darwin.defaults
   3 +++ firebird/builds/posix/darwin.defaults
   4 @@ -32,17 +32,17 @@
   5  LINK_EMPTY_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/empty.darwin.vers
   6  LINK_FIREBIRD_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.vers
   7
   8 -LIB_LINK_RPATH:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Libraries/
   9 -LIB_EMBED_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird
  10 -LIB_CLIENT_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird
  11 -FBEMBED_LINK:=-F../gen/firebird -framework Firebird -L$(LIB) -lfbembed $(ICU_LIBS)
  12 +LIB_LINK_RPATH:=
  13 +LIB_EMBED_LINK_OPTIONS:=-install_name @__________________________________________________OOO/libfbembed.dylib
  14 +LIB_CLIENT_LINK_OPTIONS:=
  15 +FBEMBED_LINK:=-L$(LIB) -lfbembed $(ICU_LIBS)
  16  PLATFORM_FALLBACK=os/posix
  17
  18 -PLAT_CLASSIC_PRE_TARGET=darwin_setup_framework
  19 -PLAT_CLASSIC_POST_TARGET=darwin_finish_cs_framework
  20 +PLAT_CLASSIC_PRE_TARGET=
  21 +PLAT_CLASSIC_POST_TARGET=
  22
  23 -PLAT_SUPER_PRE_TARGET=darwin_setup_framework
  24 -PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework
  25 +PLAT_SUPER_PRE_TARGET=
  26 +PLAT_SUPER_POST_TRAGET=
  27
  28  PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
  29
  30 @@ -57,7 +57,7 @@
  31
  32  LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS)
  33
  34 -LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
  35 +LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
  36   $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME)
  37
  38  ifeq (@VOID_PTR_SIZE@,8)
  39 diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin
  40 --- firebird.org/builds/posix/postfix.darwin    2013-07-12 20:55:46.000000000 +0200
  41 +++ firebird/builds/posix/postfix.darwin        2013-07-15 12:07:36.000000000 +0200
  42 @@ -54,9 +54,9 @@
  43         cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
  44         cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird
  45         cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib
  46 -       cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
  47 -       cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
  48 -       cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
  49 +       #cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
  50 +       #cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
  51 +       #cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
  52         cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib
  53         cp ../gen/firebird/firebird.msg \
  54                         $(FB_FW)/Resources/English.lproj/var/firebird.msg
  55 @@ -68,8 +68,8 @@
  56                 $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
  57         chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl
  58         mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins
  59 -       cp ../gen/firebird/plugins/libfbtrace.dylib \
  60 -               $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
  61 +#      cp ../gen/firebird/plugins/libfbtrace.dylib \
  62 +#              $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
  63         cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
  64         cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
  65         mkdir -p $(FB_FW)/Resources/doc
  66 --- firebird.org/builds/posix/prefix.darwin_i386
  67 +++ firebird/builds/posix/prefix.darwin_i386
  68 @@ -19,7 +19,7 @@
  69  # 4. for  CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386'
  70  # 5. export MACOSX_DEPLOYMENT_TARGET=10.6
  71
  72 -DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
  73 +DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH)
  74  export DYLD_LIBRARY_PATH
  75
  76  MACOSX_DEPLOYMENT_TARGET=10.6
  77 @@ -32,8 +32,8 @@
  78
  79  OS_ServerFiles=inet_server.cpp
  80
  81 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
  82 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
  83 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
  84 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
  85  CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
  86  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
  87  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
  88 --- firebird.org/builds/posix/prefix.darwin_x86_64
  89 +++ firebird/builds/posix/prefix.darwin_x86_64
  90 @@ -19,7 +19,7 @@
  91  #
  92  # Default build from 10.6
  93
  94 -DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
  95 +DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH)
  96  export DYLD_LIBRARY_PATH
  97
  98  MACOSX_DEPLOYMENT_TARGET=10.6
  99 @@ -27,9 +27,9 @@
 100
 101  OS_ServerFiles=inet_server.cpp
 102
 103 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
 104 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
 105 -CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
 106 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
 107 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
 108 +CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
 109  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
 110  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
 111         fbtracemgr