Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks

Programming/Tk/build

@@ -9,6 +9,8 @@ pbuild::configure() {
 		;;
 	Darwin )
 		srcdir="${MODULE_SRCDIR}/macosx"
+		C_INCLUDE_PATH+=":/opt/local/include"
+		LIBRARY_PATH+=":/opt/local/lib"
 		;;
 	esac
 	"${srcdir}"/configure \

Programming/gcc/5/variants

@@ -1,5 +1,5 @@
 gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
 gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
 gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
+gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
 

Programming/gcc/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.bz2"
+
 pbuild::patch_sources_Darwin() {
 	if (( V_MAJOR == 4 && V_MINOR <= 8 )) || \
 	   (( V_MAJOR == 4 && V_MINOR == 9 && V_PATCHLVL < 4)); then
@@ -12,18 +14,44 @@ pbuild::patch_sources_Darwin() {
 }
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
-		--prefix="${PREFIX}" \
-		--enable-languages=c,c++,objc,obj-c++,lto,fortran \
-		--with-gmp="${GMP_PREFIX}" \
-		--with-mpfr="${MPFR_PREFIX}" \
-		--with-mpc="${MPC_PREFIX}" \
-		--enable-lto \
-		--disable-multilib \
-		--with-build-config=bootstrap-debug \
-		--with-pkgversion="PSI Environment Module" \
-		--with-build-config=bootstrap-debug \
-		|| exit 1
+	local -a conf_args=()
+	conf_args+=( "--enable-languages=c,c++,objc,obj-c++,lto,fortran" )
+	conf_args+=( "--with-gmp=${GMP_PREFIX}" )
+	conf_args+=( "--with-mpfr=${MPFR_PREFIX}" )
+	conf_args+=( "--with-mpc=${MPC_PREFIX}" )
+	conf_args+=( "--enable-lto" )
+	conf_args+=( "--disable-multilib" )
+	conf_args+=( "--with-build-config=bootstrap-debug" )
+	conf_args+=( "--with-pkgversion='PSI Environment Module'" )
+	conf_args+=( "--with-build-config=bootstrap-debug" )
+
+	case "${OS}" in
+	Darwin )
+		local -r prefix='/opt/local'
+		"${MODULE_SRCDIR}"/configure \
+			--prefix="${PREFIX}" \
+			"${conf_args[@]}" \
+			--with-as=${prefix}/bin/as \
+			--with-ld=${prefix}/bin/ld \
+			--with-ar=${prefix}/bin/ar \
+			AR_FOR_TARGET=${prefix}/bin/ar \
+			AS_FOR_TARGET=${prefix}/bin/as \
+			LD_FOR_TARGET=${prefix}/bin/ld \
+			NM_FOR_TARGET=${prefix}/bin/nm \
+			OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+			RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+			STRIP_FOR_TARGET=${prefix}/bin/strip \
+			OTOOL=${prefix}/bin/otool \
+			OTOOL64=${prefix}/bin/otool \
+			|| exit 1
+		;;
+	Linux )
+		"${MODULE_SRCDIR}"/configure \
+			--prefix="${PREFIX}" \
+			"${conf_args[@]}" \
+			|| exit 1
+		;;
+	esac
 }
 
 # use system gcc to compile