[maemo-commits] [maemo-commits] r18088 - in projects/haf/tags/glib/2.18.1-1maemo5: . debian

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-04-16 16:50:32 +0300 (Thu, 16 Apr 2009)
New Revision: 18088

Modified:
   projects/haf/tags/glib/2.18.1-1maemo5/ChangeLog
   projects/haf/tags/glib/2.18.1-1maemo5/configure.in
   projects/haf/tags/glib/2.18.1-1maemo5/debian/changelog
Log:
2009-04-16  Claudio Saavedra  <csaavedra at igalia.com>

	* configure.in: Revert fix for NB#106135, since it's
	causing gstreamer issues.



Modified: projects/haf/tags/glib/2.18.1-1maemo5/ChangeLog
===================================================================
--- projects/haf/tags/glib/2.18.1-1maemo5/ChangeLog	2009-04-16 13:39:20 UTC (rev 18087)
+++ projects/haf/tags/glib/2.18.1-1maemo5/ChangeLog	2009-04-16 13:50:32 UTC (rev 18088)
@@ -1,3 +1,8 @@
+2009-04-16  Claudio Saavedra  <csaavedra at igalia.com>
+
+	* configure.in: Revert fix for NB#106135, since it's
+	causing gstreamer issues.
+
 2009-04-07  Claudio Saavedra  <csaavedra at igalia.com>
 
 	* debian/changelog: Update for 2.18.1-1maemo5

Modified: projects/haf/tags/glib/2.18.1-1maemo5/configure.in
===================================================================
--- projects/haf/tags/glib/2.18.1-1maemo5/configure.in	2009-04-16 13:39:20 UTC (rev 18087)
+++ projects/haf/tags/glib/2.18.1-1maemo5/configure.in	2009-04-16 13:50:32 UTC (rev 18088)
@@ -2400,13 +2400,13 @@
     arm*)
       AC_MSG_RESULT([arm])
       AC_MSG_CHECKING(arm atomic operations type)
-      maemo_changes_check=true	# MAEMO_CHANGES: inline ARM assembler
-      if test x$glib_os_linux != xyes || $maemo_changes_check; then
+      if test x$glib_os_linux != xyes; then
         AC_MSG_RESULT(inline asm)
         glib_save_CFLAGS=$CFLAGS
         AC_MSG_CHECKING(architecture supports ARMv6 instructions)
+          cp $srcdir/armv6-test.c conftest.$ac_ext
           CFLAGS="$CFLAGS -march=armv6"
-          AC_TRY_RUN([#include "$srcdir/armv6-test.c"],
+          AC_TRY_RUN(ac_compile,
             [AC_DEFINE_UNQUOTED(G_ATOMIC_ARM, 6,
                                 [armv6 atomic implementation])
              glib_memory_barrier_needed=yes

Modified: projects/haf/tags/glib/2.18.1-1maemo5/debian/changelog
===================================================================
--- projects/haf/tags/glib/2.18.1-1maemo5/debian/changelog	2009-04-16 13:39:20 UTC (rev 18087)
+++ projects/haf/tags/glib/2.18.1-1maemo5/debian/changelog	2009-04-16 13:50:32 UTC (rev 18088)
@@ -1,9 +1,8 @@
 glib2.0 (2.18.1-1maemo5) unstable; urgency=low
 
   * Fixes: NB#107184 (Gio/GVfs don't emit GVolumeMonitor::mount-pre-unmount)
-  * Fixes: NB#106135 (glib does not use fast ARMv6+ atomic operations)
 
- -- Claudio Saavedra <csaavedra at igalia.com>  Tue, 07 Apr 2009 17:21:47 +0300
+ -- Claudio Saavedra <csaavedra at igalia.com>  Thu, 16 Apr 2009 16:46:04 +0300
 
 glib2.0 (2.18.1-1maemo4) unstable; urgency=low