summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-08-28 15:47:55 +0200
committerKoen Kooi <koen@openembedded.org>2009-08-28 15:47:55 +0200
commit039ba48ab1e7a94ff7463c68a59bb03b854969c8 (patch)
treeb1cbbba294313d70420236b7217e6c9b267e74c8
parent8d169f4e303f01c35787bdb9914771d9ceded18f (diff)
glib-2.0 2.21.4: fix pre armv6 builds
-rw-r--r--recipes/glib-2.0/glib-2.0_2.21.4.bb5
-rw-r--r--recipes/glib-2.0/glib.inc2
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 ca9e4b2013..5402a81535 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 e035d20d69..df2bf0c869 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}/*"