glib-2.0 2.21.4: fix pre armv6 builds

diff --git a/recipes/glib-2.0/glib-2.0_2.21.4.bb b/recipes/glib-2.0/glib-2.0_2.21.4.bb
index ca9e4b201393da6d47de3ad2cfd6c00f2b9f5f0b..5402a81535996ca5889127d234514848fb46f4e5 100644 (file)
--- a/recipes/glib-2.0/glib-2.0_2.21.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.21.4.bb
@@ -3,13 +3,12 @@ require glib.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
-PR = "r1"
-
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
   file://configure-libtool.patch;patch=1 \
 "
 SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1 \
-                       file://gatomic_armv6.patch;patch=1 \
 "
+SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1"
+SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" 

diff --git a/recipes/glib-2.0/glib.inc b/recipes/glib-2.0/glib.inc
index e035d20d69ad45e7e046e4286be51e54c09fbcee..df2bf0c8699b711dd1739dc20210a46272fe8cff 100644 (file)
--- a/recipes/glib-2.0/glib.inc
+++ b/recipes/glib-2.0/glib.inc
@@ -10,7 +10,7 @@ DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils "
 
-PR = "r4"
+PR = "r5"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"