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

Conflicts:
	Compiler/openmpi/1.10/variants.Linux

Added gcc/6.2.0
This commit is contained in:
2016-09-07 11:26:45 +02:00
27 changed files with 204 additions and 153 deletions

View File

@@ -1 +1 @@
2.7.11 unstable openssl/1.0.2h Tcl/8.6.4 Tk/8.6.4
Python/2.7.11 unstable openssl/1.0.2h Tcl/8.6.4 Tk/8.6.4

View File

@@ -0,0 +1,20 @@
--- a/gcc/configure 2016-06-08 19:22:30.000000000 +0200
+++ b/gcc/configure 2016-06-08 19:23:41.000000000 +0200
@@ -24542,7 +24542,7 @@
else
gcc_cv_as_ix86_filds=no
if test x$gcc_cv_as != x; then
- $as_echo 'filds mem; fists mem' > conftest.s
+ $as_echo 'filds (%ebp); fists (%ebp)' > conftest.s
if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
@@ -24573,7 +24573,7 @@
else
gcc_cv_as_ix86_fildq=no
if test x$gcc_cv_as != x; then
- $as_echo 'fildq mem; fistpq mem' > conftest.s
+ $as_echo 'fildq (%ebp); fistpq (%ebp)' > conftest.s
if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5

View File

@@ -1,4 +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 unstable b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3

View File

@@ -1 +1,2 @@
gcc/6.1.0 unstable b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
gcc/6.2.0 unstable b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3

View File

@@ -3,6 +3,7 @@
pbuild::patch_sources_Darwin() {
if [[ "${V_MAJOR}" == "4" ]]; then
patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch"
patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/configure-as.patch"
fi
}
@@ -15,6 +16,7 @@ pbuild::configure() {
--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