connectivity/Library_dbtools.mk | 10 +++++++++-
connectivity/source/parse/sqlbison.y | 4 ----
connectivity/source/parse/sqlflex.l | 3 ---
3 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit f63423d58551b387dd9617c6c84719a95ee6d522
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Fri Mar 15 22:40:26 2013 -0400
Revert "cleanup sqlflex and sqlbison options"
This reverts commit b659d7c33fcacdbbef86557e78f071abf94bead2.
That commit appears to have broken the build on Linux. Reverting it
fixes it.
Change-Id: I70d62c04e9fb284ed2c360c0976d0cbeafc2ddc2
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 4228eb9..1e063ea 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -66,6 +66,8 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
))
endif
+#connectivity/source/commontools/RowFunctionParser.cxx disable optimization?
+
$(eval $(call gb_Library_add_noexception_objects,dbtools,\
connectivity/source/simpledbt/refbase \
))
@@ -74,10 +76,16 @@ $(eval $(call gb_Library_add_grammars,dbtools,\
connectivity/source/parse/sqlbison \
))
+$(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison) :
T_YACCFLAGS := -d -l -pSQLyy -bsql
+
$(eval $(call gb_Library_add_scanners,dbtools,\
- connectivity/source/parse/sqlflex \
+connectivity/source/parse/sqlflex \
))
+$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) :
T_LEXFLAGS := -i -8 -PSQLyy -L
+
+
+
$(eval $(call gb_Library_add_exception_objects,dbtools,\
connectivity/source/commontools/AutoRetrievingBase \
connectivity/source/commontools/BlobHelper \
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 017428b..0bb7c31 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,8 +1,4 @@
%token-table
-%defines
-%no-lines
-%define api.prefix SQLyy
-%file-prefix "sql"
%{
/*
* This file is part of the LibreOffice project.
diff --git a/connectivity/source/parse/sqlflex.l
b/connectivity/source/parse/sqlflex.l
index 1ded0e2..d17128e 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -1,6 +1,3 @@
-%option case-insensitive
-%option 8bit
-%option prefix="SQLyy"
%{
//
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
