diff options
| author |   Drew Moseley <drew_moseley@mentor.com> | 2014-05-14 13:08:38 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-15 23:24:05 +0100 |
| commit | 2eb434ec298c279846ddd535a7122986558eb2c8 (patch) | |
| tree | be9c6e27fd65952978622a388e90792925b4de47 /meta | |
| parent | c53c9ba05a5f38c047f3f928a9496f952843f467 (diff) | |
| download | openembedded-core-contrib-2eb434ec298c279846ddd535a7122986558eb2c8.tar.gz | |
glib-2.0: Do not use readlink to set target paths.
Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross
compiling. Doing so causes host paths to potentially pollute the
target. Unfortunately in this case we don't actually convert to
an absolute path.
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb | 1 |
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 @@ +commit 9b38d507ec37b3d7d4df6095fa7ed16b47d399f7 +Author: Drew Moseley <drew_moseley@mentor.com> +Date: Sat Mar 29 21:10:43 2014 -0400 + + configure.ac: Do not use readlink when cross compiling. + + Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross + compiling. Doing so causes host paths to potentially pollute + the target. + + Note that in this case the path is not converted to absolute if + it contains any ".." references so it's not completely correct. + + Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=727575] + Signed-off-by: Drew Moseley <drew_moseley@mentor.com> + +diff -rub glib-2.38.2.orig/configure.ac glib-2.38.2/configure.ac +--- glib-2.38.2.orig/configure.ac 2014-04-03 20:17:13.035567143 -0400 ++++ glib-2.38.2/configure.ac 2014-04-03 20:19:07.071566057 -0400 +@@ -275,7 +275,11 @@ + [], + [with_runtime_libdir=""]) + GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" ++AS_IF([ test $cross_compiling = yes ], [ ++ABS_GLIB_RUNTIME_LIBDIR="$libdir/$with_runtime_libdir" ++], [ + ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`" ++]) + AC_SUBST(GLIB_RUNTIME_LIBDIR) + AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR) + 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 \ file://run-ptest \ file://ptest-paths.patch \ file://uclibc.patch \ + file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" |