external/firebird/wnt-dbgutil.patch

   1 --- configure
   2 +++ configure
   3 @@ -18430,44 +18430,6 @@
   4    as_fn_error $? "ICU support not found - please install development ICU package" "$LINENO" 5
   5  fi
   6
   7 -
   8 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -licuuc" >&5
   9 -$as_echo_n "checking for main in -licuuc... " >&6; }
  10 -if ${ac_cv_lib_icuuc_main+:} false; then :
  11 -  $as_echo_n "(cached) " >&6
  12 -else
  13 -  ac_check_lib_save_LIBS=$LIBS
  14 -LIBS="-licuuc  $LIBS"
  15 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  16 -/* end confdefs.h.  */
  17 -
  18 -
  19 -int
  20 -main ()
  21 -{
  22 -return main ();
  23 -  ;
  24 -  return 0;
  25 -}
  26 -_ACEOF
  27 -if ac_fn_c_try_link "$LINENO"; then :
  28 -  ac_cv_lib_icuuc_main=yes
  29 -else
  30 -  ac_cv_lib_icuuc_main=no
  31 -fi
  32 -rm -f core conftest.err conftest.$ac_objext \
  33 -    conftest$ac_exeext conftest.$ac_ext
  34 -LIBS=$ac_check_lib_save_LIBS
  35 -fi
  36 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_main" >&5
  37 -$as_echo "$ac_cv_lib_icuuc_main" >&6; }
  38 -if test "x$ac_cv_lib_icuuc_main" = xyes; then :
  39 -  ICU_OK=yes
  40 -else
  41 -  as_fn_error $? "ICU support not found - please install development ICU package" "$LINENO" 5
  42 -fi
  43 -
  44 -
  45  if test "$TOMBUILD" = "Y"; then
  46         MATHLIB=-ltommath
  47  else
  48 --- src/common/unicode_util.cpp
  49 +++ src/common/unicode_util.cpp
  50 @@ -55,8 +55,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 = "lib/libicui18n.%s.dylib";
  63  const char* const ucTemplate = "lib/libicuuc.%s.dylib";