diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2018-07-28 13:39:20 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:28 +0100 |
| commit | b3e81e3cf86dd8736b62a6b88d6a6dbe518c9e5e (patch) | |
| tree | e2fe7c41833a61b272e189d175da76d5de86bd09 | |
| parent | 9b3af406747a3d565d12d948400d44fb12ab0d96 (diff) | |
| download | openembedded-core-contrib-b3e81e3cf86dd8736b62a6b88d6a6dbe518c9e5e.tar.gz | |
openssl_1.0: drop obsolete exporting of AS, EX_LIBS and DIRS
Previously (when EXTRA_OEMAKE contained -e) exporting these variables
over-rode default values in the top-level openssl Makefile. However,
since -e was removed from EXTRA_OEMAKE as part of:
http://git.openembedded.org/openembedded-core/commit/?id=537a404cfbb811fcb526cdb5f2e059257de6ef13
exporting these variables does nothing. The comment from that commit
that only AR is affected by removing -e wasn't correct, but the
effects of letting the openssl Makefile also control AS, EX_LIBS and
DIRS seem to be either benign or beneficial.
Since without -e make ignores DIRS from the environment and always
runs for all subdirs (including "test"), adding "test" to DIRS and
calling "make depend" again from do_compile_ptest() can be dropped.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb index ee1c1f7faf..c2d9264732 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb @@ -72,9 +72,6 @@ PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryp # vulnerability EXTRA_OECONF = "no-ssl3" -export DIRS = "crypto ssl apps engines" -export AS = "${CC} -c" -export EX_LIBS = "-lgcc -ldl" export OE_LDFLAGS = "${LDFLAGS}" # openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810 @@ -222,9 +219,6 @@ do_compile_class-target () { } do_compile_ptest () { - # build dependencies for test directory too - export DIRS="$DIRS test" - oe_runmake depend oe_runmake buildtest } |