mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
gammu: Update to 1.40.0
Cleaned up Makefile for consistency between packages. Switched to CMAKE_INSTALL to get rid of the InstallDev section. Refreshed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
|
||||
index 3ec0493..f716700 100644
|
||||
--- a/cmake/FindIconv.cmake
|
||||
+++ b/cmake/FindIconv.cmake
|
||||
@@ -9,10 +9,10 @@
|
||||
@@ -15,8 +13,6 @@ index 3ec0493..f716700 100644
|
||||
|
||||
IF(APPLE)
|
||||
FIND_PATH(ICONV_INCLUDE_DIR iconv.h
|
||||
diff --git a/configure b/configure
|
||||
index 4f51ca7..5b0d993 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -33,6 +33,7 @@ Usage: ./configure [options]
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -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)
|
||||
- # Stack protector
|
||||
- MACRO_TUNE_COMPILER("-fstack-protector")
|
||||
# Mark code read only
|
||||
MACRO_TUNE_LINKER("-Wl,-zrelro")
|
||||
endif (NOT WIN32)
|
||||
@@ -16,7 +16,7 @@
|
||||
--enable-shared enables shared build
|
||||
--enable-debug enables debug build
|
||||
--enable-tiger enables Mac OS X 10.4 (Tiger) build
|
||||
@@ -51,6 +52,7 @@ SOURCE_DIR=`pwd`
|
||||
@@ -51,6 +52,7 @@ BUILD_DIR="$SOURCE_DIR/build-configure"
|
||||
|
||||
# cmake parameters
|
||||
CMAKE_PREFIX=
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
All enable params have their disable counterparts.
|
||||
|
||||
@@ -61,6 +62,7 @@ CMAKE_PYTHON=
|
||||
@@ -61,6 +62,7 @@ CMAKE_PROTECTION=
|
||||
CMAKE_GNAP=
|
||||
CMAKE_COMPLETE=
|
||||
CMAKE_ICONV=
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/libgammu/device/devfunc.c
|
||||
+++ b/libgammu/device/devfunc.c
|
||||
@@ -24,6 +24,7 @@
|
||||
# include <signal.h>
|
||||
# include <sys/socket.h>
|
||||
# include <sys/stat.h>
|
||||
+# include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#include "devfunc.h"
|
||||
Reference in New Issue
Block a user