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 diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin
  31 --- firebird.org/builds/posix/postfix.darwin    2013-07-12 20:55:46.000000000 +0200
  32 +++ firebird/builds/posix/postfix.darwin        2013-07-15 12:07:36.000000000 +0200
  33 @@ -54,9 +54,9 @@
  34         cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
  35         cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird
  36         cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib
  37 -       cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
  38 -       cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
  39 -       cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
  40 +       #cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
  41 +       #cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
  42 +       #cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
  43         cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib
  44         cp ../gen/firebird/firebird.msg \
  45                         $(FB_FW)/Resources/English.lproj/var/firebird.msg
  46 @@ -68,8 +68,8 @@
  47                 $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
  48         chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl
  49         mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins
  50 -       cp ../gen/firebird/plugins/libfbtrace.dylib \
  51 -               $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
  52 +#      cp ../gen/firebird/plugins/libfbtrace.dylib \
  53 +#              $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
  54         cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
  55         cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
  56         mkdir -p $(FB_FW)/Resources/doc
  57 --- firebird.org/builds/posix/prefix.darwin_i386
  58 +++ firebird/builds/posix/prefix.darwin_i386
  59 @@ -19,7 +19,7 @@
  60  # 4. for  CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386'
  61  # 5. export MACOSX_DEPLOYMENT_TARGET=10.6
  62
  63 -DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
  64 +DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH)
  65  export DYLD_LIBRARY_PATH
  66
  67  MACOSX_DEPLOYMENT_TARGET=10.6
  68 @@ -32,8 +32,8 @@
  69
  70  OS_ServerFiles=inet_server.cpp
  71
  72 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
  73 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
  74 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
  75 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
  76  CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
  77  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
  78  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
  79 --- firebird.org/builds/posix/prefix.darwin_x86_64
  80 +++ firebird/builds/posix/prefix.darwin_x86_64
  81 @@ -19,7 +19,7 @@
  82  #
  83  # Default build from 10.6
  84
  85 -DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
  86 +DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH)
  87  export DYLD_LIBRARY_PATH
  88
  89  MACOSX_DEPLOYMENT_TARGET=10.6
  90 @@ -27,9 +27,9 @@
  91
  92  OS_ServerFiles=inet_server.cpp
  93
  94 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
  95 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
  96 -CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
  97 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
  98 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
  99 +CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
 100  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
 101  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
 102         fbtracemgr