Unverified Commit 39fba830 authored by Ward Poelmans's avatar Ward Poelmans
Browse files

Merge branch 'develop' into gnuplot

* develop: (62 commits)
  only set $EASYBUILD_DEPRECATED for Python 2.6 and up
  add patch to fix broken test in Go
  fixed versionsuffix
  renamed as @boegel suggested
  switched makeopts to buildopts
  switched to $CFLAGS as @boegel suggested
  new Velvet easyconfigs
  added download url. Fixed sanity check
  Chimera easyconfig
  add easyblock = 'ConfigureMake' in Szip easyconfig file
  fix CLHEP by adding -gcc to $CXXFLAGS
  explicitely specify ConfigureMake easyblock, automagic fallback is deprecated
  enable triggering errors on use of deprecated functionality by defining $EASYBUILD_DEPRECATED prior to initialising the EasyBuild configuration
  stop using deprecated 'makeopts', 'premakeopts' and 'shared_lib_ext'
  add easyblock = 'ConfigureMake' to popt easyconfig where it's missing
  add easyblock = 'ConfigureMake' to easyconfigs where it's missing (bis)
  fix screwup in GLib easyconfig filename
  improve error message on automagic fallback to ConfigureMake
  add easyconfig for HDF5 v1.8.7 with gmpolf/1.4.8
  add easyblock = 'ConfigureMake' to easyconfigs where it's missing
  ...

Conflicts:
	easybuild/easyconfigs/c/cairo/cairo-1.12.18-intel-2014b.eb
	easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2014b.eb
parents 94ac0d95 3bce13ff
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment