summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-28 13:39:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:35 +0100
commitf23546ed3e79f51b2377c28d769bf7924d9c6485 (patch)
tree843938cb846aca754fa5dbb685663b01a4edc380 /meta/recipes-connectivity
parent7efdc276a9593cf97683a2de4da4ae814a56e887 (diff)
downloadpoky-f23546ed3e79f51b2377c28d769bf7924d9c6485.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. (From OE-Core rev: b3e81e3cf86dd8736b62a6b88d6a6dbe518c9e5e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2o.bb6
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
72# vulnerability 72# vulnerability
73EXTRA_OECONF = "no-ssl3" 73EXTRA_OECONF = "no-ssl3"
74 74
75export DIRS = "crypto ssl apps engines"
76export AS = "${CC} -c"
77export EX_LIBS = "-lgcc -ldl"
78export OE_LDFLAGS = "${LDFLAGS}" 75export OE_LDFLAGS = "${LDFLAGS}"
79 76
80# openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810 77# openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810
@@ -222,9 +219,6 @@ do_compile_class-target () {
222} 219}
223 220
224do_compile_ptest () { 221do_compile_ptest () {
225 # build dependencies for test directory too
226 export DIRS="$DIRS test"
227 oe_runmake depend
228 oe_runmake buildtest 222 oe_runmake buildtest
229} 223}
230 224