summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-04-15 16:40:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-18 05:49:39 +0100
commitd02a174cb637ede72cdd6cef28ebde4d12bb97e9 (patch)
tree278dce0b9ace52f161a5fb568404ea18c1fc897a
parent86549fac82192c549966d3cb4ab7dcc8cb3596e2 (diff)
downloadpoky-d02a174cb637ede72cdd6cef28ebde4d12bb97e9.tar.gz
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>
-rw-r--r--meta/recipes-extended/newt/files/fix_SHAREDDIR.patch29
-rw-r--r--meta/recipes-extended/newt/files/include-without-python.patch2
-rw-r--r--meta/recipes-extended/newt/files/remove_slang_include.patch13
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.12.bb8
4 files changed, 50 insertions, 2 deletions
diff --git a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
new file mode 100644
index 0000000000..7795260388
--- /dev/null
+++ b/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
@@ -0,0 +1,29 @@
1Upstream-Status: Pending
2
3Author: dexuan.cui@intel.com
4Date: Fri Apr 15 16:17:39 CST 2011
5
6The patch fixes a parallel-make issue: when generating $(SHAREDDIR)/%.o, we should
7ensure the directory ${SHAREDDIR} exists.
8
9We need to push the patch to upstream.
10
11Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
12
13--- a/Makefile.in
14+++ b/Makefile.in
15@@ -114,12 +114,12 @@
16
17 sharedlib: $(LIBNEWTSH)
18
19-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
20+$(LIBNEWTSH): $(SHAREDOBJS)
21 $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
22 ln -fs $(LIBNEWTSONAME) libnewt.so
23 ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
24
25-$(SHAREDDIR)/%.o : %.c
26+$(SHAREDDIR)/%.o : %.c $(SHAREDDIR)
27 $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
28
29 install: $(LIBNEWT) install-sh whiptail
diff --git a/meta/recipes-extended/newt/files/include-without-python.patch b/meta/recipes-extended/newt/files/include-without-python.patch
index 277ee3324d..263e9de039 100644
--- a/meta/recipes-extended/newt/files/include-without-python.patch
+++ b/meta/recipes-extended/newt/files/include-without-python.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001 3From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 4From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 20 Jan 2011 14:14:51 -0200 5Date: Thu, 20 Jan 2011 14:14:51 -0200
diff --git a/meta/recipes-extended/newt/files/remove_slang_include.patch b/meta/recipes-extended/newt/files/remove_slang_include.patch
new file mode 100644
index 0000000000..dbdeef0901
--- /dev/null
+++ b/meta/recipes-extended/newt/files/remove_slang_include.patch
@@ -0,0 +1,13 @@
1Index: git/Makefile.in
2===================================================================
3--- git.orig/Makefile.in
4+++ git/Makefile.in
5@@ -5,7 +5,7 @@ CC = @CC@
6 CPP = @CPP@
7 CFLAGS = @CFLAGS@
8 LDFLAGS = @LDFLAGS@
9-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
10+CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
11 GNU_LD = @GNU_LD@
12
13 VERSION = @VERSION@
diff --git a/meta/recipes-extended/newt/libnewt_0.52.12.bb b/meta/recipes-extended/newt/libnewt_0.52.12.bb
index eefd6bdfd9..e2ad55964d 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.12.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.12.bb
@@ -17,11 +17,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
17# slang needs to be >= 2.2 17# slang needs to be >= 2.2
18DEPENDS = "slang popt" 18DEPENDS = "slang popt"
19 19
20PR = "r0" 20PR = "r2"
21 21
22SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38" 22SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38"
23
23SRC_URI = "git://git.fedorahosted.org/git/newt;protocol=git \ 24SRC_URI = "git://git.fedorahosted.org/git/newt;protocol=git \
24 file://include-without-python.patch" 25 file://include-without-python.patch \
26 file://remove_slang_include.patch \
27 file://fix_SHAREDDIR.patch"
28
25S = "${WORKDIR}/git" 29S = "${WORKDIR}/git"
26 30
27EXTRA_OECONF = "--without-python --without-tcl" 31EXTRA_OECONF = "--without-python --without-tcl"