Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1968 from thess/smstools-work

Browse source 
smstools3: Fix NLS build dependencies
This commit is contained in:
Ted Hess 2015-11-25 09:03:46 -05:00
commit 0c4cc6bd57
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
utils/smstools3/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=smstools3 PKG_NAME:=smstools3
PKG_VERSION:=3.1.15 PKG_VERSION:=3.1.15
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=Gérald Kerma <dreagle@doukki.net> PKG_MAINTAINER:=Gérald Kerma <dreagle@doukki.net>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -22,15 +22,15 @@ PKG_SOURCE_URL:=http://smstools3.kekekasvi.com/packages/
PKG_MD5SUM:=0241ef60e646fac1a06254a848e61ed7 PKG_MD5SUM:=0241ef60e646fac1a06254a848e61ed7
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS:=libiconv-full iconv
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/smstools3 define Package/smstools3
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=SMS Server Tools 3 TITLE:=SMS Server Tools 3
DEPENDS:=+libiconv-full +iconv DEPENDS:=$(ICONV_DEPENDS)
URL:=http://smstools3.kekekasvi.com/ URL:=http://smstools3.kekekasvi.com/
endef endef
@ -39,23 +39,17 @@ define Package/smstools3/description
short messages through GSM modems and mobile phones. short messages through GSM modems and mobile phones.
endef endef
TARGET_CFLAGS = -D NUMBER_OF_MODEMS=1 TARGET_CFLAGS += -D NUMBER_OF_MODEMS=1
TARGET_CFLAGS += -D USE_ICONV TARGET_CFLAGS += -D USE_ICONV
TARGET_CFLAGS += -D DISABLE_INET_SOCKET TARGET_CFLAGS += -D DISABLE_INET_SOCKET
TARGET_CFLAGS += -W -Wall TARGET_CFLAGS += -W -Wall
TARGET_CFLAGS += -D_FILE_OFFSET_BITS=64 TARGET_CFLAGS += -D_FILE_OFFSET_BITS=64
TARGET_LDFLAGS += -liconv MAKE_VARS += LFLAGS="$(TARGET_LDFLAGS) $(if $(ICONV_FULL),-liconv)"
BINDIR=/usr/local/bin BINDIR=/usr/local/bin
define Build/Compile define Package/smstools3/configure
$(MAKE) -C "$(PKG_BUILD_DIR)/src" \
CC="$(TARGET_CC)" \
CFLAGS='$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) \
-I"$(STAGING_DIR)/usr/lib/libiconv-full/include"' \
LFLAGS='$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -L"$(STAGING_DIR)/usr/lib/libiconv-full/lib"' \
all
endef endef
define Package/smstools3/install define Package/smstools3/install

16
utils/smstools3/patches/002-Makefile.patch
View file

@ -1,6 +1,15 @@
--- a/src/Makefile 2014-12-20 18:33:55.654252867 +0100 --- a/src/Makefile
+++ b/src/Makefile 2014-12-20 18:31:10.241359741 +0100 +++ b/src/Makefile
@@ -43,7 +43,7 @@ @@ -1,7 +1,7 @@
# In case of windows, use os_cygwin=yes setting in the configuration file (smsd.conf).
# Select your setup size:
-CFLAGS = -D NUMBER_OF_MODEMS=64
+CFLAGS ?= -D NUMBER_OF_MODEMS=64
# Uncomment for Solaris
# CFLAGS += -D SOLARIS
@@ -43,7 +43,7 @@ smsd: smsd.c extras.o locking.o cfgfile.
ifneq (,$(findstring SOLARIS,$(CFLAGS))) ifneq (,$(findstring SOLARIS,$(CFLAGS)))
ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
@ -9,4 +18,3 @@
endif endif
endif endif