Re: Brice Goglin 2007-01-10 <[EMAIL PROTECTED]> > The following patch fixes the FTBFS on mips and should on m68k too. But, > I don't have any m68k machine to test on. > > Note that I am actually not very familiar with fpu_control.h. But the > comments near the #define's seem to indicate that this is the correct > way to replace the generic _FPU_MASK_FOOs with mips and m68k specific > _FPU_MASK_BARs.
Hi,
here's the diff for the NMU I'll upload in a minute to delayed/7.
debdiff gerris_0.6.0-3.dsc /srv/pbuilder/result/gerris_0.6.0-3.1.dsc
src/init.c | 9 ++++++++-
debian/changelog | 12 ++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff -u gerris-0.6.0/src/init.c gerris-0.6.0/src/init.c
--- gerris-0.6.0/src/init.c
+++ gerris-0.6.0/src/init.c
@@ -23,7 +23,14 @@
# include <fpu_control.h>
# ifdef _FPU_IEEE
static fpu_control_t fpu_trap_exceptions =
- _FPU_IEEE & ~(_FPU_MASK_ZM /*| _FPU_MASK_IM | _FPU_MASK_OM*/);
+ _FPU_IEEE &
+# ifdef __mc68000__
+ ~(__FPU_MASK_DZ /*| _FPU_MASK_OPERR | _FPU_MASK_OVFL*/);
+# elif defined(__mips__)
+ ~(_FPU_MASK_Z /*| _FPU_MASK_V | _FPU_MASK_O*/);
+# else
+ ~(_FPU_MASK_ZM /*| _FPU_MASK_IM | _FPU_MASK_OM*/);
+# endif
# endif /* _FPU_IEEE */
#endif /* HAVE_FPU_CONTROL_H */
diff -u gerris-0.6.0/debian/changelog gerris-0.6.0/debian/changelog
--- gerris-0.6.0/debian/changelog
+++ gerris-0.6.0/debian/changelog
@@ -1,3 +1,15 @@
+gerris (0.6.0-3.1) unstable; urgency=low
+
+ [ Brice Goglin ]
+ * Non-maintainer upload.
+ * Add a wrapper for fpu_control.h's difference on mips and m68k,
+ closes: #350595.
+
+ [ Christoph Berg ]
+ * Rebuilding also fixes the libgts dependency, closes: #374023.
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Fri, 12 Jan 2007 00:26:10 +0100
+
gerris (0.6.0-3) unstable; urgency=low
* NMU
Christoph
--
[EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature
