summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb3
-rw-r--r--meta/recipes-support/apr/apr_1.6.5.bb5
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
77export OE_LDFLAGS = "${LDFLAGS}" 77export OE_LDFLAGS = "${LDFLAGS}"
78 78
79# openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810
80CCACHE = ""
81
82TERMIO ?= "-DTERMIO" 79TERMIO ?= "-DTERMIO"
83TERMIO_libc-musl = "-DTERMIOS" 80TERMIO_libc-musl = "-DTERMIOS"
84EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" 81EXTRA_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
37CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" 37CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes"
38CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" 38CACHED_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'
43CCACHE = ""
44
45PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 40PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
46PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 41PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
47 42