external/firebird/wnt-dbgutil.patch

   1 --- configure
   2 +++ configure
   3 @@ -18402,44 +18402,6 @@
   4  fi
   5
   6
   7 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -licuuc" >&5
   8 -$as_echo_n "checking for main in -licuuc... " >&6; }
   9 -if ${ac_cv_lib_icuuc_main+:} false; then :
  10 -  $as_echo_n "(cached) " >&6
  11 -else
  12 -  ac_check_lib_save_LIBS=$LIBS
  13 -LIBS="-licuuc  $LIBS"
  14 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15 -/* end confdefs.h.  */
  16 -
  17 -
  18 -int
  19 -main ()
  20 -{
  21 -return main ();
  22 -  ;
  23 -  return 0;
  24 -}
  25 -_ACEOF
  26 -if ac_fn_c_try_link "$LINENO"; then :
  27 -  ac_cv_lib_icuuc_main=yes
  28 -else
  29 -  ac_cv_lib_icuuc_main=no
  30 -fi
  31 -rm -f core conftest.err conftest.$ac_objext \
  32 -    conftest$ac_exeext conftest.$ac_ext
  33 -LIBS=$ac_check_lib_save_LIBS
  34 -fi
  35 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_main" >&5
  36 -$as_echo "$ac_cv_lib_icuuc_main" >&6; }
  37 -if test "x$ac_cv_lib_icuuc_main" = xyes; then :
  38 -  ICU_OK=yes
  39 -else
  40 -  as_fn_error $? "ICU support not found - please install development ICU package" "$LINENO" 5
  41 -fi
  42 -
  43 -
  44 -
  45  pre_save_restore_cflags=$CFLAGS
  46  pre_save_restore_cxxflags=$CXXFLAGS
  47  pre_save_restore_libs=$LIBS
  48 --- src/common/unicode_util.cpp
  49 +++ src/common/unicode_util.cpp
  50 @@ -58,8 +58,13 @@
  51
  52  namespace {
  53  #if defined(WIN_NT)
  54 +#if defined(MSVC_USE_DEBUG_RUNTIME)
  55 +const char* const inTemplate = "icuind%s.dll";
  56 +const char* const ucTemplate = "icuucd%s.dll";
  57 +#else
  58  const char* const inTemplate = "icuin%s.dll";
  59  const char* const ucTemplate = "icuuc%s.dll";
  60 +#endif
  61  #elif defined(DARWIN)
  62  //const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib";
  63  //const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib";