[maemo-commits] [maemo-commits] r18605 - in projects/haf/trunk/freetype: . debian

[From: subversion at stage.maemo.org]

Author: risun
Date: 2009-06-04 11:21:21 +0300 (Thu, 04 Jun 2009)
New Revision: 18605

Added:
   projects/haf/trunk/freetype/armel-asm-declaration.patch
Modified:
   projects/haf/trunk/freetype/debian/changelog
   projects/haf/trunk/freetype/debian/rules
Log:
Add armel-asm-declaration.patch: 
use __asm__ for declaring assembly instead of asm, fixing a build failure on armel



Added: projects/haf/trunk/freetype/armel-asm-declaration.patch
===================================================================
--- projects/haf/trunk/freetype/armel-asm-declaration.patch	2009-06-04 06:16:59 UTC (rev 18604)
+++ projects/haf/trunk/freetype/armel-asm-declaration.patch	2009-06-04 08:21:21 UTC (rev 18605)
@@ -0,0 +1,12 @@
+diff -Naur freetype-2.3.9/builds/unix/ftconfig.in freetype-2.3.9-armel-asm-declaration/builds/unix/ftconfig.in
+--- freetype-2.3.9/builds/unix/ftconfig.in	2009-02-15 09:51:47.000000000 +0200
++++ freetype-2.3.9-armel-asm-declaration/builds/unix/ftconfig.in	2009-06-04 11:09:50.000000000 +0300
+@@ -298,7 +298,7 @@
+     register FT_Int32  t, t2;
+ 
+ 
+-    asm __volatile__ (
++    __asm__ __volatile__ (
+       "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
+       "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+       "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */

Modified: projects/haf/trunk/freetype/debian/changelog
===================================================================
--- projects/haf/trunk/freetype/debian/changelog	2009-06-04 06:16:59 UTC (rev 18604)
+++ projects/haf/trunk/freetype/debian/changelog	2009-06-04 08:21:21 UTC (rev 18605)
@@ -1,3 +1,9 @@
+freetype (2.3.9-1osso2) unstable; urgency=low
+
+  * Added: armel-asm-declaration.patch to fix a build failure on armel
+
+ -- Richard Sun <richard.sun at nokia.com>  Thu,  4 Jun 2009 11:17:35 +0300
+
 freetype (2.3.9-1osso1) unstable; urgency=low
 
   * Updated: Sync with upstream stable version

Modified: projects/haf/trunk/freetype/debian/rules
===================================================================
--- projects/haf/trunk/freetype/debian/rules	2009-06-04 06:16:59 UTC (rev 18604)
+++ projects/haf/trunk/freetype/debian/rules	2009-06-04 08:21:21 UTC (rev 18605)
@@ -29,6 +29,7 @@
 	dh_testdir
 	tar -xjf freetype-2.3.9.tar.bz2
 	patch -p0 < security-CVE-2009-0946.patch
+	patch -p0 < armel-asm-declaration.patch
 	cd freetype-2.3.9 && ./configure --prefix=/usr --sysconfdir=/etc
 	touch configure-stamp