summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anujx.mittal@intel.com>2015-07-16 04:54:05 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2015-07-22 17:01:36 (GMT)
commit0c2a5e135860356cf51d1477e6dca8a320841e90 (patch)
treef472c5c450618b8766a9941db66bcd77f71dbebb
parent3ee02a36e0d1126fda0c6ea6a1bef4db08b8be7a (diff)
downloadmeta-intel-0c2a5e135860356cf51d1477e6dca8a320841e90.tar.gz
meta-crystalforest: use correct compiler for zlib
Changed the qat_mem makefile to use $(CC) instead of gcc directly. This avoids build errors and makes sure that right options are being passed for cross-compile. Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb2
-rw-r--r--meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-qat_mem-use-the-right-compiler.patch31
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb
index a9cc1d7..4400696 100644
--- a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb
+++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb
@@ -19,6 +19,7 @@ DEPENDS += "cryptodev-linux pkgconfig qat16"
19SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ 19SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \
20 https://01.org/sites/default/files/page/zlib_shim_0.4.7-002_withdocumentation.zip;name=zlibqat \ 20 https://01.org/sites/default/files/page/zlib_shim_0.4.7-002_withdocumentation.zip;name=zlibqat \
21 file://0001-Fix-for-Zlib-qat-Compilation-issue.patch \ 21 file://0001-Fix-for-Zlib-qat-Compilation-issue.patch \
22 file://zlib-qat-qat_mem-use-the-right-compiler.patch \
22 " 23 "
23 24
24SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" 25SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40"
@@ -65,6 +66,7 @@ do_patch() {
65 cd ${S} 66 cd ${S}
66 patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch 67 patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch
67 patch -p1 < ${WORKDIR}/0001-Fix-for-Zlib-qat-Compilation-issue.patch 68 patch -p1 < ${WORKDIR}/0001-Fix-for-Zlib-qat-Compilation-issue.patch
69 patch -p1 < ${WORKDIR}/zlib-qat-qat_mem-use-the-right-compiler.patch
68} 70}
69 71
70do_configure() { 72do_configure() {
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-qat_mem-use-the-right-compiler.patch b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-qat_mem-use-the-right-compiler.patch
new file mode 100644
index 0000000..7b9af29
--- /dev/null
+++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-qat_mem-use-the-right-compiler.patch
@@ -0,0 +1,31 @@
1From 22a4ef23792251c284d9766ab5ee87cbeeef2ec4 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anujx.mittal@intel.com>
3Date: Thu, 16 Jul 2015 11:05:38 +0800
4Subject: [PATCH] qat_mem: use the right compiler
5
6Upstream-Status: Inappropriate [Configuration]
7
8Use $(CC) instead of gcc directly. Makes sure that the
9right options are being passed for cross-compile.
10
11Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
12---
13 contrib/qat/qat_mem/Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/contrib/qat/qat_mem/Makefile b/contrib/qat/qat_mem/Makefile
17index 0a521f2..2c7c8dc 100644
18--- a/contrib/qat/qat_mem/Makefile
19+++ b/contrib/qat/qat_mem/Makefile
20@@ -64,7 +64,7 @@ MODULENAME := qat_mem
21 KDIR := $(KERNEL_SOURCE_ROOT)
22 PWD := $(shell pwd)
23
24-CC := gcc -Wall -imacros $(KERNEL_SOURCE_ROOT)/include/generated/autoconf.h
25+CC := $(CC) -Wall -imacros $(KERNEL_SOURCE_ROOT)/include/generated/autoconf.h
26
27 ifeq ($(KERNELRELEASE),)
28 all: $(MODULENAME)_test
29--
301.7.9.5
31