Hi Maintainers, I removed my hack in favour of the upstream fix [1]. See attached diff for revision -2.2.
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531522#181 Cheers, -Steve
diff -u -rN openmpi-1.3.2/debian/changelog ../openmpi-1.3.2/debian/changelog --- openmpi-1.3.2/debian/changelog 2009-06-17 21:56:32.000000000 -0500 +++ ../openmpi-1.3.2/debian/changelog 2009-06-21 13:08:05.000000000 -0500 @@ -1,3 +1,22 @@ +openmpi (1.3.2-2.2) unstable; urgency=low + + * NMU + * debian/patches/disable-memory-allocator: Replace with improved patch + from upstream. + + -- Steve M. Robbins <[email protected]> Sun, 21 Jun 2009 13:08:05 -0500 + +openmpi (1.3.2-2.1) unstable; urgency=low + + * NMU + * debian/patches/disable-memory-allocator: New. Patch + opal/mca/memory/ptmalloc2/hooks.c to add check for environment + variable OMPI_MCA_disable_memory_allocator. If set, avoid setting up + malloc hooks and avoid stat() calls from the malloc init hook. + Closes: #531522. + + -- Steve M. Robbins <[email protected]> Wed, 17 Jun 2009 22:03:31 -0500 + openmpi (1.3.2-2) unstable; urgency=low * Upload to unstable. No changes compared to 1.3.2-1. diff -u -rN openmpi-1.3.2/debian/patches/disable-memory-allocator ../openmpi-1.3.2/debian/patches/disable-memory-allocator --- openmpi-1.3.2/debian/patches/disable-memory-allocator 1969-12-31 18:00:00.000000000 -0600 +++ ../openmpi-1.3.2/debian/patches/disable-memory-allocator 2009-06-21 13:08:49.000000000 -0500 @@ -0,0 +1,37 @@ +Patch to fix #531522. +This patch is the cumulation of upstream patches: + + https://svn.open-mpi.org/trac/ompi/changeset/21479 + https://svn.open-mpi.org/trac/ompi/changeset/21489 + +This change might make it into OMPI v1.3.3. +See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531522#181 + + +--- openmpi-1.3.2.orig/opal/mca/memory/ptmalloc2/hooks.c ++++ openmpi-1.3.2/opal/mca/memory/ptmalloc2/hooks.c +@@ -721,10 +721,24 @@ + (unfortunately, there's really no good way to do this other + than this abstraction violation :-( ) */ + struct stat st; ++ check_result_t r1, r2; + check_result_t lp = check("OMPI_MCA_mpi_leave_pinned"); + check_result_t lpp = check("OMPI_MCA_mpi_leave_pinned_pipeline"); + bool want_rcache = false, found_driver = false; + ++ /* See if we want to disable this component. This check is ++ necessary for some environments -- for example, Debian's ++ "fakeroot" build environment allocates memory during stat(), ++ causing Badness (see http://bugs.debian.org/531522). ++ $FAKEROOTKEY is set by Debian's "fakeroot" build environment; ++ check for that explicitly. */ ++ r1 = check("OMPI_MCA_memory_ptmalloc2_disable"); ++ r2 = check("FAKEROOTKEY"); ++ if ((RESULT_NOT_FOUND != r1 && RESULT_NO != r1) || ++ (RESULT_NOT_FOUND != r2 && RESULT_NO != r2)) { ++ return; ++ } ++ + /* Look for sentinel files (directories) to see if various network + drivers are loaded (yes, I know, further abstraction + violations...). diff -u -rN openmpi-1.3.2/debian/patches/series ../openmpi-1.3.2/debian/patches/series --- openmpi-1.3.2/debian/patches/series 2009-06-17 21:56:32.000000000 -0500 +++ ../openmpi-1.3.2/debian/patches/series 2009-06-17 21:57:37.000000000 -0500 @@ -1,6 +1,9 @@ # Fixes build issues on Alpha. alpha_build +# Fix 531522. +disable-memory-allocator + # Fixes build issues on Sparc. sparc_build
signature.asc
Description: Digital signature
