[oe-commits] Koen Kooi : glib-2.0 2.21.4: fix pre armv6 builds

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 039ba48ab1e7a94ff7463c68a59bb03b854969c8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=039ba48ab1e7a94ff7463c68a59bb03b854969c8

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Aug 28 15:47:55 2009 +0200

glib-2.0 2.21.4: fix pre armv6 builds

---

 recipes/glib-2.0/glib-2.0_2.21.4.bb |    5 ++---
 recipes/glib-2.0/glib.inc           |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

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 ca9e4b2..5402a81 100644
--- 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 e035d20..df2bf0c 100644
--- 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}/*"