2 files changed, 51 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/erlang/files/erlang-fix-build-issue-in-Yocto.patch b/meta-openstack/recipes-devtools/erlang/files/erlang-fix-build-issue-in-Yocto.patch
new file mode 100644
index 0000000..2d4b7b5
--- /dev/null
+++ b/meta-openstack/recipes-devtools/erlang/files/erlang-fix-build-issue-in-Yocto.patch
@@ -0,0 +1,25 @@
+Upstream-Status: Inappropriate [The fix is specific to Yocto build env]
+
+Skip host library path check to fix following Yocto insane check issue: 
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this.
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+
+--- otp_src_R15B/erts/configure.in.orig 2011-12-14 04:22:11.000000000 -0600
++++ otp_src_R15B/erts/configure.in      2013-11-19 04:15:33.694334610 -0600
+@@ -1469,10 +1469,10 @@
+        # ln -s libdlpi.so.1 $try_dlpi_lib/libdlpi.so
+        ])
+    fi
+-   LDFLAGS="-L$try_dlpi_lib -R$try_dlpi_lib $LDFLAGS"
+-   unset -v try_dlpi_lib
+-   AC_MSG_NOTICE([Extending the search to include /lib])
+-   AC_CHECK_LIB(dlpi, dlpi_open)
++#   LDFLAGS="-L$try_dlpi_lib -R$try_dlpi_lib $LDFLAGS"
++#   unset -v try_dlpi_lib
++#   AC_MSG_NOTICE([Extending the search to include /lib])
++#   AC_CHECK_LIB(dlpi, dlpi_open)
+    if test x"$ac_cv_lib_dlpi_dlpi_open" = x"no"; then
+       LDFLAGS="$save_ldflags"
+    fi
diff --git a/meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch b/meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch
new file mode 100644
index 0000000..4a8c219
--- /dev/null
+++ b/meta-openstack/recipes-devtools/erlang/files/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