]> code.ossystems Code Review - meta-freescale.git/commitdiff
optee-test: Use openssl embedded in optee-test
authorTom Hochstein <tom.hochstein@nxp.com>
Fri, 18 Feb 2022 23:07:08 +0000 (17:07 -0600)
committerTom Hochstein <tom.hochstein@nxp.com>
Thu, 24 Feb 2022 19:32:53 +0000 (13:32 -0600)
Building against openssl from Yocto results in a build break:

```
| /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-fsl-linux/optee-test/3.15.0.imx-r0/git/host/xtest/regression_8100.c:133:17: error: 'ERR_get_error_line' is deprecated: Since OpeSL 3.0 [-Werror=deprecated-declarations]
|   133 |                 e = ERR_get_error_line(&f, &l);
|       |                 ^
| In file included from /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-fsl-linux/optee-test/3.15.0.imx-r0/git/host/xtest/regression_8100.c:18:
| /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-fsl-linux/optee-test/3.15.0.imx-r0/recipe-sysroot/usr/include/openssl/err.h:411:15: note: declared here
|   411 | unsigned long ERR_get_error_line(const char **file, int *line);
|       |               ^~~~~~~~~~~~~~~~~~
```

Configure optee-test to build with its own openssl.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
recipes-security/optee-imx/optee-test_3.15.0.imx.bb

index 1efd65c50043e2822f561b9c9536efb49e5609b0..22194a39ea098d4c630c3876989cb0cf5bfcc7f3 100644 (file)
@@ -36,7 +36,6 @@ EXTRA_OEMAKE = " \
     CROSS_COMPILE_HOST=${HOST_PREFIX} \
     CROSS_COMPILE_TA=${HOST_PREFIX} \
     CROSS_COMPILE=${HOST_PREFIX} \
-    OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}/ \
     -C ${S} O=${B} \
 "