[oe-commits] Roman I Khimov : at 3.1.12: fix parallel make fix

git version control git at git.openembedded.org
Thu Dec 9 18:49:44 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9c3dfa69e80ed20cb835eff11f98cf0f0256c9e1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9c3dfa69e80ed20cb835eff11f98cf0f0256c9e1

Author: Roman I Khimov <khimov at altell.ru>
Date:   Tue Nov 23 16:16:20 2010 +0300

at 3.1.12: fix parallel make fix

Use dummy target to avoid race with double yacc invocation.

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/at/at-3.1.12/at-parallel-make-fix.patch |   14 ++++++++++----
 recipes/at/at_3.1.12.bb                         |    2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/recipes/at/at-3.1.12/at-parallel-make-fix.patch b/recipes/at/at-3.1.12/at-parallel-make-fix.patch
index c456416..3b20f65 100644
--- a/recipes/at/at-3.1.12/at-parallel-make-fix.patch
+++ b/recipes/at/at-3.1.12/at-parallel-make-fix.patch
@@ -1,9 +1,15 @@
 Index: at-3.1.12/Makefile.in
 ===================================================================
---- at-3.1.12.orig/Makefile.in	2010-08-22 18:48:13.000000000 +0400
-+++ at-3.1.12/Makefile.in	2010-08-22 18:48:38.000000000 +0400
-@@ -80,7 +80,7 @@
- y.tab.c y.tab.h: parsetime.y
+--- at-3.1.12.orig/Makefile.in	2010-09-13 15:28:33.000000000 +0400
++++ at-3.1.12/Makefile.in	2010-11-23 15:45:01.000000000 +0300
+@@ -77,10 +77,12 @@
+ atd: $(RUNOBJECTS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
+ 
+-y.tab.c y.tab.h: parsetime.y
++y.tab.c y.tab.h: genparsetime
++
++genparsetime:
  	$(YACC) -d parsetime.y
  
 -lex.yy.c: parsetime.l
diff --git a/recipes/at/at_3.1.12.bb b/recipes/at/at_3.1.12.bb
index e9080a6..d373edb 100644
--- a/recipes/at/at_3.1.12.bb
+++ b/recipes/at/at_3.1.12.bb
@@ -5,7 +5,7 @@ DEPENDS = "flex-native flex"
 RCONFLICTS_${PN} = "atd"
 RREPLACES_${PN} = "atd"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = " \
 	${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \





More information about the Openembedded-commits mailing list