Changeset dddb357 in mainline

Timestamp:

2011-03-01T19:48:00Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

096c883

Parents:

d84ee58 (diff), 3f7efa79 (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 changes

File:

• tools/toolchain.sh (modified) (3 diffs)

tools/toolchain.sh

@@ -28 +28 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+GMP_MAIN=<<EOF
+#define GCC_GMP_VERSION_NUM(a, b, c) \
+        (((a) << 16L) | ((b) << 8) | (c))
+
+#define GCC_GMP_VERSION \
+        GCC_GMP_VERSION_NUM(__GNU_MP_VERSION, __GNU_MP_VERSION_MINOR, __GNU_MP_VERSION_PATCHLEVEL)
+
+#if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2)
+        choke me
+#endif
+EOF
+
+MPFR_MAIN=<<EOF
+#if MPFR_VERSION < MPFR_VERSION_NUM(2, 4, 2)
+choke me
+        #endif
+EOF
+
+MPC_MAIN=<<EOF
+#if MPC_VERSION < MPC_VERSION_NUM(0, 8, 1)
+        choke me
+#endif
+EOF
+
+#
+# Check if the library described in the argument
+# exists and has acceptable version.
+#
+check_dependency() {
+        DEPENDENCY="$1"
+        HEADER="$2"
+        BODY="$3"
+        
+        FNAME="/tmp/conftest-$$"
+        
+        echo "#include ${HEADER}" > "${FNAME}.c"
+        echo >> "${FNAME}.c"
+        echo "int main()" >> "${FNAME}.c"
+        echo "{" >> "${FNAME}.c"
+        echo "${BODY}" >> "${FNAME}.c"
+        echo "  return 0;" >> "${FNAME}.c"
+        echo "}" >> "${FNAME}.c"
+        
+        cc -c -o "${FNAME}.o" "${FNAME}.c" 2> "${FNAME}.log"
+        RC="$?"
+        
+        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
+        else
+                echo " ${DEPENDENCY} found"
+                rm -f "${FNAME}.log" "${FNAME}.o" "${FNAME}.c"
+        fi
+}
+
+check_dependecies() {
+        echo ">>> Basic dependency check"
+        check_dependency "GMP" "<gmp.h>" "${GMP_MAIN}"
+        check_dependency "MPFR" "<mpfr.h>" "${MPFR_MAIN}"
+        check_dependency "MPC" "<mpc.h>" "${MPC_MAIN}"
+        echo
+}
 
 check_error() {
@@ -122 +192 @@
         echo " - native C library with headers"
         echo
-        
-        show_countdown 10
 }
 
@@ -285 +353 @@
 
 show_dependencies
+check_dependecies
+show_countdown 10
 
 case "$1" in