Merge pull request #1136 from mariux64/isolate-openmpi

Isolate openmpi

gnudatalanguage-gdl.be0

@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION gnudatalanguage-gdl-0.9.8-2
+# BEE_VERSION gnudatalanguage-gdl-0.9.8-3
 
 SRCURL[0]="https://github.com/gnudatalanguage/gdl/archive/v${PKGVERSION}.tar.gz"
 
@@ -22,10 +22,22 @@ SRCURL[0]="https://github.com/gnudatalanguage/gdl/archive/v${PKGVERSION}.tar.gz"
 #}
 
 mee_configure() {
-    bee_configure -DHDF=OFF \
-		  -DFFTW=OFF \
-		  -DPSLIB=OFF \
-		  -DCMAKE_CXX_FLAGS=-fpermissive
+    bee_configure \
+        -DOPENMP=OFF \
+        -DPSLIB=OFF \
+        -DCMAKE_COLOR_MAKEFILE=OFF \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
+        -DENABLE_DYNDRIVERS=OFF \
+        -DHDF=OFF \
+        -DPYTHON=OFF
+}
+
+# perhaps I wasn't clear about the libmpi topic ...
+mee_build_pre() {
+    # no, you don't want to know why 'g' is needed, believe me ...
+    sed -i -e '/fopenmp/ s/-fopenmp//' -e '/lmpi_cxx/ s/-lmpi_cxx//g' -e '/lmpi/ s/-lmpi//g' ${B}/src/CMakeFiles/gdl.dir/link.txt
+    sed -i -e '/fopenmp/ s/-fopenmp//' ${B}/src/CMakeFiles/gdl.dir/flags.make
+    sed -i -e '/fopenmp/ s/-fopenmp//' ${B}/src/antlr/CMakeFiles/antlr.dir/flags.make
 }
 
 #mee_build() {

openmpi-1.6.5-0.bee → openmpi.be0

@@ -1,13 +1,15 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION openmpi-4.0.1-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
 ###############################################################################
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://www.open-mpi.org/software/ompi/v${PKGVERSION[2]}/downloads/openmpi-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://download.open-mpi.org/release/open-mpi/v${PKGVERSION[2]}/openmpi-${PKGVERSION}.tar.gz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -16,14 +18,8 @@ SRCURL[0]="http://www.open-mpi.org/software/ompi/v${PKGVERSION[2]}/downloads/ope
 # PATCHURL+=()
 
 ###############################################################################
-## Add filename patterns to the EXCLUDE array of files that should not
-## be added to you package but may be present in the image directory.
-
-# EXCLUDE+=()
-
-###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
+## Uncomment the next statement, if the software may not be able to be built
+## outside the source directory and needs to be built inside the source
 ## directory.
 
 # build_in_sourcedir
@@ -36,7 +32,6 @@ SRCURL[0]="http://www.open-mpi.org/software/ompi/v${PKGVERSION[2]}/downloads/ope
 
 # sourcesubdir_append src
 
-BEE_BUILDTYPE=autotools
 
 ###############################################################################
 ## Change the default (auto-detected) steps to
@@ -53,7 +48,7 @@ BEE_BUILDTYPE=autotools
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {
@@ -72,7 +67,7 @@ BEE_BUILDTYPE=autotools
 ## The name of this bee-file should follow the following naming convention:
 ##     pkgname-pkgversion-pkgrevision.bee
 ##
-## You may remove all comments as long as SRCURL[0]="" is set.
+## You may remove all comments as long as SRCURL[0] is set.
 ##
 ## Everything in this file will be executed in a bash environment.
 ##

valgrind.be0

@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION valgrind-3.15.0-0
+# BEE_VERSION valgrind-3.15.0-1
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -54,9 +54,9 @@ build_in_sourcedir
 #    bee_patch "${@}"
 #}
 
-#mee_configure() {
-#    bee_configure
-#}
+mee_configure() {
+    bee_configure --with-mpicc=no
+}
 
 #mee_build() {
 #    bee_build