fixed to bug 947 and 968

PATCH New Dexuan Cui 1 participant 3 messages Apr 15, 2011

lore

Share & tools

lore

Dexuan Cui

author

2011-04-15 09:01 UTC #0 lore raw

cover fixed to bug 947 and 968

From: Dexuan Cui <[email protected]>

Bug #968:
changes from previous version:
1) added Upstream-Status
2) bumped PR

Bug #947:
The patch fixes a parallel-make issue that blocked nightly lsb build for
days: when generating $(SHAREDDIR)/%.o, we should ensure the directory ${SHAREDDIR} exists.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dcui/master
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master

Thanks,
Dexuan Cui <[email protected]>
---

Dexuan Cui (2):
gnu-config-native: add dependency on perl-native
libnewt: fix parallel-make issue

 .../gnu-config/config-guess-uclibc.patch           |    2 +
 .../gnu-config/gnu-config_20080123.bb              |    6 +++-
 .../newt/files/fix_SHAREDDIR.patch                 |   29 ++++++++++++++++++++
 .../newt/files/include-without-python.patch        |    2 +
 meta/recipes-extended/newt/libnewt_0.52.12.bb      |    7 +++-
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-extended/newt/files/fix_SHAREDDIR.patch

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-04-15 09:01 UTC #1 lore raw

PATCH 1/2 gnu-config-native: add dependency on perl-native

From: Dexuan Cui <[email protected]>

Fixes [YOCTO #968]

Signed-off-by Dexuan Cui <[email protected]>

---
 .../gnu-config/config-guess-uclibc.patch           |    2 ++
 .../gnu-config/gnu-config_20080123.bb              |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +2 -0

index f820cef..f862c83 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch.
 
 updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)

meta/recipes-devtools/gnu-config/gnu-config_20080123.bb +4 -2

index e0a8155..897984d 100644
@@ -3,12 +3,14 @@ DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a direc
 SECTION = "devel"
 LICENSE = "GPLv1+"
 LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a089987af4a25cb0419d1c2fd6d495e3"
-DEPENDS = ""
+
+DEPENDS_virtclass-native = "perl-native"
+
 INHIBIT_DEFAULT_DEPS = "1"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.1+cvs${FIXEDSRCDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "cvs://[email protected]/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
 	   file://config-guess-uclibc.patch \

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-04-15 09:02 UTC #2 lore raw

PATCH 2/2 libnewt: fix parallel-make issue

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Fixes [YOCTO #947]

Signed-off-by Dexuan Cui <[email protected]>

---
 .../newt/files/fix_SHAREDDIR.patch                 |   29 ++++++++++++++++++++
 .../newt/files/include-without-python.patch        |    2 +
 meta/recipes-extended/newt/libnewt_0.52.12.bb      |    7 +++-
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/newt/files/fix_SHAREDDIR.patch

meta/recipes-extended/newt/files/fix_SHAREDDIR.patch new file +29 -0

new file mode 100644
index 0000000..7795260
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+Author: [email protected]
+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 <[email protected]>
+
+--- 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

meta/recipes-extended/newt/files/include-without-python.patch +2 -0

index 277ee33..263e9de 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <[email protected]>
 Date: Thu, 20 Jan 2011 14:14:51 -0200

meta/recipes-extended/newt/libnewt_0.52.12.bb +5 -2

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

Signature · 1 line

1.7.2