Author: frankie
Date: 2008-03-19 18:57:47 +0000 (Wed, 19 Mar 2008)
New Revision: 1433
Modified:
packages/qgis/trunk/debian/patches/flex.dpatch
Log:
Fixed flex patch correctly to avoid rebuilding at compile time.
Modified: packages/qgis/trunk/debian/patches/flex.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/flex.dpatch 2008-03-19 18:51:11 UTC
(rev 1432)
+++ packages/qgis/trunk/debian/patches/flex.dpatch 2008-03-19 18:57:47 UTC
(rev 1433)
@@ -5,22 +5,32 @@
## DP: No description.
@DPATCH@
+diff -urNad qgis~/cmake/Flex.cmake qgis/cmake/Flex.cmake
+--- qgis~/cmake/Flex.cmake 2008-03-19 17:27:11.000000000 +0100
++++ qgis/cmake/Flex.cmake 2008-03-19 17:59:56.000000000 +0100
+@@ -28,6 +28,8 @@
+
+ # -d option for flex means that it will produce output to stderr while
analyzing
+
++ SET(FLEX_EXECUTABLE /bin/true)
++
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${_out}
+ COMMAND ${FLEX_EXECUTABLE}
diff -urNad qgis~/src/core/CMakeLists.txt qgis/src/core/CMakeLists.txt
---- qgis~/src/core/CMakeLists.txt 2008-03-19 14:43:53.000000000 +0100
-+++ qgis/src/core/CMakeLists.txt 2008-03-19 16:42:47.000000000 +0100
-@@ -61,7 +61,8 @@
+--- qgis~/src/core/CMakeLists.txt 2008-03-19 17:27:18.000000000 +0100
++++ qgis/src/core/CMakeLists.txt 2008-03-19 17:57:35.000000000 +0100
+@@ -61,6 +61,7 @@
spatialindex/qgsspatialindex.cpp
)
--ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
+# Disable run-time use of flex
-+#ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
+ ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
ADD_BISON_FILES(QGIS_CORE_SRCS qgssearchstringparser.yy)
-
diff -urNad qgis~/src/core/flex_qgssearchstringlexer.cpp
qgis/src/core/flex_qgssearchstringlexer.cpp
--- qgis~/src/core/flex_qgssearchstringlexer.cpp 1970-01-01
01:00:00.000000000 +0100
-+++ qgis/src/core/flex_qgssearchstringlexer.cpp 2008-03-19
16:43:33.000000000 +0100
++++ qgis/src/core/flex_qgssearchstringlexer.cpp 2008-03-19
17:57:09.000000000 +0100
@@ -0,0 +1,1878 @@
+
+#line 3 "lex.yy.c"
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
