From b28b085864b8da9af09b3d8e55e591f475ab3415 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Wed, 1 Jul 2015 21:19:54 +0000 Subject: ti-softhsmv2: Stop recipe from using headers from host build machine. * Without the "--with-zlib" configure option, the zlib header will be obtained from the build machines "/usr/include" directory if the header exists there. * From ${S}/m4/acx_zlib.m4: AC_DEFUN([ACX_ZLIB],[ AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib=PATH],[Specify prefix of path of zlib]), [ ZLIB_PATH="$withval" ], [ ZLIB_PATH="/usr" ]) AC_MSG_CHECKING(what are the zlib includes) ZLIB_INCLUDES="-I$ZLIB_PATH/include" ... * Therefore add configure option to point to staging sysroot for zlib header and add dependency on zlib. Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb b/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb index 518508c3..329fbaa6 100644 --- a/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb +++ b/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb @@ -7,7 +7,7 @@ mntdir = "/mnt" inherit autotools pkgconfig -DEPENDS = "openssl libdaemon" +DEPENDS = "openssl libdaemon zlib" COMPATIBLE_MACHINE = "(tci6614-evm|keystone)" BRANCH="master" @@ -15,12 +15,15 @@ SRC_URI = "git://git.ti.com/keystone-linux/ti-softhsmv2.git;protocol=git;branch= #Following commit corresponds to tag DEV.SOFTHSM-01.03.00.01 SRCREV = "c79d93ac2a326567a7245dda1b903ef340b5650c" PV = "1.3.0.1" +PR = "r1" S = "${WORKDIR}/git" CFLAGS += " -mno-unaligned-access" CPPFLAGS += " -mno-unaligned-access" +EXTRA_OECONF += "--with-zlib=${STAGING_DIR_HOST}/usr" + INITSCRIPT_NAME = "softhsm-daemon.sh" INITSCRIPT_PARAMS = "defaults 10" -- cgit v1.2.3-54-g00ecf