diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-12-09 19:55:48 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-12-09 19:55:48 +0100 |
| commit | 2d32ea408f25e2c66389f5b04dc5c16415ca5ca9 (patch) | |
| tree | fedf2c35558834dded98a3f7a0ef358ad69c78fe | |
| parent | 4537344b82c4cf35fa65966c9d5aaf6388d211ea (diff) | |
| parent | 9c3dfa69e80ed20cb835eff11f98cf0f0256c9e1 (diff) | |
| download | openembedded-2d32ea408f25e2c66389f5b04dc5c16415ca5ca9.tar.gz | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/at/at-3.1.12/at-parallel-make-fix.patch | 14 | ||||
| -rw-r--r-- | 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 c456416bd0..3b20f65907 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 e9080a691d..d373edbd04 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 \ |