From 6f176dcf843f9ea8e0439cc2fd94d2e9c37d9a76 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 17 Jun 2019 17:45:59 +0200 Subject: [PATCH 1/6] gnudatalanguage-gdl: increase build --- gnudatalanguage-gdl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnudatalanguage-gdl.be0 b/gnudatalanguage-gdl.be0 index 871f7d531..10653ac52 100755 --- a/gnudatalanguage-gdl.be0 +++ b/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" From 8a03950ae86d228178fbf6b7dde08f6b5131c901 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 17 Jun 2019 17:50:44 +0200 Subject: [PATCH 2/6] gnudatalanguage-gdl: build w/o mpi support cmake enforces -fopenmp and -lmpi, so patch away before building. --- gnudatalanguage-gdl.be0 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnudatalanguage-gdl.be0 b/gnudatalanguage-gdl.be0 index 10653ac52..bb90dd2cb 100755 --- a/gnudatalanguage-gdl.be0 +++ b/gnudatalanguage-gdl.be0 @@ -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() { From 61272694aefc19ca5fd3e1a2fae09defd2cbfe5d Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 17 Jun 2019 17:52:06 +0200 Subject: [PATCH 3/6] valgrind: increase build --- valgrind.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/valgrind.be0 b/valgrind.be0 index 5d3a615ab..825d71b09 100755 --- a/valgrind.be0 +++ b/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.) From ef3f9203fc200332a65ba4ba34dcdc95eb6d9517 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 17 Jun 2019 17:55:32 +0200 Subject: [PATCH 4/6] valgrind: disable mpi support This won't build /usr/lib/valgrind/libmpiwrap-amd64-linux.so any longer. --- valgrind.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/valgrind.be0 b/valgrind.be0 index 825d71b09..6fc266011 100755 --- a/valgrind.be0 +++ b/valgrind.be0 @@ -54,9 +54,9 @@ build_in_sourcedir # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure --with-mpicc=no +} #mee_build() { # bee_build From 6198f2af3d72514d40bddc8fd7faa9192ba313d5 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 17 Jun 2019 18:11:12 +0200 Subject: [PATCH 5/6] openmpi: remove old bee file --- openmpi-1.6.5-0.bee | 84 --------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100755 openmpi-1.6.5-0.bee diff --git a/openmpi-1.6.5-0.bee b/openmpi-1.6.5-0.bee deleted file mode 100755 index 68ab56016..000000000 --- a/openmpi-1.6.5-0.bee +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env beesh - -## 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" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -# 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 -## directory. - -# build_in_sourcedir - -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - -# sourcesubdir_append src - -BEE_BUILDTYPE=autotools - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## 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. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From 1a4396a28e9a28d81a70a4aa3806a5f1107132d6 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 17 Jun 2019 18:14:59 +0200 Subject: [PATCH 6/6] openmpi: reinit and nullify bee init https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.1.tar.gz --- openmpi.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 openmpi.be0 diff --git a/openmpi.be0 b/openmpi.be0 new file mode 100755 index 000000000..1b773f881 --- /dev/null +++ b/openmpi.be0 @@ -0,0 +1,79 @@ +#!/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]="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. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## 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 + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## 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. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +##