From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Mon, 22 Jun 2015 13:04:20 +0000 (+0200)
Subject: gcc: added linux-devel-suite support for compiling gcc (without system wide gmp,mpfr... 
X-Git-Tag: v0.5~10
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f1b0689fd446c0aaa76b9b323b4d2052df75446;p=candi.git

gcc: added linux-devel-suite support for compiling gcc (without system wide gmp,mpfr,mpc)
---

diff --git a/gcc/packages/gcc.package b/gcc/packages/gcc.package
index fc9bc1d..ac6bb78 100644
--- a/gcc/packages/gcc.package
+++ b/gcc/packages/gcc.package
@@ -9,6 +9,15 @@ if [ ${GCC} = "4.9.2" ]; then
     CHECKSUM=4df8ee253b7f3863ad0b86359cd39c43
 fi
 
+CONFOPTS="--disable-multilib"
+
+if [ "${LINUX_DEVEL_SUITE}" ]; then
+  CONFOPTS="${CONFOPTS} 
+    --with-gmp=${LINUX_DEVEL_SUITE}
+    --with-mpfr=${LINUX_DEVEL_SUITE}
+    --with-mpc=${LINUX_DEVEL_SUITE}"
+fi
+
 MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/gcc
 CONFIG_FILE=${MODULEFILE_PATH}/${VERSION}
 
diff --git a/project-gcc.cfg b/project-gcc.cfg
index 367f2af..c76481d 100644
--- a/project-gcc.cfg
+++ b/project-gcc.cfg
@@ -11,6 +11,9 @@ PROJECT=gcc
 #VERSION=4.9.1
 VERSION=4.9.2
 
+# Do you have the candi/linux-devel-suite installed?
+#LINUX_DEVEL_SUITE=~/apps/candi/linux-devel-suite
+
 # How many processes would you like to build using?
 PROCS=1
 
@@ -23,10 +26,9 @@ DOWNLOAD_PATH=${PREFIX_PATH}/src
 UNPACK_PATH=${PREFIX_PATH}/unpack
 
 # Where do you want the build files to go?
-BUILD_PATH=${PREFIX_PATH}/compiler/${PROJECT}/${VERSION}-build
+BUILD_PATH=${PREFIX_PATH}/compiler-${PROJECT}-${VERSION}-build
 
 # Where do you want the compiled software installed?
 INSTALL_PATH=${PREFIX_PATH}/compiler/${PROJECT}/${VERSION}
 
 GCC=${VERSION}
-