From 305c1c0eb2495da74c5a92de888cd1f0b2843879 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 10 Jul 2015 18:57:44 +0800 Subject: meta-crystalforest: zlib-qat: remove extra cflags Remove the extra CFLAGS not required and added a patch to get rid of the rpath that is not required when linking to a lib in sysroot. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- ....4.7-002-zlib-Remove-rpaths-from-makefile.patch | 52 ++++++++++++++++++++++ .../zlib-qat/zlib-qat_0.4.7-002.bb | 34 ++++++-------- 2 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch new file mode 100644 index 00000000..c3605112 --- /dev/null +++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch @@ -0,0 +1,52 @@ +From aad2675c7bb635d8b7be47fa89a3ee87ba19d2e8 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Thu, 18 Jun 2015 11:46:17 +0800 +Subject: [PATCH] zlib: Remove rpaths from makefile + +Upstream-Status: Inappropriate [configuration] + +This removes references to RPATHS that are no longer +necesary when building using bitbake. + +Signed-off-by: Anuj Mittal +--- + Makefile.in | 4 ++-- + contrib/qat/qat_zlib_test/Makefile | 3 --- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 94d8a80..cba5291 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -59,12 +59,12 @@ ICP_LAC_API_DIR=$(ICP_API_DIR)/lac/ + ICP_DC_API_DIR=$(ICP_API_DIR)/dc/ + CFLAGS+=-D_GNU_SOURCE -I$(ICP_API_DIR) -I$(ICP_DC_API_DIR) -I$(ICP_LAC_API_DIR) -I$(ICP_SAL_API_DIR) + SFLAGS+=-D_GNU_SOURCE -I$(ICP_API_DIR) -I$(ICP_DC_API_DIR) -I$(ICP_LAC_API_DIR) -I$(ICP_SAL_API_DIR) +-ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz ++#ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz + SHARED_APP_FLAGS=-Wl,-rpath,$(ZLIB_ROOT) -L$(ZLIB_ROOT) -lz + + ifdef ICP_BUILD_OUTPUT + TEST_LDFLAGS+=-L$(ICP_BUILD_OUTPUT) +- ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) ++# ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) + endif + + ifdef ZLIB_DH895XCC +diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile +index 8a29a92..ca31dd2 100644 +--- a/contrib/qat/qat_zlib_test/Makefile ++++ b/contrib/qat/qat_zlib_test/Makefile +@@ -84,9 +84,6 @@ OBJS = $(SRCS:%.c=%.o) + COVERAGE_OBJS = + EXE= + LIBQAT= +-ifdef ICP_BUILD_OUTPUT +- LIBQAT+= -Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) +-endif + + DRIVER=icp_qa_al + ifdef WITH_CPA_MUX +-- +1.7.9.5 + diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb index 30e6700c..e2d2c451 100644 --- a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb +++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb @@ -20,6 +20,7 @@ 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://zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch \ file://zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch \ + file://zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch \ " SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" @@ -33,24 +34,17 @@ ZLIB_QAT_VERSION = "0.4.7-002" S = "${WORKDIR}/zlib-${ZLIB_VERSION}" -export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}" +export ICP_ROOT = "${S}" export ZLIB_ROOT = "${S}" -export ICP_ZLIBQAT = "${S}" -export ICP_BUILD_OUTPUT = "${ICP_ROOT}/lib" export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" - -CFLAGS += "\ - -I${ICP_ROOT}/usr/include \ - -I${ICP_ROOT}/usr/include/dc \ - -I${ZLIB_ROOT}/ \ - -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -DUSE_QAT_MEM -I${ZLIB_ROOT}/contrib/qat/qat_mem -D_GNU_SOURCE \ - -L${ZLIB_ROOT} -lz \ - -L${ICP_ROOT}/usr/lib/ -lpthread -lcrypto -ldl -lrt \ - -L${ICP_ROOT}/usr/lib/ -licp_qa_al -losal -ladf_proxy" +export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" +export ICP_DC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/dc" +export ZLIB_DH895XCC = "1" +export ZLIB_MEMORY_DRIVER = "qat_mem" +export ICP_BUILD_OUTPUT = "${STAGING_DIR_TARGET}" inherit module -MODULE_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers" MEM_PATH = "${S}/contrib/qat" do_unpack2(){ @@ -68,25 +62,25 @@ do_patch() { patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch + patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch } do_configure() { - cd ${S} - ./configure + ./configure --prefix=${prefix} --shared --libdir=${libdir} } do_compile() { - EXTRA_OEMAKE="'CFLAGS=${CFLAGS} -fPIC'" - cd ${MEM_PATH}/qat_mem/ + unset CFLAGS CXXFLAGS oe_runmake - cd ${S}/ + + cd ${S}/contrib/qat/qat_mem oe_runmake - cd ${MEM_PATH}/qat_zlib_test/ + + cd ${S}/contrib/qat/qat_zlib_test oe_runmake } do_install() { - chrpath -d ${MEM_PATH}/qat_zlib_test/comptestapp install -m 0755 -d ${D}${bindir}/ install -m 0755 -d ${D}${sysconfdir}/zlib_conf/ -- cgit v1.2.3-54-g00ecf