diff options
3 files changed, 32 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/erlang/erlang.inc b/meta-openstack/recipes-devtools/erlang/erlang.inc index e4aad1cf..32ee1353 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang.inc +++ b/meta-openstack/recipes-devtools/erlang/erlang.inc @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://EPLICENCE;md5=09f9063ea35bc5bd124df2fda1d9d2c7" UPSTREAM_VERSION = "${@bb.data.getVar('PV', d, 1).replace('.', '-')}" SRC_URI = "http://erlang.org/download/otp_src_${UPSTREAM_VERSION}.tar.gz" +SRC_URI += "file://fix-wx-configure.patch" + S = "${WORKDIR}/otp_src_${UPSTREAM_VERSION}" PARALLEL_MAKE = "" diff --git a/meta-openstack/recipes-devtools/erlang/erlang/fix-wx-configure.patch b/meta-openstack/recipes-devtools/erlang/erlang/fix-wx-configure.patch new file mode 100644 index 00000000..4a8c2192 --- /dev/null +++ b/meta-openstack/recipes-devtools/erlang/erlang/fix-wx-configure.patch @@ -0,0 +1,26 @@ +Fix unsafe compilation path in the wx configure script. + +Index: wx/configure.in +=================================================================== +--- otp_src_R15B.orig/lib/wx/configure.in ++++ otp_src_R15B/lib/wx/configure.in +@@ -234,18 +234,10 @@ if test X"$host_os" != X"win32" ; then + $as_unset ac_cv_header_GL_gl_h + AC_CHECK_HEADERS([GL/gl.h]) + if test X"$ac_cv_header_GL_gl_h" != Xyes ; then +- AC_MSG_NOTICE(Checking for OpenGL headers in /usr/local) +- CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS" +- $as_unset ac_cv_header_GL_gl_h +- AC_CHECK_HEADERS([GL/gl.h]) +- if test X"$ac_cv_header_GL_gl_h" != Xyes ; then + AC_MSG_WARN([No OpenGL headers found, wx will NOT be usable]) + CPPFLAGS="$saved_CPPFLAGS" +- else +- GL_LIBS="-L/usr/local/lib $GL_LIBS" +- fi + else +- GL_LIBS="-L/usr/X11R6/lib $GL_LIBS" ++ GL_LIBS="-L=/usr/X11R6/lib $GL_LIBS" + fi + fi + else diff --git a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb index bb9448a8..8f5d5098 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 do_configure() { cd ${S}/erts; autoreconf; cd - + cd ${S}/lib/wx; autoreconf; cd - . ${CONFIG_SITE} @@ -41,9 +42,10 @@ do_install() { TARGET=${TARGET_SYS} \ PATH=${NATIVE_BIN}:$PATH \ oe_runmake 'INSTALL_PREFIX=${D}' install + for f in erl start - do sed -i -e 's:ROOTDIR=.*:ROOTDIR=/usr/lib/erlang:' \ - ${D}/usr/lib/erlang/erts-*/bin/$f ${D}/usr/lib/erlang/bin/$f + do sed -i -e 's:ROOTDIR=.*:ROOTDIR=/${libdir}/erlang:' \ + ${D}/${libdir}/erlang/erts-*/bin/$f ${D}/${libdir}/erlang/bin/$f done } |