diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-12-04 10:00:39 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-21 19:16:51 +0100 |
commit | 552b06192a48f0dfab59fb4894742e4415757dc2 (patch) | |
tree | 438eb8791c45301a1157bf6dca6c8903b5df9063 /meta-oe/recipes-extended | |
parent | d2ec4eef07c977e2b30142b4e141436fea295eb1 (diff) | |
download | meta-openembedded-552b06192a48f0dfab59fb4894742e4415757dc2.tar.gz |
acpica: update recipe to 20131115 release
drop fix-parallel-build.patch
update md5sum/sha256sum
refresh no-werro.patch
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Acked-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r-- | meta-oe/recipes-extended/acpica/acpica_20131115.bb (renamed from meta-oe/recipes-extended/acpica/acpica_20130823.bb) | 7 | ||||
-rw-r--r-- | meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch | 80 | ||||
-rw-r--r-- | meta-oe/recipes-extended/acpica/files/no-werror.patch | 26 |
3 files changed, 14 insertions, 99 deletions
diff --git a/meta-oe/recipes-extended/acpica/acpica_20130823.bb b/meta-oe/recipes-extended/acpica/acpica_20131115.bb index 15dbebafc..8c9ecd438 100644 --- a/meta-oe/recipes-extended/acpica/acpica_20130823.bb +++ b/meta-oe/recipes-extended/acpica/acpica_20131115.bb | |||
@@ -10,15 +10,14 @@ SECTION = "console/tools" | |||
10 | LICENSE = "BSD | GPLv2" | 10 | LICENSE = "BSD | GPLv2" |
11 | LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" | 11 | LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" |
12 | DEPENDS = "bison flex" | 12 | DEPENDS = "bison flex" |
13 | PR="r1" | ||
14 | 13 | ||
15 | SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ | 14 | SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ |
16 | file://cross-compile.patch \ | 15 | file://cross-compile.patch \ |
17 | file://no-werror.patch \ | 16 | file://no-werror.patch \ |
18 | file://fix-parallel-build.patch" | 17 | " |
19 | 18 | ||
20 | SRC_URI[md5sum] = "6694a6a5baa4a23fba892b8ad23f3959" | 19 | SRC_URI[md5sum] = "1bd5b14c4c567ca2a113c05f4b28f29c" |
21 | SRC_URI[sha256sum] = "dcaf8bcdd146006e7c480d4249e014e38eb2ae3e4d2d40f90ec454312cc7e4d1" | 20 | SRC_URI[sha256sum] = "d699a880b84e04205eda2d5ad048c1c38a57289240caa5f0fb7ebdcd3aac83d2" |
22 | 21 | ||
23 | S = "${WORKDIR}/acpica-unix2-${PV}" | 22 | S = "${WORKDIR}/acpica-unix2-${PV}" |
24 | 23 | ||
diff --git a/meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch b/meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch deleted file mode 100644 index 42e3fb14c..000000000 --- a/meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile | ||
2 | index e9520ed..1b73d7a 100644 | ||
3 | --- a/generate/unix/iasl/Makefile | ||
4 | +++ b/generate/unix/iasl/Makefile | ||
5 | @@ -212,13 +212,10 @@ INTERMEDIATES = \ | ||
6 | MISC = \ | ||
7 | $(OBJDIR)/aslcompilerparse.h\ | ||
8 | $(OBJDIR)/aslcompiler.y.h\ | ||
9 | - $(OBJDIR)/aslcompilerparse.output\ | ||
10 | $(OBJDIR)/dtparserparse.h\ | ||
11 | $(OBJDIR)/dtparser.y.h\ | ||
12 | - $(OBJDIR)/dtparserparse.output\ | ||
13 | $(OBJDIR)/prparserparse.h\ | ||
14 | - $(OBJDIR)/prparser.y.h\ | ||
15 | - $(OBJDIR)/prparserparse.output | ||
16 | + $(OBJDIR)/prparser.y.h | ||
17 | |||
18 | # | ||
19 | # Flags specific to iASL compiler | ||
20 | @@ -240,21 +237,29 @@ include ../Makefile.rules | ||
21 | $(OBJDIR)/aslcompilerlex.c : $(ASL_COMPILER)/aslcompiler.l $(ASL_COMPILER)/aslsupport.l | ||
22 | $(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l | ||
23 | |||
24 | -$(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompilerparse.h : $(ASL_COMPILER)/aslcompiler.y | ||
25 | +$(OBJDIR)/aslcompilerparse.c : $(ASL_COMPILER)/aslcompiler.y | ||
26 | $(YACC) $(YFLAGS) -pAslCompiler -o$@ $? | ||
27 | |||
28 | $(OBJDIR)/dtparserlex.c : $(ASL_COMPILER)/dtparser.l | ||
29 | $(LEX) $(LFLAGS) -PDtParser -o$@ $? | ||
30 | |||
31 | -$(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparserparse.h : $(ASL_COMPILER)/dtparser.y | ||
32 | +$(OBJDIR)/dtparserparse.c : $(ASL_COMPILER)/dtparser.y | ||
33 | $(YACC) $(YFLAGS) -pDtParser -o$@ $? | ||
34 | |||
35 | $(OBJDIR)/prparserlex.c : $(ASL_COMPILER)/prparser.l | ||
36 | $(LEX) $(LFLAGS) -PPrParser -o$@ $? | ||
37 | |||
38 | -$(OBJDIR)/prparserparse.c $(OBJDIR)/prparserparse.h : $(ASL_COMPILER)/prparser.y | ||
39 | +$(OBJDIR)/prparserparse.c : $(ASL_COMPILER)/prparser.y | ||
40 | $(YACC) $(YFLAGS) -pPrParser -o$@ $? | ||
41 | |||
42 | +$(OBJDIR)/aslcompilerparse.h : $(OBJDIR)/aslcompilerparse.c | ||
43 | + touch $@ | ||
44 | + | ||
45 | +$(OBJDIR)/dtparserparse.h : $(OBJDIR)/dtparserparse.c | ||
46 | + touch $@ | ||
47 | + | ||
48 | +$(OBJDIR)/prparserparse.h: $(OBJDIR)/prparserparse.c | ||
49 | + touch $@ | ||
50 | |||
51 | # | ||
52 | # Rename the headers produced by bison/yacc | ||
53 | @@ -279,19 +284,21 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prparserparse.h | ||
54 | # by the utilities above and they are not necessarily ANSI C, etc. | ||
55 | # | ||
56 | $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c | ||
57 | - $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||
58 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
59 | |||
60 | $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c | ||
61 | - $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||
62 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
63 | |||
64 | $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c | ||
65 | - $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||
66 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
67 | |||
68 | $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c | ||
69 | - $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||
70 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
71 | |||
72 | $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c | ||
73 | - $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||
74 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
75 | |||
76 | $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c | ||
77 | - $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||
78 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
79 | + | ||
80 | +$(OBJECTS): $(HEADERS) | ||
diff --git a/meta-oe/recipes-extended/acpica/files/no-werror.patch b/meta-oe/recipes-extended/acpica/files/no-werror.patch index 9f96552fd..5d28f474f 100644 --- a/meta-oe/recipes-extended/acpica/files/no-werror.patch +++ b/meta-oe/recipes-extended/acpica/files/no-werror.patch | |||
@@ -8,29 +8,25 @@ Author: Fathi Boudra <fathi.boudra@linaro.org> | |||
8 | 8 | ||
9 | --- a/generate/unix/iasl/Makefile | 9 | --- a/generate/unix/iasl/Makefile |
10 | +++ b/generate/unix/iasl/Makefile | 10 | +++ b/generate/unix/iasl/Makefile |
11 | @@ -279,19 +279,19 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prpars | 11 | @@ -266,19 +266,19 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prpars |
12 | # by the utilities above and they are not necessarily ANSI C, etc. | 12 | # by the utilities above and they are not necessarily ANSI C, etc. |
13 | # | 13 | # |
14 | $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c | 14 | $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c |
15 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? | 15 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< |
16 | + $(CC) -c $(CFLAGS) -Wall -o$@ $? | 16 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< |
17 | 17 | ||
18 | $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c | 18 | $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c |
19 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? | 19 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< |
20 | + $(CC) -c $(CFLAGS) -Wall -o$@ $? | 20 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< |
21 | 21 | ||
22 | $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c | 22 | $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c |
23 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? | 23 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< |
24 | + $(CC) -c $(CFLAGS) -Wall -o$@ $? | 24 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< |
25 | 25 | ||
26 | $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c | 26 | $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c |
27 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? | 27 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< |
28 | + $(CC) -c $(CFLAGS) -Wall -o$@ $? | 28 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< |
29 | 29 | ||
30 | $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c | 30 | $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c |
31 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? | 31 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< |
32 | + $(CC) -c $(CFLAGS) -Wall -o$@ $? | 32 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< |
33 | |||
34 | $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c | ||
35 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? | ||
36 | + $(CC) -c $(CFLAGS) -Wall -o$@ $? | ||