01_no_icu.patch 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293
  1. --- contrib/restricted/boost/regex/ya.make (index)
  2. +++ contrib/restricted/boost/regex/ya.make (working tree)
  3. @@ -16,7 +16,6 @@ VERSION(1.87.0)
  4. ORIGINAL_SOURCE(https://github.com/boostorg/regex/archive/boost-1.87.0.tar.gz)
  5. PEERDIR(
  6. - contrib/libs/icu
  7. contrib/restricted/boost/assert
  8. contrib/restricted/boost/concept_check
  9. contrib/restricted/boost/config
  10. @@ -40,7 +39,6 @@ NO_COMPILER_WARNINGS()
  11. NO_UTIL()
  12. CFLAGS(
  13. - -DBOOST_HAS_ICU
  14. -DBOOST_NO_CXX98_BINDERS
  15. )
  16. --- contrib/restricted/thrift/ya.make (index)
  17. +++ contrib/restricted/thrift/ya.make (working tree)
  18. @@ -24,7 +24,6 @@ PEERDIR(
  19. contrib/libs/openssl
  20. contrib/libs/zlib
  21. contrib/restricted/boost/interprocess
  22. - contrib/restricted/boost/locale
  23. contrib/restricted/boost/math
  24. contrib/restricted/boost/system
  25. contrib/restricted/boost/thread
  26. @@ -49,7 +48,6 @@ SRCS(
  27. thrift/protocol/TBase64Utils.cpp
  28. thrift/protocol/TDebugProtocol.cpp
  29. thrift/protocol/THeaderProtocol.cpp
  30. - thrift/protocol/TJSONProtocol.cpp
  31. thrift/protocol/TMultiplexedProtocol.cpp
  32. thrift/protocol/TProtocol.cpp
  33. thrift/server/TConnectedClient.cpp
  34. --- yql/essentials/parser/pg_wrapper/postgresql/src/backend/utils/adt/formatting.c (index)
  35. +++ yql/essentials/parser/pg_wrapper/postgresql/src/backend/utils/adt/formatting.c (working tree)
  36. @@ -72,7 +72,7 @@
  37. #include <wctype.h>
  38. #ifdef USE_ICU
  39. -#include <unicode/ustring.h>
  40. +#error #include <unicode/ustring.h>
  41. #endif
  42. #include "catalog/pg_collation.h"
  43. --- yql/essentials/parser/pg_wrapper/postgresql/src/backend/utils/adt/pg_locale.c (index)
  44. +++ yql/essentials/parser/pg_wrapper/postgresql/src/backend/utils/adt/pg_locale.c (working tree)
  45. @@ -69,8 +69,8 @@
  46. #include "utils/syscache.h"
  47. #ifdef USE_ICU
  48. -#include <unicode/ucnv.h>
  49. -#include <unicode/ustring.h>
  50. +#error #include <unicode/ucnv.h>
  51. +#error #include <unicode/ustring.h>
  52. #endif
  53. #ifdef __GLIBC__
  54. --- yql/essentials/parser/pg_wrapper/postgresql/src/include/pg_config-linux.h (index)
  55. +++ yql/essentials/parser/pg_wrapper/postgresql/src/include/pg_config-linux.h (working tree)
  56. @@ -707,7 +707,8 @@
  57. /* #undef USE_BSD_AUTH */
  58. /* Define to build with ICU support. (--with-icu) */
  59. -#define USE_ICU 1
  60. +//#define USE_ICU 1
  61. +#undef USE_ICU
  62. /* Define to 1 to build with LDAP support. (--with-ldap) */
  63. /* #undef USE_LDAP */
  64. --- yql/essentials/parser/pg_wrapper/postgresql/src/include/utils/pg_locale.h (index)
  65. +++ yql/essentials/parser/pg_wrapper/postgresql/src/include/utils/pg_locale.h (working tree)
  66. @@ -16,7 +16,7 @@
  67. #include <xlocale.h>
  68. #endif
  69. #ifdef USE_ICU
  70. -#include <unicode/ucol.h>
  71. +#error include <unicode/ucol.h>
  72. #endif
  73. #ifdef USE_ICU
  74. --- yql/essentials/parser/pg_wrapper/ya.make (index)
  75. +++ yql/essentials/parser/pg_wrapper/ya.make (working tree)
  76. @@ -95,7 +95,6 @@ PEERDIR(
  77. yql/essentials/types/dynumber
  78. yql/essentials/types/uuid
  79. - contrib/libs/icu
  80. contrib/libs/libc_compat
  81. contrib/libs/libxml
  82. contrib/libs/lz4