Skip to contentSkip to conversation

2 fixes for meta-oe

PATCH New Yi Zhao 1 participant 3 messages May 26, 2015

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

cover 2 fixes for meta-oe

The following changes since commit 175406cdca39bf5b218bb4127a3e9c9bd11b653f:

recipes-multimedia: add gstreamer-0.10 recipes (2015-05-22 20:14:07 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib yzhao/2-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/2-fixes

Yi Zhao (2):
smstools: fix makefile override
acpitests: fix build failure for multilib

 .../smstools3/fix-makefile-override.patch          |   24 ++++++++++++++++++++
 .../smstools3/smstools3_3.1.15.bb                  |    3 ++-
 .../recipes-extended/acpica/acpitests_20140828.bb  |    2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 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 <[email protected]>
---
 .../smstools3/fix-makefile-override.patch          |   24 ++++++++++++++++++++
 .../smstools3/smstools3_3.1.15.bb                  |    3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch
meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch new file +24 -0
new file mode 100644
index 0000000..f0a1d33
@@ -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
meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +2 -1
index c4b6b60..95adecd 100644
@@ -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"
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/2 acpitests: fix build failure for multilib

In reply to Yi Zhao

bitbake lib32-acpitests
[snip]

| NOTE: make -j 2  -m32 OPT_CFLAGS=-Wall
| make: *** No rule to make target ` -m32'.  Stop.
| ERROR: oe_runmake failed

[snip]

Signed-off-by Yi Zhao <[email protected]>
---
 .../recipes-extended/acpica/acpitests_20140828.bb  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/acpica/acpitests_20140828.bb +1 -1
index da26582..1f6f190 100644
@@ -18,7 +18,7 @@ SRC_URI[acpica.sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f
 
 S = "${WORKDIR}/acpitests-unix-${PV}"
 
-EXTRA_OEMAKE = "'${HOST_CC_ARCH}' 'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "'CC=${TARGET_PREFIX}gcc ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}' 'OPT_CFLAGS=-Wall'"
 
 # The Makefiles expect a specific layout
 do_compile() {
Signature · 1 line
1.7.9.5