diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2025-04-09 20:42:33 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2025-04-09 20:42:33 +0000 |
| commit | d20e8a8c2f8ce1ddcf0843e4a35a32e71e5aabef (patch) | |
| tree | 5980fbb05bf4f6d7aa12ec50685b7b3e740c5e56 /meta-openstack/recipes-devtools/erlang/files | |
| parent | eb01e67dee981b326b041677ae9b13bd75b9d9bb (diff) | |
| download | meta-cloud-services-d20e8a8c2f8ce1ddcf0843e4a35a32e71e5aabef.tar.gz | |
meta-cloud-services: drop erlang in favour of meta-erlang
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/erlang/files')
| -rw-r--r-- | meta-openstack/recipes-devtools/erlang/files/erlang-fix-build-issue-in-Yocto.patch | 25 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch | 26 |
2 files changed, 0 insertions, 51 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 deleted file mode 100644 index 2d4b7b5..0000000 --- a/meta-openstack/recipes-devtools/erlang/files/erlang-fix-build-issue-in-Yocto.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [The fix is specific to Yocto build env] | ||
| 2 | |||
| 3 | Skip host library path check to fix following Yocto insane check issue: | ||
| 4 | ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. | ||
| 5 | Rerun configure task after fixing this. | ||
| 6 | |||
| 7 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
| 8 | |||
| 9 | --- otp_src_R15B/erts/configure.in.orig 2011-12-14 04:22:11.000000000 -0600 | ||
| 10 | +++ otp_src_R15B/erts/configure.in 2013-11-19 04:15:33.694334610 -0600 | ||
| 11 | @@ -1469,10 +1469,10 @@ | ||
| 12 | # ln -s libdlpi.so.1 $try_dlpi_lib/libdlpi.so | ||
| 13 | ]) | ||
| 14 | fi | ||
| 15 | - LDFLAGS="-L$try_dlpi_lib -R$try_dlpi_lib $LDFLAGS" | ||
| 16 | - unset -v try_dlpi_lib | ||
| 17 | - AC_MSG_NOTICE([Extending the search to include /lib]) | ||
| 18 | - AC_CHECK_LIB(dlpi, dlpi_open) | ||
| 19 | +# LDFLAGS="-L$try_dlpi_lib -R$try_dlpi_lib $LDFLAGS" | ||
| 20 | +# unset -v try_dlpi_lib | ||
| 21 | +# AC_MSG_NOTICE([Extending the search to include /lib]) | ||
| 22 | +# AC_CHECK_LIB(dlpi, dlpi_open) | ||
| 23 | if test x"$ac_cv_lib_dlpi_dlpi_open" = x"no"; then | ||
| 24 | LDFLAGS="$save_ldflags" | ||
| 25 | 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 deleted file mode 100644 index 4a8c219..0000000 --- a/meta-openstack/recipes-devtools/erlang/files/fix-wx-configure.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | Fix unsafe compilation path in the wx configure script. | ||
| 2 | |||
| 3 | Index: 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 | ||
