[meta-intel] [meta-intel[meta-isg][fido][master][PATCH 4/7] meta-isg: fix build of dpdk_qat example app

[Darren Hart]

On 7/28/15 1:05 AM, chia.chuan.wu at intel.com wrote:
> From: Anuj Mittal <anujx.mittal at intel.com>
> 
> Make sure that the dpdk_qat example app builds okay
> when enabled using PACKAGECONFIG ?= " dpdk_qat".

In addition to what you intend to do with the patch, please describe the
problem the patch is intended to address. How do things fail currently?

> 
> Added a patch to dpdk_qat makefile to point to correct location
> of qat libs and headers.
> 
> Signed-off-by: Anuj Mittal <anujx.mittal at intel.com>
> ---
>  meta-isg/common/recipes-extended/dpdk/dpdk.inc     |  2 +
>  ...0-point-to-the-right-include-and-lib-path.patch | 43 ++++++++++++++++++++++
>  2 files changed, 45 insertions(+)
>  create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch
> 
> diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
> index 3106959..4b1a0c6 100644
> --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
> +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
> @@ -7,6 +7,7 @@ SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
>  	   file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch \
>  	   file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
>  	   file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \
> +	   file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch \
>  	  "
>  
>  # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
> @@ -40,6 +41,7 @@ export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}"
>  export INSTALL_PATH = "${prefix}/dpdk"
>  export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
>  export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}"
> +export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac"
>  
>  # The list of intel Comms platforms and their target machine
>  # process mapping. The supported target machine is listed under
> diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch
> new file mode 100644
> index 0000000..75bb517
> --- /dev/null
> +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch
> @@ -0,0 +1,43 @@
> +From 928595c80ae28d19861d7e76ed898a8fb3f2c1dc Mon Sep 17 00:00:00 2001
> +From: Anuj Mittal <anujx.mittal at intel.com>
> +Date: Fri, 24 Jul 2015 23:57:17 +0800
> +Subject: [PATCH] dpdk: point to the right include and lib path
> +
> +Upstream-Status: Inappropriate [Configuration]
> +
> +Make sure that we point to the right location of qat
> +lac headers and library.
> +
> +Signed-off-by: Anuj Mittal <anujx.mittal at intel.com>
> +---
> + examples/dpdk_qat/Makefile |    7 ++-----
> + 1 file changed, 2 insertions(+), 5 deletions(-)
> +
> +diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile
> +index f1e06a1..5b906f7 100644
> +--- a/examples/dpdk_qat/Makefile
> ++++ b/examples/dpdk_qat/Makefile
> +@@ -66,18 +66,15 @@ SRCS-y := main.c crypto.c
> + 
> + CFLAGS += -O3
> + CFLAGS += $(WERROR_FLAGS)
> +-CFLAGS += -I$(ICP_ROOT)/quickassist/include \
> +-		-I$(ICP_ROOT)/quickassist/include/lac \
> +-		-I$(ICP_ROOT)/quickassist/lookaside/access_layer/include
> ++CFLAGS += -I$(ICP_LAC_API_DIR)
> + 
> + # From CRF 1.2 driver, library was renamed to libicp_qa_al.a
> + ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),)
> + ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a
> + else
> +-ICP_LIBRARY_PATH = $(ICP_ROOT)/build/libicp_qa_al.a
> ++ICP_LIBRARY_PATH = $(ICP_LIB_ROOT)/libicp_qa_al.a
> + endif
> + 
> +-LDLIBS += -L$(ICP_ROOT)/build
> + LDLIBS += $(ICP_LIBRARY_PATH) \
> +                 -lz \
> +                 -losal \
> +-- 
> +1.7.9.5
> +
> 

-- 
Darren Hart
Intel Open Source Technology Center