Changeset 799


Ignore:
Timestamp:
Dec 4, 2007 4:06:00 PM (13 years ago)
Author:
andreasw
Message:

synchronized BuildTools?/stable/0.5 with trunk rev 798

Location:
stable/0.5
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable/0.5/coin.m4

    r533 r799  
    508508
    509509save_cxxflags="$CXXFLAGS"
    510 # For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
     510# For *-*-solaris*, promote Studio/Workshop compiler to front of list.
    511511case $build in
    512512  *-cygwin* | *-mingw*)
    … …  
    516516               comps="g++ cl"
    517517             fi ;;
    518   sparc-sun-solaris*)
     518  *-*-solaris*)
    519519             comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    520520  *-darwin*) comps="g++ c++ CC" ;;
    … …  
    636636        esac
    637637        ;;
    638       *-sun-*)
     638      *-*-solaris*)
    639639          coin_opt_cxxflags="-O4"
    640640          coin_dbg_cxxflags="-g"
    … …  
    779779      CXXLIBS="-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc"
    780780      ;;
    781     *-sun-*)
     781    *-*-solaris*)
    782782      CXXLIBS="-lCstd -lCrun"
    783783    esac
    … …  
    880880
    881881save_cflags="$CFLAGS"
    882 # For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
    883 # ToDo: If Studio/Workshop cc is not present, we may find /usr/ucb/cc, which
    884 # is likely to be a non-functional shell. But many installations will have
    885 # both cc and gcc, so promoting gcc isn't good either. How to test reliably?
     882
     883# For *-*-solaris*, promote Studio/Workshop cc compiler to front of list.
     884# Depending on the user's PATH, when Studio/Workshop cc is not present we may
     885# find /usr/ucb/cc, which is almost certainly not a good choice for the C
     886# compiler. In this case, put cc after gcc.
     887
    886888case $build in
    887889  *-cygwin* | *-mingw*)
    … …  
    891893               comps="gcc cl"
    892894             fi ;;
    893   sparc-sun-solaris*)
    894              comps="cc xlc gcc pgcc icc" ;;
     895  *-*-solaris*)
     896             AC_CHECK_PROG(sol_cc_compiler,cc,cc,[],[],/usr/ucb/cc)
     897             if test "$sol_cc_compiler" = "cc" ; then
     898               comps="cc xlc gcc pgcc icc"
     899             else
     900               comps="xlc gcc pgcc icc cc"
     901             fi
     902             ;;
    895903  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    896904  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
    … …  
    9921000        coin_dbg_cflags="-g"
    9931001        ;;
    994       *-sun-*)
     1002      *-*-solaris*)
    9951003        coin_opt_cflags="-xO4"
    9961004        coin_dbg_cflags="-g"
    … …  
    12081216        coin_dbg_fflags="-C -g"
    12091217        ;;
    1210       *-sun-*)
     1218      *-*-solaris*)
    12111219        coin_opt_fflags="-O4"
    12121220        coin_dbg_fflags="-g"
    … …  
    13811389# Auxilliary macro to make sure both COIN_PROG_F77 and COIN_FIND_F77 use
    13821390# the same search lists for compiler names.
    1383 # For sparc-sun-solaris, promote Studio/Workshop compilers to front of list.
     1391# For *-*-solaris*, promote Studio/Workshop compilers to front of list.
    13841392AC_DEFUN([AC_COIN_F77_COMPS],
    13851393[case $build in
    … …  
    13901398       coin_f77_comps="gfortran g77 ifort fl32 compile_f2c"
    13911399     fi ;;
    1392   sparc-sun-solaris*)
     1400  *-*-solaris*)
    13931401     coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
    13941402  *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
    … …  
    16591667AC_DEFUN([AC_COIN_DISABLE_STATIC],
    16601668[
    1661 # On Cygwin, building DLLs doesn't work
     1669# On Cygwin and AIX, building DLLs doesn't work
    16621670case $build in
    16631671  *-cygwin*)
    16641672    coin_disable_shared=yes
    16651673    platform=Cygwin
     1674  ;;
     1675  *-aix*)
     1676    coin_disable_shared=yes
     1677    platform=AIX
    16661678  ;;
    16671679  *-mingw*)
    … …  
    17751787
    17761788###########################################################################
     1789#                      COIN_PATCH_LIBTOOL_CYGWIN                          #
     1790###########################################################################
     1791
     1792# Patches to libtool for cygwin. Lots for cl, a few for GCC.
     1793# For cl:
     1794# - cygpath is not correctly quoted in fix_srcfile_path
     1795# - paths generated for .lib files is not run through cygpath -w
     1796
     1797
     1798AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
     1799[ case "$CXX" in
     1800    cl* | */cl* | CL* | */CL*)
     1801      AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
     1802      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     1803          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     1804          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     1805          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     1806          -e 's%lib /OUT:%lib -OUT:%' \
     1807          -e "s%cygpath -w%$CYGPATH_W%" \
     1808          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     1809          -e 's/$AR t/lib -nologo -list/' \
     1810          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     1811          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     1812          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
     1813      libtool > conftest.bla
     1814
     1815      mv conftest.bla libtool
     1816      chmod 755 libtool
     1817      ;;
     1818    *)
     1819      AC_MSG_NOTICE(Applying patches to libtool for GNU compiler)
     1820      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     1821          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     1822          -e 's|libext="lib"|libext="a"|' \
     1823      libtool > conftest.bla
     1824
     1825      mv conftest.bla libtool
     1826      chmod 755 libtool
     1827      ;;
     1828  esac ]) # COIN_PATCH_LIBTOOL_CYGWIN
     1829
     1830###########################################################################
     1831#                    COIN_PATCH_LIBTOOL_SOLARIS                           #
     1832###########################################################################
     1833# If we want to do a 64-bit build with GCC on Solaris, the system search
     1834# libraries need to point to 64-bit subdirectories. If they do not already do
     1835# that, fix them. This patch is evolving, as are GCC compilers.  GCC 4.2.1
     1836# reports the correct search list, given the correct call. GCC 4.1.1 does not.
     1837# `Correct call' means -m64 is specified. `Correct search list' seems to amount
     1838# to prepending the list of 64-bit subdirectories to the 32-bit directories.
     1839# Both SPARC and x86 have this issue, but a different hardware id string is
     1840# required depending on the underlying CPU. The macro executes isainfo to get
     1841# the string. This will fail, of course, if we're cross-compiling. The
     1842# alternative is to fail on a regular basis each time a new CPU identifier is
     1843# needed. This macro will also fail if the search list reported with
     1844# -print-search-dirs differs between the C, C++, and Fortran compilers; each
     1845# have their own setting in libtool.  If GCC reports the correct search list
     1846# given the -m64 flag, the best solution is to define CC='gcc -m64', and
     1847# similarly for CXX, F77, so that libtool will make the correct call.
     1848###########################################################################
     1849AC_DEFUN([AC_COIN_PATCH_LIBTOOL_SOLARIS],
     1850[ if test "$GCC" = yes && \
     1851     (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm64' >/dev/null 2>&1) ; then
     1852    hdwisa=`isainfo | sed -e 's/\(@<:@^ @:>@*\) .*$/\1/'`
     1853    if `$EGREP 'sys_lib_search_path_spec=' libtool | $EGREP -v $hdwisa >/dev/null 2>&1` ; then
     1854      AC_MSG_NOTICE([Applying patches to libtool for 64-bit GCC compilation])
     1855      fixlibtmp=`$CC -m64 -print-search-dirs | $EGREP '^libraries:'`
     1856      fixlibtmp=`echo $fixlibtmp | sed -e 's/libraries: =//' -e 's/:/ /g'`
     1857      if `echo "$fixlibtmp" | $EGREP -v $hdwisa  >/dev/null 2>&1` ; then
     1858        # AC_MSG_NOTICE(Compensating for broken gcc)
     1859        for lib in $fixlibtmp ; do
     1860          if test -d "${lib}${hdwisa}" ; then
     1861            syslibpath64="$syslibpath64 ${lib}${hdwisa}/"
     1862          fi
     1863        done
     1864        syslibpath64="${syslibpath64} ${fixlibtmp}"
     1865      else
     1866        syslibpath64="$fixlibtmp"
     1867      fi
     1868      sed -e 's|sys_lib_search_path_spec=".*"|sys_lib_search_path_spec="'"$syslibpath64"'"|' libtool > conftest.bla
     1869      mv conftest.bla libtool
     1870      chmod 755 libtool 
     1871    fi
     1872    # AC_MSG_NOTICE(Result is )
     1873    # $EGREP 'sys_lib_search_path_spec=' libtool
     1874  fi ]) # COIN_PATCH_LIBTOOL_SOLARIS
     1875
     1876###########################################################################
    17771877#                           COIN_PROG_LIBTOOL                             #
    17781878###########################################################################
    … …  
    18081908  AC_SUBST(ac_cxx_preproc_warn_flag)
    18091909
    1810 # Fix bugs in libtool script for Windows native compilation:
    1811 # - cygpath is not correctly quoted in fix_srcfile_path
    1812 # - paths generated for .lib files is not run through cygpath -w
    1813 
    1814 
    1815 # - lib includes subdirectory information; we want to replace
    1816 #
    1817 # old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
    1818 #
    1819 # by
    1820 #
    1821 # old_archive_cmds="echo \$oldlib | grep .libs >/dev/null; if test \$? = 0; then cd .libs; lib /OUT:\`echo \$oldlib\$oldobjs\$old_deplibs | sed -e s@\.libs/@@g\`; cd .. ; else lib /OUT:\$oldlib\$oldobjs\$old_deplibs ; fi"
    1822 #
    1823 #          -e 's%old_archive_cmds="lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs"%old_archive_cmds="echo \\\$oldlib \| grep .libs >/dev/null; if test \\\$? = 0; then cd .libs; lib /OUT:\\\`echo \\\$oldlib\\\$oldobjs\\\$old_deplibs \| sed -e s@\\.libs/@@g\\\`; cd .. ; else lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs; fi"%' \
    1824 
    1825 # The following was a hack for chaniing @BACKSLASH to \
    1826 #          -e 'sYcompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"'`Ycompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"' | \$Xsed -e '"'"'s%@BACKSLASH@%\\\\\\\\\\\\\\\\%g'"'"'`Y' \
    1827 
    1828   # Correct cygpath for minGW (ToDo!)
    18291910  AC_MSG_NOTICE([Build is "$build".])
    18301911  mydos2unix='| dos2unix'
    … …  
    18371918
    18381919  case $build in
     1920    # Here we need to check if -m32 is specified.  If so, we need to correct
     1921    # sys_lib_search_path_spec
    18391922    *x86_64-*)
    1840 # Here we need to check if -m32 is specified.  If so, we need to correct sys_lib_search_path_spec
    18411923      if test "$GCC" = yes && (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm32' >& /dev/null); then
    18421924        AC_MSG_NOTICE(Applying patches to libtool for 32bit compilation)
    … …  
    18461928      fi
    18471929      ;;
     1930
     1931    *-solaris*)
     1932      AC_COIN_PATCH_LIBTOOL_SOLARIS
     1933      ;;
     1934    # Cygwin. Ah, cygwin. Too big and ugly to inline; see the macro.
    18481935    *-cygwin* | *-mingw*)
    1849     case "$CXX" in
    1850       cl* | */cl* | CL* | */CL*)
    1851         AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
    1852         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1853             -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1854             -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    1855             -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    1856             -e 's%lib /OUT:%lib -OUT:%' \
    1857             -e "s%cygpath -w%$CYGPATH_W%" \
    1858             -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    1859             -e 's/$AR t/lib -nologo -list/' \
    1860             -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    1861             -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    1862             -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    1863         libtool > conftest.bla
    1864 
    1865         mv conftest.bla libtool
    1866         chmod 755 libtool
    1867         ;;
    1868       *)
    1869         AC_MSG_NOTICE(Applying patches to libtool for GNU compiler)
    1870         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1871             -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    1872             -e 's|libext="lib"|libext="a"|' \
    1873         libtool > conftest.bla
    1874 
    1875         mv conftest.bla libtool
    1876         chmod 755 libtool
    1877         ;;
    1878     esac
    1879     ;;
     1936      AC_COIN_PATCH_LIBTOOL_CYGWIN
     1937      ;;
    18801938    *-darwin*)
    18811939      AC_MSG_NOTICE(Applying patches to libtool for Darwin)
    … …  
    19351993    *-mingw32)
    19361994        RPATH_FLAGS=nothing ;;
    1937     *-sun-*)
     1995    *-*-solaris*)
    19381996        RPATH_FLAGS=
    19391997        for dir in $1; do
    … …  
    27612819                         SAVE_LIBS="$LIBS"])
    27622820      ;;
    2763     *-sun-*)
     2821
     2822# Ideally, we'd use -library=sunperf, but it's an imperfect world. Studio
     2823# cc doesn't recognise -library, it wants -xlic_lib. Studio 12 CC doesn't
     2824# recognise -xlic_lib. Libtool doesn't like -xlic_lib anyway. Sun claims
     2825# that CC and cc will understand -library in Studio 13. The main extra
     2826# function of -xlic_lib and -library is to arrange for the Fortran run-time
     2827# libraries to be linked for C++ and C. We can arrange that explicitly.
     2828    *-*-solaris*)
    27642829      SAVE_LIBS="$LIBS"
    2765       AC_MSG_CHECKING([whether -xlic_lib=sunperf has BLAS])
    2766       LIBS="-xlic_lib=sunperf $LIBS"
     2830      AC_MSG_CHECKING([for BLAS in libsunperf])
     2831      LIBS="-lsunperf $FLIBS $LIBS"
    27672832      AC_COIN_TRY_FLINK([daxpy],
    27682833                        [AC_MSG_RESULT([yes])
    2769                          use_blas='-xlic_lib=sunperf'
    2770                          ADDLIBS="-xlic_lib=sunperf $ADDLIBS"],
     2834                         use_blas='-lsunperf'
     2835                         ADDLIBS="-lsunperf $ADDLIBS"
     2836                         coin_need_flibs=yes],
    27712837                        [AC_MSG_RESULT([no])
    27722838                         LIBS="$SAVE_LIBS"])
    … …  
    28822948                           SAVE_LIBS="$LIBS"])
    28832949        ;;
    2884       *-sun-*)
    2885         SAVE_LIBS="$LIBS"
    2886         AC_MSG_CHECKING([whether -xlic_lib=sunperf has LAPACK])
    2887         LIBS="-xlic_lib=sunperf $LIBS"
    2888         AC_COIN_TRY_FLINK([dsyev],
    2889                           [AC_MSG_RESULT([yes])
    2890                            use_lapack='-xlic_lib=sunperf'
    2891                            ADDLIBS="-xlic_lib=sunperf $ADDLIBS"],
    2892                           [AC_MSG_RESULT([no])
    2893                            LIBS="$SAVE_LIBS"])
     2950
     2951# See comments in COIN_HAS_BLAS.
     2952      *-*-solaris*)
     2953      SAVE_LIBS="$LIBS"
     2954      AC_MSG_CHECKING([for LAPACK in libsunperf])
     2955      LIBS="-lsunperf $FLIBS $LIBS"
     2956      AC_COIN_TRY_FLINK([dsyev],
     2957                        [AC_MSG_RESULT([yes])
     2958                         use_blas='-lsunperf'
     2959                         ADDLIBS="-lsunperf $ADDLIBS"
     2960                         coin_need_flibs=yes],
     2961                        [AC_MSG_RESULT([no])
     2962                         LIBS="$SAVE_LIBS"])
    28942963        ;;
    28952964# On cygwin, do this check only if doscompile is disabled. The prebuilt library

  • stable/0.5/commit_new_release

    r451 r799  
    5959fi
    6060
    61 conf_ac_files=`find . -name 'configure.ac'`
     61conf_ac_files=`find . -name 'configure.ac' | grep -v -E 'ThirdParty/.*/.*/configure.ac'`
    6262
    6363echo ''

  • stable/0.5/prepare_new_release

    r586 r799  
    178178
    179179echo ''
    180 conf_ac_files=`find . -name 'configure.ac'`
     180conf_ac_files=`find . -name 'configure.ac' | grep -v -E 'ThirdParty/.*/.*/configure.ac'`
    181181echo "===> Creating backup (.bak) for configure.ac files..."
    182182for i in $conf_ac_files; do
Note: See TracChangeset for help on using the changeset viewer.