diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-06-12 14:17:42 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-06-12 14:17:42 +0000 |
| commit | 50bb21e8041c91963cc6e057074e5d6e857acce5 (patch) | |
| tree | 4ea015959bac5d3e74e0b10c2a3a28a145f92849 /recipes/gammu/gammu-1.24.0/findmysql.patch | |
| parent | 649b44a943f5a2cca45b346b903e6cdee7d5ed21 (diff) | |
gammu: Update to version 1.24.0.
Diffstat (limited to 'recipes/gammu/gammu-1.24.0/findmysql.patch')
| -rw-r--r-- | recipes/gammu/gammu-1.24.0/findmysql.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/recipes/gammu/gammu-1.24.0/findmysql.patch b/recipes/gammu/gammu-1.24.0/findmysql.patch new file mode 100644 index 0000000000..b6345b1bd0 --- /dev/null +++ b/recipes/gammu/gammu-1.24.0/findmysql.patch @@ -0,0 +1,35 @@ +Index: gammu-1.24.0/cmake/FindMySQL.cmake +=================================================================== +--- gammu-1.24.0.orig/cmake/FindMySQL.cmake 2008-11-20 15:37:28.000000000 +0000 ++++ gammu-1.24.0/cmake/FindMySQL.cmake 2009-06-12 12:18:06.000000000 +0000 +@@ -30,7 +30,7 @@ + ARGS --include + OUTPUT_VARIABLE MY_TMP) + +- string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}") ++ string(REGEX REPLACE "-I([^ ]+)( .*)?" "\\1" MY_TMP "${MY_TMP}") + + set(MYSQL_ADD_INCLUDE_DIR ${MY_TMP} CACHE FILEPATH INTERNAL) + +@@ -41,17 +41,19 @@ + + set(MYSQL_ADD_LIBRARIES "") + +- string(REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}") ++ string(REGEX MATCHALL "(^| )-l[^ ]+" MYSQL_LIB_LIST "${MY_TMP}") + foreach(LIB ${MYSQL_LIB_LIST}) + string(REGEX REPLACE "[ ]*-l([^ ]*)" "\\1" LIB "${LIB}") ++ message("${LIB}") + list(APPEND MYSQL_ADD_LIBRARIES "${LIB}") + endforeach(LIB ${MYSQL_LIBS}) + + set(MYSQL_ADD_LIBRARY_PATH "") + +- string(REGEX MATCHALL "-L[^ ]*" MYSQL_LIBDIR_LIST "${MY_TMP}") ++ string(REGEX MATCHALL "-L[^ ]+" MYSQL_LIBDIR_LIST "${MY_TMP}") + foreach(LIB ${MYSQL_LIBDIR_LIST}) + string(REGEX REPLACE "[ ]*-L([^ ]*)" "\\1" LIB "${LIB}") ++ message("${LIB}") + list(APPEND MYSQL_ADD_LIBRARY_PATH "${LIB}") + endforeach(LIB ${MYSQL_LIBS}) + |