Merge remote branch 'origin/HEAD'

Libraries/gmp/5/variants

@@ -0,0 +1 @@
+5.1.1	Linux,Darwin	stable	

Libraries/gmp/6/variants

@@ -0,0 +1,2 @@
+6.0.0	Linux,Darwin	stable	
+6.1.0	Linux,Darwin	unstable	

Libraries/mpc/1/variants

@@ -0,0 +1,2 @@
+1.0.2	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2
+1.0.3	Linux,Darwin	stable		gmp/6.1.0 mpfr/3.1.4

Libraries/mpc/build

@@ -14,6 +14,5 @@ declare -rx CC=gcc
 
 module use 'Libraries'
 pbuild::add_to_group 'Libraries'
-pbuild::set_build_dependencies 'gmp' 'mpfr'
 pbuild::make_all
 

Libraries/mpc/with_modules-1.0.2

@@ -1,2 +0,0 @@
-gmp/5.1.1
-mpfr/3.1.2

Libraries/mpc/with_modules-1.0.3

@@ -1,2 +0,0 @@
-gmp/6.0.0
-mpfr/3.1.3

Libraries/mpfr/3/variants

@@ -0,0 +1,3 @@
+3.1.2	Linux,Darwin	stable		gmp/5.1.1
+3.1.3	Linux,Darwin	stable		gmp/6.0.0
+3.1.4	Linux,Darwin	stable		gmp/6.1.0

Libraries/mpfr/with_modules-3.1.2

@@ -1 +0,0 @@
-gmp/5.1.1

Libraries/mpfr/with_modules-3.1.3

@@ -1 +0,0 @@
-gmp/6.0.0

Libraries/tiff/build

@@ -3,6 +3,9 @@
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
+		--with-pic=yes \
+		--disable-shared \
+		--disable-jpeg \
 		|| exit 1
 }
 

Libraries/tiff/modulefile

@@ -1,15 +1,13 @@
 #%Module1.0
 
-set whatis	"set of C functions that support the manipulation of TIFF image files."
-set url		"http://www.libtiff.org/"
-set license	"BSD-like, see: http://libtiff.org/misc.html"
-set maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-whatis		"set of C functions that support the manipulation of TIFF image files."
+module-url		"http://www.remotesensing.org/libtiff/"
+module-license		"BSD-like, see: http://libtiff.org/misc.html"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 
-set help	"
+module-help	"
 This software provides support for the Tag Image File Format (TIFF), a
 widely used format for storing image data. The latest version of the TIFF
 specification is available on-line in several different formats, as are a
 number of Technical Notes (TTN's).
 "
- 
-source		$env(PSI_LIBMODULES)