[Pkg-openmpi-commits] r33 - in /openmpi/trunk/debian: changelog patches/00list patches/50fix_kfreebsd_build.dpatch

[hauro-guest at users.alioth.debian.org]

Author: hauro-guest
Date: Wed Jul 25 13:46:17 2007
New Revision: 33

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=33
Log:
Added patch to fix build problems on kFreeBSD

Added:
    openmpi/trunk/debian/patches/50fix_kfreebsd_build.dpatch   (with props)
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/patches/00list

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=33&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Wed Jul 25 13:46:17 2007
@@ -1,3 +1,11 @@
+openmpi (1.2.3-2) unstable; urgency=low
+
+  [ Manuel Prinz ]
+  * Fixed: FTBFS on GNU/kFreeBSD (Closes: #433142). Thanks to Petr Salinger
+    for providing the patch!
+
+ -- Manuel Prinz <debian at pinguinkiste.de>  Wed, 25 Jul 2007 12:54:08 +0200
+
 openmpi (1.2.3-1) unstable; urgency=low
 
   [ Dirk Eddelbuettel ]

Modified: openmpi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/00list?rev=33&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/00list (original)
+++ openmpi/trunk/debian/patches/00list Wed Jul 25 13:46:17 2007
@@ -2,4 +2,5 @@
 20fix_manpage_link
 30fix_manpage
 31fix_manpages_lintian
+50fix_kfreebsd_build
 99autoconf

Added: openmpi/trunk/debian/patches/50fix_kfreebsd_build.dpatch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/50fix_kfreebsd_build.dpatch?rev=33&op=file
==============================================================================
--- openmpi/trunk/debian/patches/50fix_kfreebsd_build.dpatch (added)
+++ openmpi/trunk/debian/patches/50fix_kfreebsd_build.dpatch Wed Jul 25 13:46:17 2007
@@ -1,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50fix_kfreebsd_build.dpatch by Manuel Prinz <debian at pinguinkiste.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch provided by Petr Salinger <Petr.Salinger at seznam.cz>
+## DP: Fixes #433142: openmpi: FTBFS on GNU/kFreeBSD
+## DP: Included in Upstream SVN commit #15592, so this patch can possibly
+## DP: be deleted when packaging the next upstream version
+
+ at DPATCH@
+diff -urNad openmpi-1.2.3~/opal/mca/memory/ptmalloc2/opal_ptmalloc2_munmap.c openmpi-1.2.3/opal/mca/memory/ptmalloc2/opal_ptmalloc2_munmap.c
+--- openmpi-1.2.3~/opal/mca/memory/ptmalloc2/opal_ptmalloc2_munmap.c	2006-08-15 22:13:35.000000000 +0200
++++ openmpi-1.2.3/opal/mca/memory/ptmalloc2/opal_ptmalloc2_munmap.c	2007-07-25 12:47:29.000000000 +0200
+@@ -26,7 +26,8 @@
+ #elif defined(HAVE_SYSCALL)
+ #include <syscall.h>
+ #include <unistd.h>
+-#elif defined(HAVE_DLSYM)
++#endif
++#if defined(HAVE_DLSYM)
+ #ifndef __USE_GNU
+ #define __USE_GNU
+ #endif
+@@ -59,7 +60,7 @@
+ int
+ opal_mem_free_ptmalloc2_munmap(void *start, size_t length, int from_alloc)
+ {
+-#if !defined(HAVE___MUNMAP) && !defined(HAVE_SYSCALL) && defined(HAVE_DLSYM)
++#if !defined(HAVE___MUNMAP) && !(defined(HAVE_SYSCALL) && defined(__NR_munmap)) && defined(HAVE_DLSYM)
+     static int (*realmunmap)(void*, size_t);
+ #endif
+ 
+@@ -67,7 +68,7 @@
+ 
+ #if defined(HAVE___MUNMAP)
+     return __munmap(start, length);
+-#elif defined(HAVE_SYSCALL)
++#elif defined(HAVE_SYSCALL) && defined(__NR_munmap)
+     return syscall(__NR_munmap, start, length);
+ #elif defined(HAVE_DLSYM)
+     if (NULL == realmunmap) {
+diff -urNad openmpi-1.2.3~/opal/util/stacktrace.c openmpi-1.2.3/opal/util/stacktrace.c
+--- openmpi-1.2.3~/opal/util/stacktrace.c	2007-04-19 18:30:53.000000000 +0200
++++ openmpi-1.2.3/opal/util/stacktrace.c	2007-07-25 12:47:29.000000000 +0200
+@@ -145,8 +145,12 @@
+             case FPE_FLTDIV: si_code_str = "Floating point divide-by-zero"; break;
+             case FPE_FLTOVF: si_code_str = "Floating point overflow"; break;
+             case FPE_FLTUND: si_code_str = "Floating point underflow"; break;
++#ifdef FPE_FLTRES
+             case FPE_FLTRES: si_code_str = "Floating point inexact result"; break;
++#endif
++#ifdef FPE_FLTINV            
+             case FPE_FLTINV: si_code_str = "Invalid floating point operation"; break;
++#endif            
+ #ifdef FPE_FLTSUB
+             case FPE_FLTSUB: si_code_str = "Subscript out of range"; break;
+ #endif

Propchange: openmpi/trunk/debian/patches/50fix_kfreebsd_build.dpatch
------------------------------------------------------------------------------
    svn:executable = *