commit 0d10c8ae481164362f86587105362c5d195558fb
parent e056e5792e25034696e8b664318b73148fd8e79e
Author: Steven Barth <steven@midlink.org>
Date: Tue, 17 Feb 2015 17:23:28 +0100
Merge pull request #905 from psycho-nico/fix-gammu
gammu: disable libdbi support explicitly
Diffstat:
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile
@@ -36,7 +36,8 @@ endef
CONFIGURE_ARGS:= \
--prefix=/usr \
--cross-root="$(STAGING_DIR) $(TOOLCHAIN_DIR)" \
- --enable-shared
+ --enable-shared \
+ --without-libdbi \
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/utils/gammu/patches/004-cmake_libdbi_optional.patch b/utils/gammu/patches/004-cmake_libdbi_optional.patch
@@ -0,0 +1,34 @@
+--- a/configure
++++ b/configure
+@@ -36,6 +36,7 @@ Usage: ./configure [options]
+ --with-python=<path> path to Python interpreter
+ --without-gnapplet disable installation of gnapplet
+ --without-completion disable installation of bash completion script
++--without-libdbi disable libdbi support
+
+ All enable params have their disable counterparts.
+
+@@ -61,6 +62,7 @@ CMAKE_PYTHON=
+ CMAKE_GNAP=
+ CMAKE_COMPLETE=
+ CMAKE_ICONV=
++CMAKE_LIBDBI=
+
+ # process command line
+ while [ "$#" -gt 0 ] ; do
+@@ -120,6 +122,9 @@ while [ "$#" -gt 0 ] ; do
+ --without-completion)
+ CMAKE_COMPLETE="-DINSTALL_BASH_COMPLETION=OFF"
+ ;;
++ --without-libdbi)
++ CMAKE_LIBDBI="-DWITH_LibDBI=OFF"
++ ;;
+ --build=*)
+ ;;
+ --disable-dependency-tracking)
+@@ -156,4 +161,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
