From 158e24fa3102d3bdc5dfa9576b38d2f782571849 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 5 Sep 2018 13:02:13 +0200 Subject: [PATCH 1/9] netcdf: beenullify.sh -n 4.6.1 netcdf-4.3.3.1-0.bee --- netcdf-4.3.3.1-0.bee => netcdf.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename netcdf-4.3.3.1-0.bee => netcdf.be0 (86%) diff --git a/netcdf-4.3.3.1-0.bee b/netcdf.be0 similarity index 86% rename from netcdf-4.3.3.1-0.bee rename to netcdf.be0 index b84f3b76f..3a8f09d25 100755 --- a/netcdf-4.3.3.1-0.bee +++ b/netcdf.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION netcdf-4.6.1-0 + SRCURL[0]="ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-${PKGVERSION}.tar.gz" PATCHURL[0]="" @@ -17,7 +19,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 357b27dc93f00b667923400304350c657e3fef57 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 5 Sep 2018 13:02:59 +0200 Subject: [PATCH 2/9] netcdf: cleanup --- netcdf.be0 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/netcdf.be0 b/netcdf.be0 index 3a8f09d25..f6333d1df 100755 --- a/netcdf.be0 +++ b/netcdf.be0 @@ -6,14 +6,6 @@ SRCURL[0]="ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-${PKGVERSION}.tar.gz" PATCHURL[0]="" -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - mee_patch() { bee_patch } From de071e7af77413d8a556ad0ae755640de1cb0a7d Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 5 Sep 2018 13:04:23 +0200 Subject: [PATCH 3/9] netcdf: Update URL --- netcdf.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netcdf.be0 b/netcdf.be0 index f6333d1df..b06c06790 100755 --- a/netcdf.be0 +++ b/netcdf.be0 @@ -2,7 +2,7 @@ # BEE_VERSION netcdf-4.6.1-0 -SRCURL[0]="ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-${PKGVERSION}.tar.gz" +SRCURL[0]="https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${PKGVERSION}.tar.gz" PATCHURL[0]="" From fc4dc9ddfaeb623aef41fb7a55d766b3bcbb11de Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 5 Sep 2018 13:37:48 +0200 Subject: [PATCH 4/9] netcdf: Configure for a verbose, static build --- netcdf.be0 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/netcdf.be0 b/netcdf.be0 index b06c06790..153dfe444 100755 --- a/netcdf.be0 +++ b/netcdf.be0 @@ -10,8 +10,24 @@ mee_patch() { bee_patch } +# +# NOTE: to achieve a similar build result with enclosed autotools, one needs only: +# +# CFLAGS='-fPIC -O2' ac_cv_search_H5DSis_scale=-lhdf5_hl ac_cv_search_H5Fflush='-lhdf5 -ldl' \ +# ./configure --prefix=/dev/shm/netcdf-4.6.1-test --enable-shared=no --disable-silent-rules +# +# The above is so beautiful that I've felt a strong urge to preserve it in this bee file :) +# + mee_configure() { - bee_configure + bee_configure \ + -DCMAKE_C_FLAGS=-fPIC \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DENABLE_TESTS=OFF + } mee_build() { From cdc4a5f256b46f981e279c34472a45d7315733b1 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 5 Sep 2018 15:25:44 +0200 Subject: [PATCH 5/9] gdal: beenullify.sh -n 2.3.1 gdal-1.11.2-2.bee --- gdal-1.11.2-2.bee => gdal.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename gdal-1.11.2-2.bee => gdal.be0 (98%) diff --git a/gdal-1.11.2-2.bee b/gdal.be0 similarity index 98% rename from gdal-1.11.2-2.bee rename to gdal.be0 index 969057d1b..7b88bcdf0 100755 --- a/gdal-1.11.2-2.bee +++ b/gdal.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION gdal-2.3.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.) @@ -52,7 +54,7 @@ build_in_sourcedir #} mee_configure() { - #bee_configure + #bee_configure # some other packages expect /usr/include/gdal - its a mess anyway, we dont want it in /usr/include ./configure --prefix=/usr --includedir=/usr/include/gdal } From 31973676c6e33d6013d27d969bfa49c4d52c1be6 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 5 Sep 2018 17:00:54 +0200 Subject: [PATCH 6/9] gdal: Install only the includes and lib GDAL - Geospatial Data Abstraction Library, the name is legion. Actually we don't really need it in a biologicial context, or? --- gdal.be0 | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/gdal.be0 b/gdal.be0 index 7b88bcdf0..793d0aa32 100755 --- a/gdal.be0 +++ b/gdal.be0 @@ -53,20 +53,35 @@ build_in_sourcedir # bee_patch "${@}" #} +export CXXFLAGS='-fPIC -O2' +export CFLAGS='-fPIC -O2' + mee_configure() { - #bee_configure # some other packages expect /usr/include/gdal - its a mess anyway, we dont want it in /usr/include - ./configure --prefix=/usr --includedir=/usr/include/gdal + bee_configure --includedir=/usr/include/gdal --enable-shared=no } #mee_build() { # bee_build #} -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' +# Install the whole package (incl. useless binaries, icons, bash completion, ...) in a +# temporary location: +mee_install() { + make install DESTDIR=${D}/cruft +} + +mee_install_post() { + mkdir -p ${D}/usr/bin + mv --verbose ${D}/cruft/usr/bin/gdal-config ${D}/usr/bin + mv --verbose ${D}/cruft/usr/include ${D}/usr + rmdir --verbose ${D}/cruft/usr/lib/gdalplugins + mv --verbose ${D}/cruft/usr/lib ${D}/usr + + # Remove cruft: + rm -rf ${D}/cruft +} + ############################################################################### ## From 872df47efea2eb2fb5113ef45b5a9b02a08e74ca Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 9 Sep 2018 20:10:54 +0200 Subject: [PATCH 7/9] gnudatalanguage-gdl: Rebuild Rebuild to link against static netcdf library. --- gnudatalanguage-gdl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnudatalanguage-gdl.be0 b/gnudatalanguage-gdl.be0 index a2b2187bd..871f7d531 100755 --- a/gnudatalanguage-gdl.be0 +++ b/gnudatalanguage-gdl.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gnudatalanguage-gdl-0.9.8-1 +# BEE_VERSION gnudatalanguage-gdl-0.9.8-2 SRCURL[0]="https://github.com/gnudatalanguage/gdl/archive/v${PKGVERSION}.tar.gz" From e1512529baedd8eb1318df7e2645f176dee18f9f Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 10 Sep 2018 14:20:46 +0200 Subject: [PATCH 8/9] libnetcdf-compat: Add version 1.0.0 mysql-workbench still depends on libnetcdf.so.7. I failed to rebuild or update mysql-workbench, so provide a compat package for now. --- netcdf-compat.be0 | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100755 netcdf-compat.be0 diff --git a/netcdf-compat.be0 b/netcdf-compat.be0 new file mode 100755 index 000000000..98b2b0670 --- /dev/null +++ b/netcdf-compat.be0 @@ -0,0 +1,88 @@ +#!/usr/bin/env beesh + +# BEE_VERSION netcdf-compat-1.0.0-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=() + +############################################################################### +## 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 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() { + cd ${D} + tar xpf /src/mariux/beeroot/packages/netcdf-4.3.3.1-0.x86_64.bee.tar.bz2 \ + /usr/lib64/libnetcdf.so.7 \ + /usr/lib64/libnetcdf.so.7.2.1 +} +## 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 2cfe1ab39400276ee60d99834e9bc3d4f6b76bdd Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 10 Sep 2018 14:40:15 +0200 Subject: [PATCH 9/9] gdal-compat: Add version 1.0.0 mysql-workbench still depends on libgdal.so.1. I failed to rebuild or update mysql-workbench, so provide a compat package for now. --- gdal-compat.be0 | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100755 gdal-compat.be0 diff --git a/gdal-compat.be0 b/gdal-compat.be0 new file mode 100755 index 000000000..b111e0ad7 --- /dev/null +++ b/gdal-compat.be0 @@ -0,0 +1,88 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gdal-compat-1.0.0-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=() + +############################################################################### +## 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 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() { + cd ${D} + tar xpf /src/mariux/beeroot/packages/gdal-1.11.2-2.x86_64.bee.tar.bz2 \ + /usr/lib/libgdal.so.1 \ + /usr/lib/libgdal.so.1.18.2 +} +## 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/ +##