sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libnewt: fix parallel-make issue 

Add patch to remove hardcoded /usr/include/slang

Fixes [YOCTO #947]

(From OE-Core rev: df818bd36864ba515aeeec0c5314d174313c03a3)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dexuan Cui 2011-04-15 16:40:47 +08:00 committed by Richard Purdie
parent 86549fac82
commit d02a174cb6
4 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta/recipes-extended/newt/files/fix_SHAREDDIR.patch Normal file
View File

@ -0,0 +1,29 @@
Upstream-Status: Pending
Author: dexuan.cui@intel.com
Date: Fri Apr 15 16:17:39 CST 2011
The patch fixes a parallel-make issue: when generating $(SHAREDDIR)/%.o, we should
ensure the directory ${SHAREDDIR} exists.
We need to push the patch to upstream.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,12 +114,12 @@
sharedlib: $(LIBNEWTSH)
-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+$(LIBNEWTSH): $(SHAREDOBJS)
$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
ln -fs $(LIBNEWTSONAME) libnewt.so
ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
-$(SHAREDDIR)/%.o : %.c
+$(SHAREDDIR)/%.o : %.c $(SHAREDDIR)
$(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
install: $(LIBNEWT) install-sh whiptail

2
meta/recipes-extended/newt/files/include-without-python.patch
View File

@ -1,3 +1,5 @@
Upstream-Status: Pending
From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 20 Jan 2011 14:14:51 -0200

13
meta/recipes-extended/newt/files/remove_slang_include.patch Normal file
View File

@ -0,0 +1,13 @@
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in
+++ git/Makefile.in
@@ -5,7 +5,7 @@ CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
+CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
GNU_LD = @GNU_LD@
VERSION = @VERSION@

8
meta/recipes-extended/newt/libnewt_0.52.12.bb
View File

@ -17,11 +17,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
# slang needs to be >= 2.2
DEPENDS = "slang popt"
PR = "r0"
PR = "r2"
SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38"
SRC_URI = "git://git.fedorahosted.org/git/newt;protocol=git \
file://include-without-python.patch"
file://include-without-python.patch \
file://remove_slang_include.patch \
file://fix_SHAREDDIR.patch"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--without-python --without-tcl"