gammu: Update to 1.39.0
Cosmetic makefile changes. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
7ecd4f549e
commit
ef6c6feef6
|
@ -9,15 +9,17 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gammu
|
||||
PKG_VERSION:=1.38.4
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=1.39.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL:=http://dl.cihar.com/gammu/releases/
|
||||
PKG_SOURCE_URL:=https://dl.cihar.com/gammu/releases
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_HASH:=a8ba1dc52ee82562abd57e9546c409f2f887f45187aae012fe43af0b730611ae
|
||||
PKG_HASH:=66d1d991d7a993fdf254d4c425f0fdd38c9cca15b1735936695a486067a6a9f8
|
||||
|
||||
PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
|
||||
PKG_LICENCE:=GPL-2.0
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
@ -28,7 +30,7 @@ define Package/gammu
|
|||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
TITLE:=Cell phone/modem SMS and control tool
|
||||
URL:=http://dl.cihar.com/gammu/releases/
|
||||
URL:=https://wammu.eu/gammu/
|
||||
DEPENDS:=+libpthread +libcurl +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
|
||||
DEPENDS+=+PACKAGE_python:python +PACKAGE_bluez-libs:bluez-libs
|
||||
DEPENDS+=+PACKAGE_libmariadb:libmariadb +PACKAGE_unixodbc:unixodbc +PACKAGE_libpq:libpq
|
||||
|
|
|
@ -1,36 +1,41 @@
|
|||
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
|
||||
index 3ec0493..f716700 100644
|
||||
--- a/cmake/FindIconv.cmake
|
||||
+++ b/cmake/FindIconv.cmake
|
||||
@@ -34,9 +34,9 @@ string(REGEX REPLACE "(.*)/include/?" "\
|
||||
@@ -9,10 +9,10 @@
|
||||
include(CheckCCompilerFlag)
|
||||
include(CheckCSourceCompiles)
|
||||
|
||||
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib)
|
||||
|
||||
-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
+IF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
SET(ICONV_FOUND TRUE)
|
||||
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
+ENDIF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
-IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
+IF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
# Already in cache, be silent
|
||||
SET(ICONV_FIND_QUIETLY TRUE)
|
||||
-ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
+ENDIF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
|
||||
|
||||
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
|
||||
IF(APPLE)
|
||||
FIND_PATH(ICONV_INCLUDE_DIR iconv.h
|
||||
diff --git a/configure b/configure
|
||||
index 4f51ca7..5b0d993 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -31,6 +31,7 @@ Usage: ./configure [options]
|
||||
@@ -33,6 +33,7 @@ Usage: ./configure [options]
|
||||
--enable-backup enable backup support
|
||||
--enable-win32 enable mingw crosscomilation
|
||||
--enable-protection enable compile time protections
|
||||
+--disable-iconv disable iconv support
|
||||
--with-python=<path> path to Python interpreter
|
||||
--without-gnapplet disable installation of gnapplet
|
||||
--without-completion disable installation of bash completion script
|
||||
@@ -57,6 +58,7 @@ CMAKE_PROTECTION=
|
||||
CMAKE_PYTHON=
|
||||
|
||||
@@ -57,6 +58,7 @@ CMAKE_CROSS=
|
||||
CMAKE_PROTECTION=
|
||||
CMAKE_GNAP=
|
||||
CMAKE_COMPLETE=
|
||||
+CMAKE_ICONV=
|
||||
|
||||
# process command line
|
||||
while [ "$#" -gt 0 ] ; do
|
||||
@@ -94,6 +96,12 @@ while [ "$#" -gt 0 ] ; do
|
||||
@@ -91,6 +93,12 @@ while [ "$#" -gt 0 ] ; do
|
||||
--disable-protection)
|
||||
CMAKE_PROTECTION="-DENABLE_PROTECTION=OFF"
|
||||
;;
|
||||
|
@ -43,9 +48,9 @@
|
|||
--enable-debug)
|
||||
CMAKE_DEBUG="-DCMAKE_BUILD_TYPE=Debug"
|
||||
;;
|
||||
@@ -142,4 +150,4 @@ fi
|
||||
@@ -139,4 +147,4 @@ fi
|
||||
cd "$BUILD_DIR"
|
||||
|
||||
# invoke cmake to do configuration
|
||||
-cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE
|
||||
+cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
-cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE
|
||||
+cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -537,8 +537,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
|
||||
@@ -511,8 +511,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
|
||||
# MACRO_TUNE_LINKER("-pie")
|
||||
# These do not work on Windows right now
|
||||
if (NOT WIN32)
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -25,6 +25,7 @@ Usage: ./configure [options]
|
||||
@@ -27,6 +27,7 @@ Usage: ./configure [options]
|
||||
|
||||
--help|-h shows this help
|
||||
--prefix=<path> installation prefix
|
||||
|
@ -16,7 +16,7 @@
|
|||
--enable-shared enables shared build
|
||||
--enable-debug enables debug build
|
||||
--enable-tiger enables Mac OS X 10.4 (Tiger) build
|
||||
@@ -50,6 +51,7 @@ SOURCE_DIR=`pwd`
|
||||
@@ -51,6 +52,7 @@ SOURCE_DIR=`pwd`
|
||||
|
||||
# cmake parameters
|
||||
CMAKE_PREFIX=
|
||||
|
@ -32,12 +32,12 @@
|
|||
+ CMAKE_ROOT="-DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/Toolchain-cross.cmake"
|
||||
+ echo "SET(CMAKE_FIND_ROOT_PATH ${1##--cross-root=})" >> $SOURCE_DIR/cmake/Toolchain-cross.cmake
|
||||
+ ;;
|
||||
--with-python=*)
|
||||
CMAKE_PYTHON="-DBUILD_PYTHON=${1##--with-python=}"
|
||||
--enable-backup)
|
||||
CMAKE_BACKUP="-DWITH_BACKUP=ON"
|
||||
;;
|
||||
@@ -150,4 +156,4 @@ fi
|
||||
@@ -147,4 +153,4 @@ fi
|
||||
cd "$BUILD_DIR"
|
||||
|
||||
# invoke cmake to do configuration
|
||||
-cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
-cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -36,6 +36,7 @@ Usage: ./configure [options]
|
||||
--with-python=<path> path to Python interpreter
|
||||
@@ -37,6 +37,7 @@ Usage: ./configure [options]
|
||||
--disable-iconv disable iconv support
|
||||
--without-gnapplet disable installation of gnapplet
|
||||
--without-completion disable installation of bash completion script
|
||||
+--without-libdbi disable libdbi support
|
||||
|
@ -16,7 +16,7 @@
|
|||
|
||||
# process command line
|
||||
while [ "$#" -gt 0 ] ; do
|
||||
@@ -120,6 +122,9 @@ while [ "$#" -gt 0 ] ; do
|
||||
@@ -117,6 +119,9 @@ while [ "$#" -gt 0 ] ; do
|
||||
--without-completion)
|
||||
CMAKE_COMPLETE="-DINSTALL_BASH_COMPLETION=OFF"
|
||||
;;
|
||||
|
@ -26,9 +26,9 @@
|
|||
--build=*)
|
||||
;;
|
||||
--disable-dependency-tracking)
|
||||
@@ -156,4 +161,4 @@ fi
|
||||
@@ -153,4 +158,4 @@ fi
|
||||
cd "$BUILD_DIR"
|
||||
|
||||
# invoke cmake to do configuration
|
||||
-cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV $CMAKE_LIBDBI
|
||||
-cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
|
||||
+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV $CMAKE_LIBDBI
|
||||
|
|
Loading…
Reference in New Issue