From 0c2a5e135860356cf51d1477e6dca8a320841e90 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 16 Jul 2015 12:54:05 +0800 Subject: 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 Signed-off-by: Darren Hart --- .../recipes-extended/zlib-qat/zlib-qat.bb | 2 ++ .../zlib-qat-qat_mem-use-the-right-compiler.patch | 31 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-qat_mem-use-the-right-compiler.patch diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat.bb index a9cc1d7f..4400696d 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" SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ https://01.org/sites/default/files/page/zlib_shim_0.4.7-002_withdocumentation.zip;name=zlibqat \ file://0001-Fix-for-Zlib-qat-Compilation-issue.patch \ + file://zlib-qat-qat_mem-use-the-right-compiler.patch \ " SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" @@ -65,6 +66,7 @@ do_patch() { cd ${S} patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch patch -p1 < ${WORKDIR}/0001-Fix-for-Zlib-qat-Compilation-issue.patch + patch -p1 < ${WORKDIR}/zlib-qat-qat_mem-use-the-right-compiler.patch } do_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 00000000..7b9af291 --- /dev/null +++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-qat_mem-use-the-right-compiler.patch @@ -0,0 +1,31 @@ +From 22a4ef23792251c284d9766ab5ee87cbeeef2ec4 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Thu, 16 Jul 2015 11:05:38 +0800 +Subject: [PATCH] qat_mem: use the right compiler + +Upstream-Status: Inappropriate [Configuration] + +Use $(CC) instead of gcc directly. Makes sure that the +right options are being passed for cross-compile. + +Signed-off-by: Anuj Mittal +--- + contrib/qat/qat_mem/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/qat/qat_mem/Makefile b/contrib/qat/qat_mem/Makefile +index 0a521f2..2c7c8dc 100644 +--- a/contrib/qat/qat_mem/Makefile ++++ b/contrib/qat/qat_mem/Makefile +@@ -64,7 +64,7 @@ MODULENAME := qat_mem + KDIR := $(KERNEL_SOURCE_ROOT) + PWD := $(shell pwd) + +-CC := gcc -Wall -imacros $(KERNEL_SOURCE_ROOT)/include/generated/autoconf.h ++CC := $(CC) -Wall -imacros $(KERNEL_SOURCE_ROOT)/include/generated/autoconf.h + + ifeq ($(KERNELRELEASE),) + all: $(MODULENAME)_test +-- +1.7.9.5 + -- cgit v1.2.3-54-g00ecf