Update gcc/install.sh

gcc/install.sh

@@ -5,7 +5,7 @@ export LIB_NAME="gcc"
 export LIB_VERSION=6.4.0
 
 export LIB_FULLNAME=${LIB_NAME}-${LIB_VERSION}
-export LIB_VERSION_SHORT="${LIB_VERSION//.}"
+#export LIB_VERSION_SHORT="${LIB_VERSION//.}"
 export SUB_DIR=${LIB_NAME}/${LIB_VERSION}
 WORK_DIR=/data/software/sources/${SUB_DIR}
 SRC_DIR=${WORK_DIR}/${LIB_FULLNAME}
@@ -13,8 +13,9 @@ ARCHIVE=${SRC_DIR}.tar.gz
 URL="ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${LIB_VERSION}/gcc-${LIB_VERSION}.tar.gz"
 BUILD_DIR=${WORK_DIR}/${LIB_FULLNAME}-build
 export INSTALL_DIR=/data/software/install/${SUB_DIR}
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 MODULE_DIR=/data/software/modules/compilers/${LIB_NAME}
-MODULE_PATH=${MODULE_DIR}/${LIB_VERSION_SHORT}
+MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}
 
 gcc --version
 
@@ -32,15 +33,11 @@ if [[ ! -d $BUILD_DIR ]]; then
   cd $BUILD_DIR
   ${SRC_DIR}/configure -v --with-pkgversion='Ubuntu 6.4.0' \
   --with-bugurl=file:///usr/share/doc/gcc-6/README.Bugs \
-  --enable-languages=c,ada,c++,java,go,fortran,objc,obj-c++ \
-  --program-suffix=-6 \
-  --program-prefix=x86_64-linux-gnu- \
+  --enable-languages=c,c++,fortran \
   --enable-shared \
   --enable-linker-build-id \
-  --libexecdir=/usr/lib \
   --without-included-gettext \
   --enable-threads=posix \
-  --libdir=/usr/lib \
   --enable-nls \
   --with-sysroot=/ \
   --enable-clocale=gnu \
@@ -54,16 +51,9 @@ if [[ ! -d $BUILD_DIR ]]; then
   --enable-default-pie \
   --with-system-zlib \
   --disable-browser-plugin \
-  --enable-java-awt=gtk \
   --enable-gtk-cairo \
-  --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-6-amd64/jre \
-  --enable-java-home \
-  --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-6-amd64 \
-  --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-6-amd64 \
   --with-arch-directory=amd64 \
-  --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
   --with-target-system-zlib \
-  --enable-objc-gc=auto \
   --enable-multiarch \
   --disable-werror \
   --with-arch-32=i686 \
@@ -76,11 +66,24 @@ if [[ ! -d $BUILD_DIR ]]; then
   --host=x86_64-linux-gnu \
   --target=x86_64-linux-gnu \
   --prefix=${INSTALL_DIR}
+#  --libdir=/usr/lib \
+#  --libexecdir=/usr/lib \
+#  --program-suffix=-6 \
+#  --program-prefix=x86_64-linux-gnu- \
+#  --enable-languages=c,ada,c++,java,go,fortran,objc,obj-c++ \
+#  --enable-java-awt=gtk \
+#  --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-6-amd64/jre \
+#  --enable-java-home \
+#  --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-6-amd64 \
+#  --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-6-amd64 \
+#  --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
+#  --enable-objc-gc=auto \
 fi
 
 cd $BUILD_DIR
 make -j || exit 1
 make -j install || exit 1
 
+cd $SCRIPT_DIR
 make -p ${MODULE_DIR}
 envtpl < module.tmpl > $MODULE_PATH