summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch31
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
new file mode 100644
index 0000000000..0be36316b9
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
@@ -0,0 +1,31 @@
1commit 9b38d507ec37b3d7d4df6095fa7ed16b47d399f7
2Author: Drew Moseley <drew_moseley@mentor.com>
3Date: Sat Mar 29 21:10:43 2014 -0400
4
5 configure.ac: Do not use readlink when cross compiling.
6
7 Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross
8 compiling. Doing so causes host paths to potentially pollute
9 the target.
10
11 Note that in this case the path is not converted to absolute if
12 it contains any ".." references so it's not completely correct.
13
14 Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=727575]
15 Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
16
17diff -rub glib-2.38.2.orig/configure.ac glib-2.38.2/configure.ac
18--- glib-2.38.2.orig/configure.ac 2014-04-03 20:17:13.035567143 -0400
19+++ glib-2.38.2/configure.ac 2014-04-03 20:19:07.071566057 -0400
20@@ -275,7 +275,11 @@
21 [],
22 [with_runtime_libdir=""])
23 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
24+AS_IF([ test $cross_compiling = yes ], [
25+ABS_GLIB_RUNTIME_LIBDIR="$libdir/$with_runtime_libdir"
26+], [
27 ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`"
28+])
29 AC_SUBST(GLIB_RUNTIME_LIBDIR)
30 AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
31 AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
index 3be126faef..ff1fb87a38 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
12 file://run-ptest \ 12 file://run-ptest \
13 file://ptest-paths.patch \ 13 file://ptest-paths.patch \
14 file://uclibc.patch \ 14 file://uclibc.patch \
15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
15 " 16 "
16 17
17SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 18SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"