diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-12-06 19:23:31 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-14 11:35:55 +0000 |
commit | 8ac47178d1051e38bdc19c58eb69cd2dc8d728f2 (patch) | |
tree | b0760ceee991fa44faa4563e1a853324d8b31956 | |
parent | 3be36b0d27d89cff3dfd5ee7f0906afaccf9c9e5 (diff) | |
download | poky-8ac47178d1051e38bdc19c58eb69cd2dc8d728f2.tar.gz |
apr/openssl10: Enable ccache for them
They work well now.
(From OE-Core rev: 5514c6c136b4ea48cba7edb0831eb12e1870d7d2)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb | 3 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr_1.6.5.bb | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb index 9d67053b7a..809634f6c0 100644 --- a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb +++ b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb | |||
@@ -76,9 +76,6 @@ EXTRA_OEMAKE = "${@bb.utils.contains('PACKAGECONFIG', 'manpages', '', 'OE_DISABL | |||
76 | 76 | ||
77 | export OE_LDFLAGS = "${LDFLAGS}" | 77 | export OE_LDFLAGS = "${LDFLAGS}" |
78 | 78 | ||
79 | # openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810 | ||
80 | CCACHE = "" | ||
81 | |||
82 | TERMIO ?= "-DTERMIO" | 79 | TERMIO ?= "-DTERMIO" |
83 | TERMIO_libc-musl = "-DTERMIOS" | 80 | TERMIO_libc-musl = "-DTERMIOS" |
84 | EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" | 81 | EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" |
diff --git a/meta/recipes-support/apr/apr_1.6.5.bb b/meta/recipes-support/apr/apr_1.6.5.bb index c2f59005aa..432e4ed744 100644 --- a/meta/recipes-support/apr/apr_1.6.5.bb +++ b/meta/recipes-support/apr/apr_1.6.5.bb | |||
@@ -37,11 +37,6 @@ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sct | |||
37 | CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" | 37 | CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" |
38 | CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" | 38 | CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" |
39 | 39 | ||
40 | # Otherwise libtool fails to compile apr-utils | ||
41 | # x86_64-linux-libtool: compile: unable to infer tagged configuration | ||
42 | # x86_64-linux-libtool: error: specify a tag with '--tag' | ||
43 | CCACHE = "" | ||
44 | |||
45 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 40 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
46 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 41 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
47 | 42 | ||