diff --git a/.gitattributes b/.gitattributes index 6e26035f892..3219a034ee4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -702,7 +702,6 @@ Installation/config/support/S41-ZLIBMS -text Installation/config/support/S45-APPLEVECLIB -text Installation/config/support/S46a-SUNPERFORMANCECC -text Installation/config/support/S46b-SUNPERFORMANCEGCC -text -Installation/config/support/S47-SGICOMPLIB -text Installation/config/support/S48a-MKL64 -text Installation/config/support/S48b-MKL32 -text Installation/config/support/S49a-MKLWIN64 -text @@ -740,8 +739,6 @@ Installation/config/support/S92b-TAUCSATLAS -text Installation/config/support/S93a-TAUCSFREEBSDLAPACK -text Installation/config/support/S93b-TAUCSFREEBSDATLAS -text Installation/config/support/S96-TAUCSDARWIN -text -Installation/config/support/S98-TAUCSIRIXCC32 -text -Installation/config/support/S99-TAUCSIRIXCC64 -text Installation/config/support/parse_files.awk -text Interpolation/doc_tex/Interpolation/nn_coords.eps -text svneol=unset#application/postscript Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#image/gif diff --git a/Installation/config/support/S47-SGICOMPLIB b/Installation/config/support/S47-SGICOMPLIB deleted file mode 100644 index bbc6009e60b..00000000000 --- a/Installation/config/support/S47-SGICOMPLIB +++ /dev/null @@ -1,18 +0,0 @@ -# BLAS (Basic Linear Algebra Subprograms). -# complib.sgimath provides BLAS and LAPACK on SGI. -# This configuration has *not* been tested. - -DESCRIPTION = Complib on IRIX -PROVIDES = BLAS LAPACK -CXXFLAGS = -LDFLAGS = -LIBS = complib.sgimath_mp c -REQUIRES = -INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER DOLLAR_DARWIN_COMPILER -STDINCLDIRS = -INCLTHING = -STDLIBDIRS = -LIBTHING = -COMPILETESTFLAGS = - -# EOF diff --git a/Installation/config/support/S98-TAUCSIRIXCC32 b/Installation/config/support/S98-TAUCSIRIXCC32 deleted file mode 100644 index 9a05cc21962..00000000000 --- a/Installation/config/support/S98-TAUCSIRIXCC32 +++ /dev/null @@ -1,18 +0,0 @@ -# TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) -# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. -# This configuration has *not* been tested. - -DESCRIPTION = TAUCS for IRIX 32 bits -PROVIDES = TAUCS -CXXFLAGS = -LDFLAGS = -LIBS = taucs metis32 -REQUIRES = BLAS LAPACK -INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER -STDINCLDIRS = -INCLTHING = -STDLIBDIRS = -LIBTHING = -COMPILETESTFLAGS = - -# EOF diff --git a/Installation/config/support/S99-TAUCSIRIXCC64 b/Installation/config/support/S99-TAUCSIRIXCC64 deleted file mode 100644 index df0632a3b0f..00000000000 --- a/Installation/config/support/S99-TAUCSIRIXCC64 +++ /dev/null @@ -1,18 +0,0 @@ -# TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) -# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. -# This configuration has *not* been tested. - -DESCRIPTION = TAUCS for IRIX 64 bits -PROVIDES = TAUCS -CXXFLAGS = -LDFLAGS = -LIBS = taucs metis64 -REQUIRES = BLAS LAPACK -INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER -STDINCLDIRS = -INCLTHING = -STDLIBDIRS = -LIBTHING = -COMPILETESTFLAGS = - -# EOF diff --git a/Installation/install_cgal b/Installation/install_cgal index f695943ecf4..b65c2dad4e1 100755 --- a/Installation/install_cgal +++ b/Installation/install_cgal @@ -933,39 +933,6 @@ set_compiler_flags() MATH_LIB= START_LD_OPT="-link " ;; - *IRIX*5.*CC*) - #### settings for sgi mipspro compiler on irix5 - CGAL_SHARED_LIB_CXXFLAGS= - CGAL_SHARED_LIB_LDFLAGS="-lm" - RUNTIME_LINKER_FLAG="-rpath " - PRINT_STACKTRACE_PROGRAM="dbx" - ;; - *IRIX*6.*CC*7.3*) - #### settings for sgi mipspro compiler V7.3 on irix6 - ADDITIONAL_CXXFLAGS="-LANG:std" - ADDITIONAL_LDFLAGS="-LANG:std" - CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''" - CGAL_SHARED_LIB_CXXFLAGS= - RUNTIME_LINKER_FLAG="-rpath " - PRINT_STACKTRACE_PROGRAM="dbx" - ;; - *IRIX*6.*CC*) - #### settings for sgi mipspro compiler on irix6 - CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''" - CGAL_SHARED_LIB_CXXFLAGS= - RUNTIME_LINKER_FLAG="-rpath " - PRINT_STACKTRACE_PROGRAM="dbx" - ;; - *IRIX*g++*) - #### settings for gcc on irix - ADDITIONAL_CXXFLAGS="-Wall" - LONG_NAME_PROBLEM_LDFLAGS="-U -s" - CGAL_SHARED_LIB_LDFLAGS="-lm" - RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker " - CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" - CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - ;; *SunOS*5.*CC*) #### settings for sunpro compiler on solaris SUNCC_COMPILER="y" @@ -979,7 +946,6 @@ set_compiler_flags() CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" CGAL_LIBS_OPTFLAGS="-O" - ;; *SunOS*5.*g++*) #### settings for gcc on solaris @@ -2431,27 +2397,7 @@ search_for_compilers() CUSTOM_OSTYPE_TAG='' _search_compiler gcc g++ '' case ${SYST} in - *IRIX64*) - if _search_compiler cc CC 'n'; then - _check_and_register_compiler \ - "`_add_flags \"${COMPILER}\" '-n32' ' (n32)' ' -n32'`" - _check_and_register_compiler \ - "`_add_flags \"${COMPILER}\" '-32' ' (o32)' ' -32'`" - if [ -n "${SUPPORT_MIPSPRO_64}" ]; then - _check_and_register_compiler \ - "`_add_flags \"${COMPILER}\" '-64' ' (64)' ' -64'`" - fi - fi - ;; - *IRIX*-6*) - if _search_compiler cc CC 'n'; then - _check_and_register_compiler \ - "`_add_flags \"${COMPILER}\" '-n32' ' (n32)' ' -n32'`" - _check_and_register_compiler \ - "`_add_flags \"${COMPILER}\" '-32' ' (o32)' ' -32'`" - fi - ;; - *IRIX*|*SunOS*) + *SunOS*) _search_compiler cc CC '' ;; *CYGWIN*) @@ -4129,14 +4075,7 @@ create_include_makefile() ${_printf} " \$*%s" "${extension}" >> ${FILE} done fi - case ${CGAL_OS_COMPILER} in - mips_IRIX*-6*_CC-*32-*) - ${_printf} " ii_files/\$*.ii*\n" >> ${FILE};; - *) - ${_printf} "\n" >> ${FILE};; - esac - ${_printf} "\n" >> ${FILE} - + ${_printf} "\n\n" >> ${FILE} ${_printf} "\n.cpp.clean:\n" >> ${FILE} @@ -4147,13 +4086,7 @@ create_include_makefile() ${_printf} " \$*%s" "${extension}" >> ${FILE} done fi - case ${CGAL_OS_COMPILER} in - mips_IRIX*-6*_CC-*32-*) - ${_printf} " ii_files/\$*.ii*\n" >> ${FILE};; - *) - ${_printf} "\n" >> ${FILE};; - esac - ${_printf} "\n" >> ${FILE} + ${_printf} "\n\n" >> ${FILE} #