diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-05-28 20:14:47 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-05-28 20:14:47 +0000 |
commit | edec45419def1b81bd663a2859684ef55ba56269 (patch) | |
tree | caa3c2d5f4e55b38e7740a39d80a21507679c586 /extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch | |
parent | 483f7de4ab6a706517279a24d2efc969f4a1996d (diff) |
Mon May 28 20:14:39 UTC 2012
Diffstat (limited to 'extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch')
-rw-r--r-- | extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch deleted file mode 100644 index dc9dcfeae..000000000 --- a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: If running under Debian fakeroot then its important - that this hook is disabled; a new stat check was introduced in - 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. -Author: James Page <james.page@ubuntu.com> -Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 - -Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c -=================================================================== ---- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 -+++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 -@@ -738,15 +738,6 @@ - check_result_t r1, r2, lp, lpp; - bool want_rcache = false, found_driver = false; - -- /* First, check if ummunotify is present on the system. If it is, -- then we don't need to do the following ptmalloc2 hacks. -- open/mmap on the device may fail during init, but if /dev/ummunotify -- exists, we assume that the user/administrator *wants* to use -- ummunotify. */ -- if (stat("/dev/ummunotify", &st) == 0) { -- return; -- } -- - /* Yes, checking for an MPI MCA parameter here is an abstraction - violation. Cope. Yes, even checking for *any* MCA parameter - here (without going through the MCA param API) is an -@@ -769,6 +760,15 @@ - return; - } - -+ /* Next, check if ummunotify is present on the system. If it is, -+ then we don't need to do the following ptmalloc2 hacks. -+ open/mmap on the device may fail during init, but if /dev/ummunotify -+ exists, we assume that the user/administrator *wants* to use -+ ummunotify. */ -+ if (stat("/dev/ummunotify", &st) == 0) { -+ return; -+ } -+ - /* Look for sentinel files (directories) to see if various network - drivers are loaded (yes, I know, further abstraction - violations...). - |