From 499a69be5545de7b17aeddd919dfbc7bda527026 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 29 Aug 2014 16:31:22 +0200
Subject: [PATCH 1/2] libem.bash: set release to \'unstable\' on first time
 compilation

---
 lib/libem.bash | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/libem.bash b/lib/libem.bash
index b2e30ea..e2c178c 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -261,18 +261,20 @@ function _load_build_dependencies() {
 		tmp=${tmp/${MODULEPATH_ROOT}\/}
 		tmp=${tmp%%/*}
 		local _family=( ${tmp//./ } )
+		# set module release to 'deprecated' if a build dependency
+		# is deprecated
 		if [[ ${_family[1]} == deprecated ]]; then
-			MODULE_RELEASE=.deprecated
+			MODULE_RELEASE='.deprecated'
+		# set module release to 'unstable' if a build dependency is
+		# unstable and release not yet set
 		elif [[ ${_family[1]} == unstable ]] && [[ -z ${MODULE_RELEASE} ]]; then
-			MODULE_RELEASE=.unstable
+			MODULE_RELEASE='.unstable'
 		fi
 		echo "Loading module: ${m}"
 		module load "${m}"
 	done
 }
 
-
-
 function _write_runtime_dependencies() {
 	local -r fname="${PREFIX}/.dependencies"
 	local dep
@@ -301,6 +303,7 @@ function _write_build_dependencies() {
 	done
 }
 
+# setup general environment
 function _setup_env1() {
 	C_INCLUDE_PATH=''
 	CPLUS_INCLUDE_PATH=''
@@ -319,6 +322,7 @@ function _setup_env1() {
 
 }
 
+#setup module specific environment
 function _setup_env2() {
 	if [[ -z ${MODULE_FAMILY} ]]; then
 		die 1 "$P: family not set."
@@ -340,6 +344,8 @@ function _setup_env2() {
 	MODULE_BUILDDIR="${BUILD_TMPDIR}/build/$P-$V/$COMPILER/$COMPILER_VERSION"
 
 	# build module name
+	# :FIXME: the MODULE_PREFIX should be derived from MODULE_NAME
+	# :FIXME: this should be read from a configuration file
 	case ${MODULE_FAMILY} in
 	    Tools )
 		MODULE_RPREFIX="${P}/${V}"
@@ -381,8 +387,13 @@ function _setup_env2() {
 	# set PREFIX of module
 	PREFIX="${EM_PREFIX}/${MODULE_FAMILY}/${MODULE_RPREFIX}"
 
+	# set release to 'unstable' on first time compilation and release not yet set
+	[[ ! -d ${PREFIX} ]] && [[ -z ${MODULE_RELEASE} ]] && MODULE_RELEASE='.unstable'
+
+	# directory for README's, license files etc
 	DOCDIR="${PREFIX}/share/doc/$P"
 
+	# set tar-ball and flags for tar
 	TARBALL="${BUILD_DOWNLOADSDIR}/${P/_serial}-$V.tar"
 	if [[ -r $TARBALL.gz ]]; then
 		TARBALL=${TARBALL}.gz
@@ -394,6 +405,7 @@ function _setup_env2() {
 		error "tar-ball for $P/$V not found."
 		exit 43
 	fi
+
 }
 
 function _prep() {
@@ -483,10 +495,7 @@ function _check_compiler() {
 function em.make_all() {
 
 	_setup_env1
-
-	# build release - and thereby the PREFIX - depends on other modules
 	_load_build_dependencies
-	
 	_setup_env2
 
 	if [[ ! -d "${PREFIX}" ]] || [[ ${FORCE_REBUILD} ]]; then

From 41bbe3611ca9b01292d4c76e4599de36b044d7df Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 29 Aug 2014 17:02:19 +0200
Subject: [PATCH 2/2] gcc.build: pkgversion changed

---
 scripts/gcc.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gcc.build b/scripts/gcc.build
index a1bf78c..35de77f 100755
--- a/scripts/gcc.build
+++ b/scripts/gcc.build
@@ -11,7 +11,7 @@ function em.configure() {
 		--with-mpc="${MPC_PREFIX}" \
 		--enable-lto \
 		--disable-multilib \
-		--with-pkgversion="PSI Environment Module $COMPILER $COMPILER_VERSION" \
+		--with-pkgversion="PSI Environment Module" \
 		|| exit 1
 }