Skip to content

Commit

Permalink
Merge pull request #908 from mariux64/update-netcdf-and-gdal
Browse files Browse the repository at this point in the history
Update netcdf and gdal
  • Loading branch information
thomas authored Sep 11, 2018
2 parents 917e963 + 2cfe1ab commit bad2ed3
Show file tree
Hide file tree
Showing 6 changed files with 247 additions and 44 deletions.
29 changes: 16 additions & 13 deletions gdal-1.11.2-2.bee → gdal-compat.be0
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/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[0]="http://download.osgeo.org/gdal/${PKGVERSION}/gdal-${PKGVERSION}.tar.gz"
SRCURL=()

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand All @@ -22,11 +24,11 @@ SRCURL[0]="http://download.osgeo.org/gdal/${PKGVERSION}/gdal-${PKGVERSION}.tar.g
# 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
# build_in_sourcedir

###############################################################################
## bee cannot detect buildtypes specified in subdirectories.
Expand All @@ -51,19 +53,20 @@ build_in_sourcedir
# bee_patch "${@}"
#}

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
}
#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
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}"'

###############################################################################
Expand All @@ -73,7 +76,7 @@ mee_configure() {
## 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.
##
Expand Down
102 changes: 102 additions & 0 deletions gdal.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
#!/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.)

###############################################################################
## 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://download.osgeo.org/gdal/${PKGVERSION}/gdal-${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+=()

###############################################################################
## 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


###############################################################################
## 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 "${@}"
#}

export CXXFLAGS='-fPIC -O2'
export CFLAGS='-fPIC -O2'

mee_configure() {
# some other packages expect /usr/include/gdal - its a mess anyway, we dont want it in /usr/include
bee_configure --includedir=/usr/include/gdal --enable-shared=no
}

#mee_build() {
# bee_build
#}

# 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
}


###############################################################################
##
## 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/
##
2 changes: 1 addition & 1 deletion gnudatalanguage-gdl.be0
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
30 changes: 0 additions & 30 deletions netcdf-4.3.3.1-0.bee

This file was deleted.

88 changes: 88 additions & 0 deletions netcdf-compat.be0
Original file line number Diff line number Diff line change
@@ -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/
##
40 changes: 40 additions & 0 deletions netcdf.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/env beesh

# BEE_VERSION netcdf-4.6.1-0

SRCURL[0]="https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${PKGVERSION}.tar.gz"

PATCHURL[0]=""

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 \
-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() {
bee_build
}

mee_install() {
bee_install
}

0 comments on commit bad2ed3

Please sign in to comment.