external/firebird/firebird-macosx.patch.1

   1 --- firebird.org/builds/posix/Makefile.in.examples
   2 +++ firebird/builds/posix/Makefile.in.examples
   3 @@ -134,7 +134,7 @@
   4         $(LN) $(ISQL) $(EXAMPLES_DEST)/isql$(EXEC_EXT)
   5
   6  $(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_LIB)
   7 -       $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ -L$(LIB) $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
   8 +       $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ -L$(LIB) $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,../$(if $(ENABLE_DEBUG),Debug,Release)/firebird)
   9
  10  $(EXAMPLES_DEST)/empbuild.c:   $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empbuild.e
  11
  12 --- firebird.org/builds/posix/prefix.darwin_x86_64      2016-08-01 20:02:48.000000000 +0200
  13 +++ firebird/builds/posix/prefix.darwin_x86_64  2016-08-01 21:42:45.000000000 +0200
  14 @@ -27,9 +27,6 @@
  15  # configure using --with-builtin-tommath
  16  # or add the relevant -I, -L for an installed version of libtommath
  17
  18 -DYLD_LIBRARY_PATH=$(HOME)/icu54/icu/source/lib
  19 -export DYLD_LIBRARY_PATH
  20 -
  21  #DYLD_PRINT_ENV=1
  22  #export DYLD_PRINT_ENV
  23
  24 @@ -31,8 +31,8 @@
  25  MACOSX_DEPLOYMENT_TARGET=10.9
  26  export MACOSX_DEPLOYMENT_TARGET
  27
  28 -PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=10.9
  29 -DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.9 -Wno-non-virtual-dtor
  30 +PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common
  31 +DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor
  32  CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -stdlib=libc++ -msse4
  33
  34  EXE_LINK_OPTIONS:=
  35 --- firebird.org/src/common/unicode_util.cpp    2016-07-07 13:55:55.992234709 +0200
  36 +++ firebird/src/common/unicode_util.cpp        2016-08-10 11:25:46.422331020 +0200
  37 @@ -63,8 +63,8 @@
  38  const char* const ucTemplate = "icuuc%s.dll";
  39  #endif
  40  #elif defined(DARWIN)
  41 -const char* const inTemplate = "lib/libicui18n.%s.dylib";
  42 -const char* const ucTemplate = "lib/libicuuc.%s.dylib";
  43 +const char* const inTemplate = "libicui18n.dylib.%s";
  44 +const char* const ucTemplate = "libicuuc.dylib.%s";
  45  #elif defined(HPUX)
  46  const char* const inTemplate = "libicui18n.sl.%s";
  47  const char* const ucTemplate = "libicuuc.sl.%s";
  48 @@ -354,6 +354,16 @@
  49         {
  50                 s.printf(*p, majorVersion, minorVersion);
  51                 filename.printf(templateName, s.c_str());
  52 +               const char * envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
  53 +               if(envpath == nullptr)
  54 +               {
  55 +                       envpath = getenv("LIBREOFFICE_ICU_LIB");
  56 +               }
  57 +               if(envpath != nullptr)
  58 +               {
  59 +                       s = filename.c_str();
  60 +                       PathUtils::concatPath(filename, envpath, s.c_str());
  61 +               }
  62
  63                 ModuleLoader::Module* module = ModuleLoader::fixAndLoadModule(NULL, filename);
  64                 if (module)
  65 --- firebird.org/src/common/utils.cpp   2016-08-16 10:11:10.000000000 +0200
  66 +++ firebird/src/common/utils.cpp       2016-08-16 11:27:09.000000000 +0200
  67 @@ -1027,10 +1027,18 @@
  68                         return s;
  69                 }
  70
  71 -                // Set relative path to Engine12 dynamic library
  72 +                // Set path to Engine12 dynamic library.
  73                  if(prefType == Firebird::IConfigManager::DIR_PLUGINS)
  74                  {
  75 -                    s = name;
  76 +                    const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
  77 +                    if(envpath != nullptr)
  78 +                    {
  79 +                        PathUtils::concatPath(s, envpath, name);
  80 +                    }
  81 +                    else
  82 +                    {
  83 +                        s = name;
  84 +                    }
  85                      return s;
  86                  }
  87         }