[med-svn] r2627 - in trunk/packages/sofa-framework/trunk/debian: . patches

[domibel-guest at alioth.debian.org]

Author: domibel-guest
Date: 2008-11-07 23:41:47 +0000 (Fri, 07 Nov 2008)
New Revision: 2627

Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
fixed build-indep error


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2008-11-07 20:44:30 UTC (rev 2626)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2008-11-07 23:41:47 UTC (rev 2627)
@@ -1,3 +1,10 @@
+sofa-framework (1.0~beta3-3) unstable; urgency=low
+
+  * fixed build-indep issue (Closes: #503555)
+  * fixed MIPS and ARM build error (sqrt/sqrtl)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Thu, 30 Oct 2008 19:23:49 +0100
+
 sofa-framework (1.0~beta3-2) unstable; urgency=low
 
   * fixed segfault on amd64

Modified: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch	2008-11-07 20:44:30 UTC (rev 2626)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch	2008-11-07 23:41:47 UTC (rev 2627)
@@ -5,9 +5,9 @@
 ## DP: fixes a build error on MIPS and ARM (sqrt/sqrtl)
 
 @DPATCH@
-diff -urNad sofa-framework-1.0.0~beta3~/framework/sofa/helper/rmath.h sofa-framework-1.0.0~beta3/framework/sofa/helper/rmath.h
---- sofa-framework-1.0.0~beta3~/framework/sofa/helper/rmath.h	2008-08-12 10:53:41.000000000 +0200
-+++ sofa-framework-1.0.0~beta3/framework/sofa/helper/rmath.h	2008-10-30 19:58:09.000000000 +0100
+diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/rmath.h sofa-framework-1.0~beta3/framework/sofa/helper/rmath.h
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/rmath.h	2008-08-12 08:53:41.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/rmath.h	2008-11-07 23:31:04.000000000 +0000
 @@ -132,8 +132,8 @@
  
  inline double rsqrt(const double& a)
@@ -19,3 +19,15 @@
  #else
      return (double)sqrtl((long double)a);
  #endif
+@@ -141,7 +141,11 @@
+ 
+ inline long double rsqrt(const long double& a)
+ {
++#if defined(__arm__) || defined(__mips__)
++    return (long double)sqrt((double)a);
++#else
+     return sqrtl(a);
++#endif
+ }
+ 
+ template<class T>

Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2008-11-07 20:44:30 UTC (rev 2626)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2008-11-07 23:41:47 UTC (rev 2627)
@@ -26,7 +26,7 @@
 	touch $@
 
 
-build: build-arch build-indep
+build: build-arch
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure