diff options
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch new file mode 100644 index 0000000000..9759d11e3c --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | configure.ac: change readlink -f to -m | ||
| 2 | |||
| 3 | Change "readlink -f" to "readlink -m" since $libdir/$with_runtime_libdir | ||
| 4 | may not exist. | ||
| 5 | |||
| 6 | This patch should go to the upstream, I will send it sooner. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 11 | --- | ||
| 12 | configure.ac | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/configure.ac b/configure.ac | ||
| 16 | --- a/configure.ac | ||
| 17 | +++ b/configure.ac | ||
| 18 | @@ -271,7 +271,7 @@ AC_ARG_WITH(runtime-libdir, | ||
| 19 | [], | ||
| 20 | [with_runtime_libdir=""]) | ||
| 21 | GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" | ||
| 22 | -ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`" | ||
| 23 | +ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`" | ||
| 24 | AC_SUBST(GLIB_RUNTIME_LIBDIR) | ||
| 25 | AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR) | ||
| 26 | AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"]) | ||
| 27 | -- | ||
| 28 | 1.8.1.2 | ||
| 29 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb index 0918bf59b0..d62c1fd36e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | |||
| @@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
| 15 | file://Makefile-ptest.patch \ | 15 | file://Makefile-ptest.patch \ |
| 16 | file://add-march-i486-into-CFLAGS-automatically.patch \ | 16 | file://add-march-i486-into-CFLAGS-automatically.patch \ |
| 17 | file://run-ptest \ | 17 | file://run-ptest \ |
| 18 | file://glib-2.0-configure-readlink.patch \ | ||
| 18 | " | 19 | " |
| 19 | 20 | ||
| 20 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" | 21 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" |
