[maemo-commits] [maemo-commits] r18942 - in projects/haf/trunk/glib/debian: . patches

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-07-22 13:29:43 +0300 (Wed, 22 Jul 2009)
New Revision: 18942

Modified:
   projects/haf/trunk/glib/debian/changelog
   projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch
Log:
  * 26-arm-stack-frames.patch: updated
    Do not enable arm specific optimizations in non arm architectures.



Modified: projects/haf/trunk/glib/debian/changelog
===================================================================
--- projects/haf/trunk/glib/debian/changelog	2009-07-22 10:06:55 UTC (rev 18941)
+++ projects/haf/trunk/glib/debian/changelog	2009-07-22 10:29:43 UTC (rev 18942)
@@ -6,8 +6,10 @@
   [ Claudio Saavedra ]
   * 25-gatomic.patch: updated
     + Fixes: NB#106135 (glib does not use fast ARMv6+ atomic operations)
+  * 26-arm-stack-frames.patch: updated
+    Do not enable arm specific optimizations in non arm architectures.
 
- -- Claudio Saavedra <csaavedra at igalia.com>  Wed, 22 Jul 2009 11:01:54 +0200
+ -- Claudio Saavedra <csaavedra at igalia.com>  Wed, 22 Jul 2009 12:20:09 +0200
 
 glib2.0 (2.20.3-1maemo1) unstable; urgency=low
 

Modified: projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch	2009-07-22 10:06:55 UTC (rev 18941)
+++ projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch	2009-07-22 10:29:43 UTC (rev 18942)
@@ -1,22 +1,22 @@
-Index: glib-2.20.1/configure.in
+Index: glib-2.20.3/configure.in
 ===================================================================
---- glib-2.20.1.orig/configure.in	2009-06-02 12:51:21.000000000 +0200
-+++ glib-2.20.1/configure.in	2009-06-02 12:51:46.000000000 +0200
-@@ -2427,6 +2427,9 @@ if test x"$GCC" = xyes; then
-                            [special arm linux implementation])
-         glib_memory_barrier_needed=yes
-       fi
+--- glib-2.20.3.orig/configure.in	2009-07-22 13:15:42.000000000 +0300
++++ glib-2.20.3/configure.in	2009-07-22 13:16:08.000000000 +0300
+@@ -2410,6 +2410,9 @@
+       dnl AC_DEFINE_UNQUOTED(G_ATOMIC_ARM_LINUX, 1,
+       dnl                   [special arm linux implementation])
+       dnl glib_memory_barrier_needed=yes
 +      # some ARM CPUs and gcc versions need flags for proper backtraces
 +      ARM_FRAME_FLAGS="-fno-omit-frame-pointer -mapcs-frame"
 +      AC_SUBST(ARM_FRAME_FLAGS)
        ;;
      crisv32*|etraxfs*)
        AC_MSG_RESULT([crisv32])
-Index: glib-2.20.1/glib/Makefile.am
+Index: glib-2.20.3/glib/Makefile.am
 ===================================================================
---- glib-2.20.1.orig/glib/Makefile.am	2009-06-02 11:04:36.000000000 +0200
-+++ glib-2.20.1/glib/Makefile.am	2009-06-02 12:51:21.000000000 +0200
-@@ -32,6 +32,9 @@ AM_CPPFLAGS = 				\
+--- glib-2.20.3.orig/glib/Makefile.am	2009-07-22 13:15:29.000000000 +0300
++++ glib-2.20.3/glib/Makefile.am	2009-07-22 13:15:42.000000000 +0300
+@@ -32,6 +32,9 @@
  	-DGLIB_COMPILATION 		\
  	-DPCRE_STATIC