summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch')
-rw-r--r--meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch26
1 files changed, 26 insertions, 0 deletions
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 @@
1Fix unsafe compilation path in the wx configure script.
2
3Index: wx/configure.in
4===================================================================
5--- otp_src_R15B.orig/lib/wx/configure.in
6+++ otp_src_R15B/lib/wx/configure.in
7@@ -234,18 +234,10 @@ if test X"$host_os" != X"win32" ; then
8 $as_unset ac_cv_header_GL_gl_h
9 AC_CHECK_HEADERS([GL/gl.h])
10 if test X"$ac_cv_header_GL_gl_h" != Xyes ; then
11- AC_MSG_NOTICE(Checking for OpenGL headers in /usr/local)
12- CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS"
13- $as_unset ac_cv_header_GL_gl_h
14- AC_CHECK_HEADERS([GL/gl.h])
15- if test X"$ac_cv_header_GL_gl_h" != Xyes ; then
16 AC_MSG_WARN([No OpenGL headers found, wx will NOT be usable])
17 CPPFLAGS="$saved_CPPFLAGS"
18- else
19- GL_LIBS="-L/usr/local/lib $GL_LIBS"
20- fi
21 else
22- GL_LIBS="-L/usr/X11R6/lib $GL_LIBS"
23+ GL_LIBS="-L=/usr/X11R6/lib $GL_LIBS"
24 fi
25 fi
26 else