Changeset e160bfe8 in mainline for tools

Timestamp:

2017-10-23T18:51:34Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

Location:

tools

Files:

• autotool.py (modified) (2 diffs)
• toolchain.sh (modified) (9 diffs)

tools/autotool.py

@@ -42 +42 @@
 CONFIG = 'Makefile.config'
 MAKEFILE = 'Makefile.common'
-HEADER = 'common.h'
+HEADER = 'common.h.new'
 GUARD = 'AUTOTOOL_COMMON_H_'
 
@@ -850 +850 @@
                 check_app(["diff", "--version"], "Diff utility", "usually part of diffutils")
                 check_app(["make", "--version"], "Make utility", "preferably GNU Make")
-                check_app(["makedepend", "-f", "-"], "Makedepend utility", "usually part of imake or xutils")
                 check_app(["unzip"], "unzip utility", "usually part of zip/unzip utilities")
                 

tools/toolchain.sh

@@ -64 +64 @@
 GDB_VERSION="7.12.1"
 ## GDB_PATCHES="toolchain-gdb-7.6.1.patch"
+ISL_VERSION="0.18"
 
 BASEDIR="`pwd`"
@@ -70 +71 @@
 GCC="gcc-${GCC_VERSION}.tar.bz2"
 GDB="gdb-${GDB_VERSION}.tar.gz"
+ISL="isl-${ISL_VERSION}.tar.bz2"
 
 REAL_INSTALL=true
 USE_HELENOS_TARGET=false
+BUILD_ISL=false
 
 #
@@ -97 +100 @@
         
         if [ "$RC" -ne "0" ] ; then
-                echo " ${DEPENDENCY} not found, too old or compiler error."
-                echo " Please recheck manually the source file \"${FNAME}.c\"."
-                echo " The compilation of the toolchain is probably going to fail,"
-                echo " you have been warned."
-                echo
-                echo " ===== Compiler output ====="
-                cat "${FNAME}.log"
-                echo " ==========================="
-                echo
+                if [ "${DEPENDENCY}" == "isl" ]; then
+                        BUILD_ISL=true
+                        
+                        echo " isl not found. Will be downloaded and built with GCC."
+                else
+                        echo " ${DEPENDENCY} not found, too old or compiler error."
+                        echo " Please recheck manually the source file \"${FNAME}.c\"."
+                        echo " The compilation of the toolchain is probably going to fail,"
+                        echo " you have been warned."
+                        echo
+                        echo " ===== Compiler output ====="
+                        cat "${FNAME}.log"
+                        echo " ==========================="
+                        echo
+                fi
         else
                 echo " ${DEPENDENCY} found"
@@ -237 +246 @@
         if [ ! -f "${FILE}" ] ; then
                 change_title "Downloading ${FILE}"
-                wget -c "${SOURCE}${FILE}"
+                wget -c "${SOURCE}${FILE}" -O "${FILE}".part
                 check_error $? "Error downloading ${FILE}."
+                
+                mv "${FILE}".part "${FILE}"
         fi
         
@@ -350 +361 @@
         GCC_SOURCE="ftp://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/"
         GDB_SOURCE="ftp://ftp.gnu.org/gnu/gdb/"
+        ISL_SOURCE="http://isl.gforge.inria.fr/"
         
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "9e8340c96626b469a603c15c9d843727"
         download_fetch "${GCC_SOURCE}" "${GCC}" "6bf56a2bca9dac9dbbf8e8d1036964a8"
         download_fetch "${GDB_SOURCE}" "${GDB}" "06c8f40521ed65fe36ebc2be29b56942"
+        
+        if $BUILD_ISL ; then
+                download_fetch "${ISL_SOURCE}" "${ISL}" "11436d6b205e516635b666090b94ab32"
+        fi
 }
 
@@ -423 +439 @@
         BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
         GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
+        ISLDIR="${WORKDIR}/isl-${ISL_VERSION}"
         OBJDIR="${WORKDIR}/gcc-obj"
         GDBDIR="${WORKDIR}/gdb-${GDB_VERSION}"
@@ -436 +453 @@
         source_check "${BASEDIR}/${GCC}"
         source_check "${BASEDIR}/${GDB}"
+        if $BUILD_ISL ; then
+                source_check "${BASEDIR}/${ISL}"
+        fi
         
         echo ">>> Removing previous content"
@@ -451 +471 @@
         unpack_tarball "${BASEDIR}/${GCC}" "GCC"
         unpack_tarball "${BASEDIR}/${GDB}" "GDB"
+        if $BUILD_ISL ; then
+                unpack_tarball "${BASEDIR}/${ISL}" "isl"
+                mv "${ISLDIR}" "${GCCDIR}"/isl
+        fi
         
         echo ">>> Applying patches"
@@ -471 +495 @@
                 "--target=${TARGET}" \
                 "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                --disable-nls --disable-werror --enable-gold
+                --disable-nls --disable-werror --enable-gold \
+                --enable-deterministic-archives
         check_error $? "Error configuring binutils."