diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-10-18 13:09:05 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-10-18 13:09:05 +0000 |
| commit | 4af2054911336ca0a40ae402e0bb86d3b10f94a9 (patch) | |
| tree | 2a3e55c37fdd5e78a544daa2e27410b728974f27 | |
| parent | c864c24bbec4832c7a55a23dcf48f83477b07800 (diff) | |
gammu: Updated to version 1.26.1.
| -rw-r--r-- | recipes/gammu/gammu-1.24.0/findmysql.patch | 35 | ||||
| -rw-r--r-- | recipes/gammu/gammu_1.20.0.bb | 32 | ||||
| -rw-r--r-- | recipes/gammu/gammu_1.26.1.bb (renamed from recipes/gammu/gammu_1.24.0.bb) | 3 |
3 files changed, 1 insertions, 69 deletions
diff --git a/recipes/gammu/gammu-1.24.0/findmysql.patch b/recipes/gammu/gammu-1.24.0/findmysql.patch deleted file mode 100644 index b6345b1bd0..0000000000 --- a/recipes/gammu/gammu-1.24.0/findmysql.patch +++ /dev/null @@ -1,35 +0,0 @@ -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}) - diff --git a/recipes/gammu/gammu_1.20.0.bb b/recipes/gammu/gammu_1.20.0.bb deleted file mode 100644 index 6cc864498a..0000000000 --- a/recipes/gammu/gammu_1.20.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "GNU All Mobile Managment Utilities" -SECTION = "console/network" -DEPENDS = "bluez-libs cmake-native" -LICENSE = "GPL" -HOMEPAGE = "http://www.gammu.org/" -PR = "r1" - -SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 " - -# it is CMake based but when inherit cmake it builds static binary/library -inherit autotools pkgconfig - -do_configure() { - cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup -} - -do_stage() { - autotools_stage_all -} - -# gammu has a non-standard uninstalled .pc file, which confuses pkgconfig.bbclass. -# Replace it by custom do_stage_append(): -do_stage_append () { - install -d ${PKG_CONFIG_DIR} - cat build-configure/cfg/gammu.pc > ${PKG_CONFIG_DIR}/gammu.pc -} - -PACKAGES =+ "libgammu" - -FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker" -FILES_${PN}-dev += "${bindir}/gammu-config" -FILES_libgammu = "${libdir}/libGammu.so.*" diff --git a/recipes/gammu/gammu_1.24.0.bb b/recipes/gammu/gammu_1.26.1.bb index 56a1a91729..ec8ef74f24 100644 --- a/recipes/gammu/gammu_1.24.0.bb +++ b/recipes/gammu/gammu_1.26.1.bb @@ -6,8 +6,7 @@ LICENSE = "GPL" HOMEPAGE = "http://www.gammu.org/" PR = "r0" -SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ - file://findmysql.patch;patch=1" +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2" inherit distutils-common-base cmake |