diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-16 16:22:38 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 14:43:06 +0100 |
commit | c99e920a344b29e053781008faa0328f416fdcc4 (patch) | |
tree | bade1c3e50efe0c40325fbf8a21ed1230186b539 /meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch | |
parent | 2fef37fab6967410aff33744c8843bcae028de56 (diff) | |
download | openembedded-core-contrib-c99e920a344b29e053781008faa0328f416fdcc4.tar.gz |
glib-2.0: Upgrade 2.46.2 -> 2.48.1
* Remove now unnecessary readlink patches and
ignore-format-nonliteral-warning.patch
* Port relocate-modules.patch
* Add ${datadir}/gettext/its to FILES_${PN}-dev: this could be done in
gettext.bbclass but so far glib is the first and only ITS rule
installer
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch | 31 |
1 files changed, 0 insertions, 31 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 deleted file mode 100644 index 0be36316b9..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch +++ /dev/null @@ -1,31 +0,0 @@ -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"]) |