From a8ec3f87da83446c828cf43d5e40574712364dec Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 22 Aug 2022 15:16:04 +0200 Subject: [PATCH 1/2] lapack: update from 3.5.0 to 3.10.0 - update --- lapack-3.5.0-1.bee | 235 --------------------------------------------- lapack.be0 | 45 +++++++++ 2 files changed, 45 insertions(+), 235 deletions(-) delete mode 100755 lapack-3.5.0-1.bee create mode 100755 lapack.be0 diff --git a/lapack-3.5.0-1.bee b/lapack-3.5.0-1.bee deleted file mode 100755 index d160ffd28..000000000 --- a/lapack-3.5.0-1.bee +++ /dev/null @@ -1,235 +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.netlib.org/lapack/lapack-${PKGVERSION}.tgz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -PATCHURL+=( - /src/mariux/download/lapack-3.5.0-0001-add-manpages.patch - /src/mariux/download/lapack-3.5.0-0002-make.inc-fixes.patch - /src/mariux/download/lapack-3.5.0-0003-lapacke-shared.patch - /src/mariux/download/lapack-3.5.0-0004-lapacke-disable-testing-functions.patch - /src/mariux/download/lapack-3.5.0-0005-lapacke-matgenobj.patch - /src/mariux/download/lapack-3.5.0-0006-lapacke-tmglib.patch - /src/mariux/download/lapack-3.5.0-0007-R-blas-fixes.patch - /src/mariux/download/lapack-3.5.0-0008-blas-Makefile-fixes.patch - /src/mariux/download/lapack-3.5.0-0009-lapack-Makefile-fixes.patch -) - -############################################################################### -## 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_BUILDTYPE=make - -############################################################################### -## 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_post() { - sed -i "s|@SHORTVER@|${PKGVERSION[1]}|g" BLAS/SRC/Makefile - sed -i "s|@SHORTVER@|${PKGVERSION[1]}|g" SRC/Makefile - sed -i "s|@SHORTVER@|${PKGVERSION[1]}|g" lapacke/Makefile - sed -i "s|@LONGVER@|${PKGVERSION}|g" BLAS/SRC/Makefile - sed -i "s|@LONGVER@|${PKGVERSION}|g" SRC/Makefile - sed -i "s|@LONGVER@|${PKGVERSION}|g" lapacke/Makefile - - cp -v INSTALL/make.inc.gfortran make.inc -} - -#mee_configure() { -# bee_configure -DCMAKE_Fortran_FLAGS=-fPIC -#} - -mee_build() { -# bee_build - export FC=gfortran - - start_cmd cd BLAS/SRC - - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O0" dcabs1.o - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2" CFLAGS="-O2" static - start_cmd cp -v libblas.a ${B}/libblas.a - - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O0 -fPIC" dcabs1.o - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fPIC" CFLAGS="-O2 -fPIC" shared - start_cmd cp -v libblas.so.${PKGVERSION} ${B}/libblas.so.${PKGVERSION} - - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O0 -fdefault-integer-8" dcabs1.o - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fdefault-integer-8" CFLAGS="-O2" static - start_cmd cp -v libblas.a ${B}/libblas64.a - - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd sed -i 's|-soname,libblas|-soname,libblas64|g' Makefile - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O0 -fPIC -fdefault-integer-8" dcabs1.o - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fPIC -fdefault-integer-8" CFLAGS="-O2 -fPIC" shared - start_cmd sed -i 's|-soname,libblas64|-soname,libblas|g' Makefile - start_cmd cp -v libblas.so.${PKGVERSION} ${B}/libblas64.so.${PKGVERSION} - start_cmd cd - - - start_cmd ln -s libblas.so.${PKGVERSION} libblas.so - start_cmd ln -s libblas64.so.${PKGVERSION} libblas64.so - - start_cmd cd INSTALL - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} NOOPT="-O0" OPTS="-O2" - start_cmd cd - - start_cmd cd SRC - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2" CFLAGS="-O2" static - start_cmd cp -v liblapack.a ${B}/liblapack.a - start_cmd cd - - - start_cmd cd INSTALL - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} NOOPT="-O0 -fPIC" OPTS="-O2 -fPIC" - start_cmd cd - - start_cmd cd SRC - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fPIC" CFLAGS="-O2 -fPIC" static - start_cmd cp -v liblapack.a ${B}/liblapack_pic.a - start_cmd cd - - - start_cmd cd INSTALL - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} NOOPT="-O0 -fdefault-integer-8" OPTS="-O2 -fdefault-integer-8" - start_cmd cd - - start_cmd cd SRC - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fdefault-integer-8" CFLAGS="-O2" static - start_cmd cp -v liblapack.a ${B}/liblapack64.a - start_cmd cd - - - start_cmd cd INSTALL - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} NOOPT="-O0 -fPIC -fdefault-integer-8" OPTS="-O2 -fPIC -fdefault-integer-8" - start_cmd cd - - start_cmd cd SRC - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fPIC -fdefault-integer-8" CFLAGS="-O2 -fPIC" static - start_cmd cp -v liblapack.a ${B}/liblapack64_pic.a - start_cmd cd - - - start_cmd cd INSTALL - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} NOOPT="-O0 -fPIC" OPTS="-O2 -fPIC" - start_cmd cd - - start_cmd cd SRC - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fPIC" CFLAGS="-O2 -fPIC" shared - start_cmd cp -v liblapack.so.${PKGVERSION} ${B}/liblapack.so.${PKGVERSION} - start_cmd cd - - - start_cmd cd INSTALL - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} NOOPT="-O0 -fPIC -fdefault-integer-8" OPTS="-O2 -fPIC -fdefault-integer-8" - start_cmd cd - - start_cmd cd SRC - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd sed -i 's|-soname,liblapack|-soname,liblapack64|g' Makefile - start_cmd make ${BEE_MAKEFLAGS} FFLAGS="-O2 -fPIC -fdefault-integer-8" CFLAGS="-O2 -fPIC -fdefault-integer-8" shared - start_cmd sed -i 's|-soname,liblapack64|-soname,liblapack|g' Makefile - start_cmd cp -v liblapack.so.${PKGVERSION} ${B}/liblapack64.so.${PKGVERSION} - start_cmd cd - - - start_cmd ln -s liblapack.so.${PKGVERSION} liblapack.so - start_cmd ln -s liblapack64.so.${PKGVERSION} liblapack64.so - - start_cmd make ${BEE_MAKEFLAGS} OPTS="-O2 -fPIC" tmglib - start_cmd cd lapacke - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} CFLAGS="-O2" lapacke - start_cmd make ${BEE_MAKEFLAGS} clean - start_cmd make ${BEE_MAKEFLAGS} CFLAGS="-O2 -fPIC" shlib - start_cmd cp liblapacke.so.${PKGVERSION} ${B}/liblapacke.so.${PKGVERSION} - start_cmd cd - -} - -mee_build_post() { - sed -e "s,@libdir@,${LIBDIR},g" \ - -e "s,@prefix@,${PREFIX},g" \ - -e "s,@LAPACK_VERSION@,${PKGVERSION},g" \ - lapack.pc.in \ - >lapack.pc - sed -e "s,@libdir@,${LIBDIR},g" \ - -e "s,@prefix@,${PREFIX},g" \ - -e "s,@LAPACK_VERSION@,${PKGVERSION},g" \ - BLAS/blas.pc.in \ - >blas.pc -} - -mee_install() { - start_cmd mkdir -vp ${D}${LIBDIR}/pkgconfig - start_cmd mkdir -vp ${D}${MANDIR}/man3 - start_cmd mkdir -vp ${D}${INCLUDEDIR}/lapacke - - for f in \ - liblapack{,64}.so.${PKGVERSION} \ - libblas{,64}.so.${PKGVERSION} \ - liblapacke.so.${PKGVERSION} \ - libblas{,64}.a \ - liblapack{,64}.a \ - liblapack{,64}_pic.a \ - liblapacke.a \ - ; do - start_cmd cp -vf $f ${D}${LIBDIR}/$f - done - - cp -vf man/man3/* ${D}${MANDIR}/man3 - cp -va lapacke/include/*.h ${D}${INCLUDEDIR}/lapacke - - for i in liblapack{,64}.so libblas{,64}.so liblapacke.so ; do - start_cmd ln -svf $i.${PKGVERSION} ${D}${LIBDIR}/$i - start_cmd ln -svf $i.${PKGVERSION} ${D}${LIBDIR}/$i.${PKGVERSION[1]} - start_cmd ln -svf $i.${PKGVERSION} ${D}${LIBDIR}/$i.${PKGVERSION[2]} - done - - cp -v lapack.pc blas.pc ${D}${LIBDIR}/pkgconfig/ - -} -## 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/ -## diff --git a/lapack.be0 b/lapack.be0 new file mode 100755 index 000000000..e37e1bede --- /dev/null +++ b/lapack.be0 @@ -0,0 +1,45 @@ +#!/usr/bin/env beesh + +# BEE_VERSION lapack-3.10.1-1 + +#SRCURL[0]="https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.10.1.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/722407217a080a0012ae3d6913fb8008/v3.10.1.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_configure() { + bee_configure \ + -DBUILD_SHARED_LIBS=ON \ + -DLAPACKE=ON \ + -DCBLAS=ON +} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} + +mee_install_post() { + echo "./contentdiff.pl /usr/share/bee/${PKGFULLNAME}-[0-9]*/CONTENT ${D}/" + echo "( cd ${D}; find . -ls )" + exit +} From 774f3fb5bf5791c1fe8f57876cfbae590845f278 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Aug 2022 13:31:02 +0200 Subject: [PATCH 2/2] cmirror: Update version from 1.2 to 1.3 The Dark Blue Bikeshed Release - Fix nonsense error message [1] - Fix other printf format errors and add check macro - Fix bug that directories, which were replaced by another file type (e.g. plain files), would not actually be deleted, but would be left lingering around as "DIR.deleteme". For regular mirrors, the directory would be deleted during the the next pass. - Fix bug, that directories, which were replaced by another file type (e.g. plain files), would be deleted even with --noop - Fix bug, that directories, which were replaced by another file type (e.g. plain files), would no be deleted because of a missing --delete [1]: https://github.molgen.mpg.de/mariux64/cmirror/issues/14 --- cmirror.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmirror.be0 b/cmirror.be0 index 26d2267c5..4b6ce18d8 100755 --- a/cmirror.be0 +++ b/cmirror.be0 @@ -1,11 +1,11 @@ #!/usr/bin/env beesh -# BEE_VERSION cmirror-1.2-0 +# BEE_VERSION cmirror-1.3-0 # more info: https://github.molgen.mpg.de/mariux64/cmirror #SRCURL[0]="https://github.molgen.mpg.de/mariux64/cmirror/archive/refs/tags/${PKGVERSION}.tar.gz cmirror-${PKGVERSION}.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/40d4261f477d56107845e07db880218f/cmirror-1.2.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/1e131eaf6d134ca6d5e27ed312bfc935/cmirror-1.3.tar.gz" # PATCHURL+=()