summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@freescale.com>2015-09-15 13:18:06 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-09-16 16:02:40 -0400
commit45cf354830301bd3ae2fedd6a2df0b999f654b96 (patch)
treedbe04f648d5d7844965d0d73ede79f172660057b
parent85a79d21084652005c208eda63b61177b2ded162 (diff)
downloadmeta-cloud-services-45cf354830301bd3ae2fedd6a2df0b999f654b96.tar.gz
erlang: skip the host library path check
Move a previous patch from erlang_R15B.bb to erlang.inc as erlang_R16B03-1 needs it too. Fix the below error: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Signed-off-by: Ting Liu <ting.liu@freescale.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-devtools/erlang/erlang.inc4
-rw-r--r--meta-openstack/recipes-devtools/erlang/erlang_R15B.bb1
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/erlang/erlang.inc b/meta-openstack/recipes-devtools/erlang/erlang.inc
index 8dd2478..8a7bd5a 100644
--- a/meta-openstack/recipes-devtools/erlang/erlang.inc
+++ b/meta-openstack/recipes-devtools/erlang/erlang.inc
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://EPLICENCE;md5=09f9063ea35bc5bd124df2fda1d9d2c7"
8 8
9UPSTREAM_VERSION = "${@bb.data.getVar('PV', d, 1).replace('.', '-')}" 9UPSTREAM_VERSION = "${@bb.data.getVar('PV', d, 1).replace('.', '-')}"
10 10
11SRC_URI = "http://erlang.org/download/otp_src_${UPSTREAM_VERSION}.tar.gz" 11SRC_URI = "http://erlang.org/download/otp_src_${UPSTREAM_VERSION}.tar.gz \
12 file://erlang-fix-build-issue-in-Yocto.patch \
13"
12SRC_URI += "file://fix-wx-configure.patch" 14SRC_URI += "file://fix-wx-configure.patch"
13 15
14S = "${WORKDIR}/otp_src_${UPSTREAM_VERSION}" 16S = "${WORKDIR}/otp_src_${UPSTREAM_VERSION}"
diff --git a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
index d7fd310..68d144b 100644
--- a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
+++ b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
@@ -55,6 +55,5 @@ FILES_${PN}-staticdev += "${libdir}/*/*/*/*.a ${libdir}/*/*/*/*/*.a ${libdir}/*/
55 55
56FILES_${PN}-libs-dbg += " ${libdir}/erlang/*/.debug ${libdir}/erlang/*/*/.debug ${libdir}/erlang/*/*/*/.debug ${libdir}/erlang/*/*/*/*/.debug ${libdir}/erlang/*/*/*/*/*/.debug " 56FILES_${PN}-libs-dbg += " ${libdir}/erlang/*/.debug ${libdir}/erlang/*/*/.debug ${libdir}/erlang/*/*/*/.debug ${libdir}/erlang/*/*/*/*/.debug ${libdir}/erlang/*/*/*/*/*/.debug "
57 57
58SRC_URI += "file://erlang-fix-build-issue-in-Yocto.patch"
59SRC_URI[md5sum] = "dd6c2a4807551b4a8a536067bde31d73" 58SRC_URI[md5sum] = "dd6c2a4807551b4a8a536067bde31d73"
60SRC_URI[sha256sum] = "5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2" 59SRC_URI[sha256sum] = "5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2"