aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-01-17 13:06:13 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-22 12:22:48 +0100
commitef03b5a1180e89afae8ab80ec826c27905d88e52 (patch)
treee0c5cd98d372199eaee010f0d238e878dd4626aa
parent6deef6adf3d59feaeae678ad693f2ba36e34e550 (diff)
downloadmeta-openembedded-contrib-ef03b5a1180e89afae8ab80ec826c27905d88e52.tar.gz
meta-openembedded-contrib-ef03b5a1180e89afae8ab80ec826c27905d88e52.tar.bz2
meta-openembedded-contrib-ef03b5a1180e89afae8ab80ec826c27905d88e52.zip
acpica: replace patch with EXTRA_OEMAKE args
No need to patch the makefile when you can just passs CC=${TARGET_PREFIX}gcc to make. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-extended/acpica/acpica_20140114.bb3
-rw-r--r--meta-oe/recipes-extended/acpica/files/cross-compile.patch19
2 files changed, 1 insertions, 21 deletions
diff --git a/meta-oe/recipes-extended/acpica/acpica_20140114.bb b/meta-oe/recipes-extended/acpica/acpica_20140114.bb
index 5cc2d5a946..2bb7ad7bf6 100644
--- a/meta-oe/recipes-extended/acpica/acpica_20140114.bb
+++ b/meta-oe/recipes-extended/acpica/acpica_20140114.bb
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c
DEPENDS = "bison flex"
SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
- file://cross-compile.patch \
file://no-werror.patch \
"
SRC_URI[md5sum] = "fcd4b7304f1bfabc7d4b9cfdecc6b0c6"
@@ -20,7 +19,7 @@ SRC_URI[sha256sum] = "0d5bd32690ab77e21ab143ef25361c314a4ed13c33a5fb3ddd6f5559ab
S = "${WORKDIR}/acpica-unix2-${PV}"
-EXTRA_OEMAKE = "'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc 'OPT_CFLAGS=-Wall'"
do_install() {
install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl
diff --git a/meta-oe/recipes-extended/acpica/files/cross-compile.patch b/meta-oe/recipes-extended/acpica/files/cross-compile.patch
deleted file mode 100644
index f2917ca994..0000000000
--- a/meta-oe/recipes-extended/acpica/files/cross-compile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: add cross compile support
-Forwarded: not-needed
-Author: Fathi Boudra <fathi.boudra@linaro.org>
-
----
- generate/unix/Makefile.config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/generate/unix/Makefile.config
-+++ b/generate/unix/Makefile.config
-@@ -35,7 +35,7 @@
- .SUFFIXES :
- PROGS = acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract iasl
- HOST ?= _CYGWIN
--CC = gcc
-+CC ?= $(CROSS_COMPILE)gcc
-
- #
- # Common defines