mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
gammu: remove nls.mk
It's causing issues with newer glib2: ../libgammu/libGammu.so.8.1.41.0: undefined reference to `libiconv' ../libgammu/libGammu.so.8.1.41.0: undefined reference to `libiconv_open' ../libgammu/libGammu.so.8.1.41.0: undefined reference to `libiconv_close' It's because the libiconv-stub does not include a shared library that gammu can link to. Removed most patches since they don't seem to be needed. Ran init script through shellcheck. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
@@ -1,52 +0,0 @@
|
||||
--- a/cmake/FindIconv.cmake
|
||||
+++ b/cmake/FindIconv.cmake
|
||||
@@ -9,10 +9,10 @@
|
||||
include(CheckCCompilerFlag)
|
||||
include(CheckCSourceCompiles)
|
||||
|
||||
-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)
|
||||
|
||||
IF(APPLE)
|
||||
FIND_PATH(ICONV_INCLUDE_DIR iconv.h
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -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
|
||||
--without-gnapplet disable installation of gnapplet
|
||||
--without-completion disable installation of bash completion script
|
||||
|
||||
@@ -57,6 +58,7 @@ CMAKE_CROSS=
|
||||
CMAKE_PROTECTION=
|
||||
CMAKE_GNAP=
|
||||
CMAKE_COMPLETE=
|
||||
+CMAKE_ICONV=
|
||||
|
||||
# process command line
|
||||
while [ "$#" -gt 0 ] ; do
|
||||
@@ -91,6 +93,12 @@ while [ "$#" -gt 0 ] ; do
|
||||
--disable-protection)
|
||||
CMAKE_PROTECTION="-DENABLE_PROTECTION=OFF"
|
||||
;;
|
||||
+ --enable-iconv)
|
||||
+ CMAKE_ICONV="-DDISABLE_ICONV=OFF"
|
||||
+ ;;
|
||||
+ --disable-iconv)
|
||||
+ CMAKE_ICONV="-DDISABLE_ICONV=ON"
|
||||
+ ;;
|
||||
--enable-debug)
|
||||
CMAKE_DEBUG="-DCMAKE_BUILD_TYPE=Debug"
|
||||
;;
|
||||
@@ -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_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,43 +0,0 @@
|
||||
--- /dev/null
|
||||
+++ b/cmake/Toolchain-cross.cmake
|
||||
@@ -0,0 +1,5 @@
|
||||
+# search for programs in the build host directories
|
||||
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
+# for libraries and headers in the target directories
|
||||
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -27,6 +27,7 @@ Usage: ./configure [options]
|
||||
|
||||
--help|-h shows this help
|
||||
--prefix=<path> installation prefix
|
||||
+--cross-root=<path> cross-compilation prefix
|
||||
--enable-shared enables shared build
|
||||
--enable-debug enables debug build
|
||||
--enable-tiger enables Mac OS X 10.4 (Tiger) build
|
||||
@@ -51,6 +52,7 @@ BUILD_DIR="$SOURCE_DIR/build-configure"
|
||||
|
||||
# cmake parameters
|
||||
CMAKE_PREFIX=
|
||||
+CMAKE_ROOT=
|
||||
CMAKE_SHARED=
|
||||
CMAKE_DEBUG=
|
||||
CMAKE_BACKUP=
|
||||
@@ -69,6 +71,10 @@ while [ "$#" -gt 0 ] ; do
|
||||
--prefix=*)
|
||||
CMAKE_PREFIX="-DCMAKE_INSTALL_PREFIX=${1##--prefix=}"
|
||||
;;
|
||||
+ --cross-root=*)
|
||||
+ 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
|
||||
+ ;;
|
||||
--enable-backup)
|
||||
CMAKE_BACKUP="-DWITH_BACKUP=ON"
|
||||
;;
|
||||
@@ -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_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,34 +0,0 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -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
|
||||
|
||||
All enable params have their disable counterparts.
|
||||
|
||||
@@ -61,6 +62,7 @@ CMAKE_PROTECTION=
|
||||
CMAKE_GNAP=
|
||||
CMAKE_COMPLETE=
|
||||
CMAKE_ICONV=
|
||||
+CMAKE_LIBDBI=
|
||||
|
||||
# process command line
|
||||
while [ "$#" -gt 0 ] ; do
|
||||
@@ -117,6 +119,9 @@ while [ "$#" -gt 0 ] ; do
|
||||
--without-completion)
|
||||
CMAKE_COMPLETE="-DINSTALL_BASH_COMPLETION=OFF"
|
||||
;;
|
||||
+ --without-libdbi)
|
||||
+ CMAKE_LIBDBI="-DWITH_LibDBI=OFF"
|
||||
+ ;;
|
||||
--build=*)
|
||||
;;
|
||||
--disable-dependency-tracking)
|
||||
@@ -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_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
|
||||
Reference in New Issue
Block a user