diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2015-05-26 16:19:49 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 10:35:17 +0200 |
| commit | ea207e810403efc47a2d16ad0842193c7e727402 (patch) | |
| tree | ce4b62cb86993517f1980c84b00e8952bbaebfac /meta-oe | |
| parent | f7f2657dac50d9cf80411cf05c35fb76219a4044 (diff) | |
| download | meta-openembedded-contrib-ea207e810403efc47a2d16ad0842193c7e727402.tar.gz | |
smstools: fix makefile override
Fix syntax error in src/Makefile, override in wrong place.
The patch is backport from debian.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb | 3 |
2 files changed, 26 insertions, 1 deletions
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch new file mode 100644 index 0000000000..f0a1d33c96 --- /dev/null +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch @@ -0,0 +1,24 @@ +Upstream-Status: Backport [debian] + +--- a/src/Makefile ++++ b/src/Makefile +@@ -37,16 +37,15 @@ + # Use the following only on GNU/Linux and only if you need ps listing like "smsd: MAINPROCESS" and "smsd: GSM1" + # CFLAGS += -D USE_LINUX_PS_TRICK + +-all: smsd +- +-smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o +- + ifneq (,$(findstring SOLARIS,$(CFLAGS))) + ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) + override LFLAGS += -lsocket -lnsl + endif + endif + ++all: smsd ++ ++smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o + ifneq (,$(findstring NOSTATS,$(CFLAGS))) + $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) + else diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb index c4b6b60c1e..95adecdf96 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682" HOMEPAGE = "http://smstools3.kekekasvi.com" SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \ - file://sms_binpath_and_psops.patch" + file://sms_binpath_and_psops.patch \ + file://fix-makefile-override.patch" SRC_URI[md5sum] = "0241ef60e646fac1a06254a848e61ed7" SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59" |