Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | commit 9b38d507ec37b3d7d4df6095fa7ed16b47d399f7 |
| 2 | Author: Drew Moseley <drew_moseley@mentor.com> |
| 3 | Date: 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 | |
| 17 | diff -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"]) |