summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-09-03 20:45:01 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-09-06 18:00:08 -0400
commitcdee0a74c98e7c39eabfa9b633f33c4d1db98e17 (patch)
tree7fdadeaf4ca739ab0c040fefecbf1c9ef0f99eaa /meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
parentb1bd021f0b52910b5e560580d8536bf07cdc386d (diff)
downloadmeta-cloud-services-cdee0a74c98e7c39eabfa9b633f33c4d1db98e17.tar.gz
erlang: fix QA error and use ${libdir}
The lib/wx subcomponent of erlang generates the following QA error: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Stop configure looking for files on the host, specifically unsafe paths such as /usr/local/include. Additionally we should be using ${libdir} and not "lib", since 64 bit builds will use lib64 and by using ${libdir} we adapt automatically. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/erlang/erlang_R15B.bb')
-rw-r--r--meta-openstack/recipes-devtools/erlang/erlang_R15B.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
index bb9448a..8f5d509 100644
--- a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
+++ b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb
@@ -20,6 +20,7 @@ NATIVE_BIN = "${TMPDIR}/work/erlang-native-${PV}-${PR}/otp_src_${UPSTREAM_VERSIO
20do_configure() { 20do_configure() {
21 21
22 cd ${S}/erts; autoreconf; cd - 22 cd ${S}/erts; autoreconf; cd -
23 cd ${S}/lib/wx; autoreconf; cd -
23 24
24 . ${CONFIG_SITE} 25 . ${CONFIG_SITE}
25 26
@@ -41,9 +42,10 @@ do_install() {
41 TARGET=${TARGET_SYS} \ 42 TARGET=${TARGET_SYS} \
42 PATH=${NATIVE_BIN}:$PATH \ 43 PATH=${NATIVE_BIN}:$PATH \
43 oe_runmake 'INSTALL_PREFIX=${D}' install 44 oe_runmake 'INSTALL_PREFIX=${D}' install
45
44 for f in erl start 46 for f in erl start
45 do sed -i -e 's:ROOTDIR=.*:ROOTDIR=/usr/lib/erlang:' \ 47 do sed -i -e 's:ROOTDIR=.*:ROOTDIR=/${libdir}/erlang:' \
46 ${D}/usr/lib/erlang/erts-*/bin/$f ${D}/usr/lib/erlang/bin/$f 48 ${D}/${libdir}/erlang/erts-*/bin/$f ${D}/${libdir}/erlang/bin/$f
47 done 49 done
48} 50}
49 51