Репозитории ALT
S: | 4.0.0.2496.0-alt4 |
5.1: | 2.1.3.18185.0-alt3.M51.4 |
4.1: | 2.1.1.17910.0-alt0.M41.5 |
4.0: | 2.1.1.17910.0-alt3.M40.4 |
+backports: | 2.1.1.17910.0-alt3.M40.1 |
Группа :: Базы Данных
Пакет: firebird
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: firebird-4.0.0.2496.0-alt-use-system-libre2.patch
Скачать
Скачать
diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in
index bb4ceb12fb..3d03d7ae34 100644
--- a/builds/posix/Makefile.in
+++ b/builds/posix/Makefile.in
@@ -170,9 +170,6 @@ external:
$(MAKE) -C $(ROOT)/extern/decNumber
ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(LIB)
- CXXFLAGS="-O3 -g -fPIC" $(MAKE) -C $(ROOT)/extern/re2
- ln -sf $(ROOT)/extern/re2/obj/libre2.a $(LIB)
-
ifeq ($(TOMMATH_BUILD_FLG),Y)
CFLAGS="$(CFLAGS)" $(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared GCC=$(GCC)
diff --git a/src/common/SimilarToRegex.cpp b/src/common/SimilarToRegex.cpp
index 3a62b245e3..9928a9de0f 100644
--- a/src/common/SimilarToRegex.cpp
+++ b/src/common/SimilarToRegex.cpp
@@ -108,7 +108,7 @@ namespace
options.set_log_errors(false);
options.set_dot_nl(true);
options.set_case_sensitive(!(flags & COMP_FLAG_CASE_INSENSITIVE));
- options.set_utf8(!(flags & COMP_FLAG_LATIN));
+ options.set_encoding((flags & COMP_FLAG_LATIN) ? RE2::Options::EncodingLatin1 : RE2::Options::EncodingUTF8);
re2::StringPiece sp((const char*) re2PatternStr.c_str(), re2PatternStr.length());
regexp = FB_NEW_POOL(pool) RE2(sp, options);
@@ -759,7 +759,7 @@ namespace
options.set_log_errors(false);
options.set_dot_nl(true);
options.set_case_sensitive(!(flags & COMP_FLAG_CASE_INSENSITIVE));
- options.set_utf8(!(flags & COMP_FLAG_LATIN));
+ options.set_encoding((flags & COMP_FLAG_LATIN) ? RE2::Options::EncodingLatin1 : RE2::Options::EncodingUTF8);
re2::StringPiece sp((const char*) finalRe2Pattern.c_str(), finalRe2Pattern.length());
regexp = FB_NEW_POOL(pool) RE2(sp, options);