3 files changed, 12 insertions, 11 deletions
diff --git a/system/openmpi/doinst.sh b/system/openmpi/doinst.sh
index 11d0b65549..8692f863ca 100644
--- a/system/openmpi/doinst.sh
+++ b/system/openmpi/doinst.sh
@@ -12,5 +12,5 @@ config() {
 }
 
 config etc/openmpi-default-hostfile.new
-config etc/openmpi-totalview.tcl.new
 config etc/openmpi-mca-params.conf.new
+config etc/openmpi-totalview.tcl.new
diff --git a/system/openmpi/openmpi.SlackBuild b/system/openmpi/openmpi.SlackBuild
index 22c6ed87a3..fd1c8ed7fc 100644
--- a/system/openmpi/openmpi.SlackBuild
+++ b/system/openmpi/openmpi.SlackBuild
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmpi
-VERSION=${VERSION:-1.8.8}
+VERSION=${VERSION:-1.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,16 +35,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -87,12 +88,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
-mv $PKG/etc/openmpi-default-hostfile $PKG/etc/openmpi-default-hostfile.new
-mv $PKG/etc/openmpi-totalview.tcl $PKG/etc/openmpi-totalview.tcl.new
-mv $PKG/etc/openmpi-mca-params.conf $PKG/etc/openmpi-mca-params.conf.new
+find $PKG/etc -type f -exec mv {} {}.new \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS INSTALL LICENSE NEWS README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/openmpi/openmpi.info b/system/openmpi/openmpi.info
index e6f988bd4a..324f18c6de 100644
--- a/system/openmpi/openmpi.info
+++ b/system/openmpi/openmpi.info
@@ -1,8 +1,8 @@
 PRGNAM="openmpi"
-VERSION="1.8.8"
+VERSION="1.10.4"
 HOMEPAGE="http://www.open-mpi.org/"
-DOWNLOAD="http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2"
-MD5SUM="0dab8e602372da1425e9242ae37faf8c"
+DOWNLOAD="http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.4.tar.bz2"
+MD5SUM="9d2375835c5bc5c184ecdeb76c7c78ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""