CGAL-build-library.patch

   1 --- CGAL-3.3/install_cgal.build-library.bak     2007-05-30 14:05:18.000000000 +0200
   2 +++ CGAL-3.3/install_cgal       2007-05-30 14:14:10.000000000 +0200
   3 @@ -937,7 +937,6 @@
   4             #### settings for sgi mipspro compiler on irix5
   5             CGAL_SHARED_LIB_CXXFLAGS=
   6             CGAL_SHARED_LIB_LDFLAGS="-lm"
   7 -           RUNTIME_LINKER_FLAG="-rpath "
   8             PRINT_STACKTRACE_PROGRAM="dbx"
   9             ;;
  10         *IRIX*6.*CC*7.3*)
  11 @@ -946,14 +945,12 @@
  12             ADDITIONAL_LDFLAGS="-LANG:std"
  13             CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
  14             CGAL_SHARED_LIB_CXXFLAGS=
  15 -           RUNTIME_LINKER_FLAG="-rpath "
  16             PRINT_STACKTRACE_PROGRAM="dbx"
  17             ;;
  18         *IRIX*6.*CC*)
  19             #### settings for sgi mipspro compiler on irix6
  20             CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
  21             CGAL_SHARED_LIB_CXXFLAGS=
  22 -           RUNTIME_LINKER_FLAG="-rpath "
  23             PRINT_STACKTRACE_PROGRAM="dbx"
  24             ;;
  25         *IRIX*g++*)
  26 @@ -961,7 +958,6 @@
  27             ADDITIONAL_CXXFLAGS="-Wall"
  28             LONG_NAME_PROBLEM_LDFLAGS="-U -s"
  29             CGAL_SHARED_LIB_LDFLAGS="-lm"
  30 -           RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
  31             CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  32             CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
  33             CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  34 @@ -973,7 +969,6 @@
  35             CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
  36             CGAL_SHARED_LIB_CXXFLAGS="-PIC"
  37             CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
  38 -           RUNTIME_LINKER_FLAG="-R "
  39             PRINT_STACKTRACE_PROGRAM="dbx"
  40             CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  41             CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
  42 @@ -986,7 +981,6 @@
  43             LONG_NAME_PROBLEM_CXXFLAGS="-g"
  44             LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s"
  45             CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
  46 -           RUNTIME_LINKER_FLAG="-R "
  47             CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  48             CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
  49             CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  50 @@ -995,7 +989,6 @@
  51             #### settings for g++ on alpha-linux (special FPU handling)
  52             #### LONG_NAME_PROBLEM is cured by disabling debugging
  53             ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d"
  54 -           RUNTIME_LINKER_FLAG='-Wl,-R'
  55             CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  56             CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
  57             CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  58 @@ -1003,7 +996,6 @@
  59         *Linux*g++*)
  60             #### settings for g++ on linux
  61             ADDITIONAL_CXXFLAGS="-Wall"
  62 -           RUNTIME_LINKER_FLAG='-Wl,-R'
  63             CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  64             CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
  65             CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  66 @@ -1013,12 +1005,10 @@
  67             # -mp is required for correct enough floating point operations
  68             # necessary for interval arithmetic.
  69             ADDITIONAL_CXXFLAGS="-mp"
  70 -           RUNTIME_LINKER_FLAG='-Wl,-R'
  71             PRINT_STACKTRACE_PROGRAM="idb"
  72             ;;
  73         *Linux*pgCC*|*Linux*pgcpp*)
  74             #### settings for Portland Group Compiler on linux
  75 -           RUNTIME_LINKER_FLAG='-Wl,-R'
  76             # PGCC has long name problems with "-g".
  77             DEBUG_OPT=""
  78             ;;
  79 @@ -1029,7 +1019,6 @@
  80             CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
  81             CGAL_SHARED_LIB_CXXFLAGS="-PIC"
  82             CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
  83 -           RUNTIME_LINKER_FLAG="-R "
  84             PRINT_STACKTRACE_PROGRAM="dbx"
  85             CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
  86             CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
  87 @@ -4335,7 +4319,7 @@
  88      _buildlog_marker="log for $1 $2 shown"
  89
  90      ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}"
  91 -    if ${MAKE} ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
  92 +    if ${MAKE} ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then
  93         log_print "Compilation of $1 $2 ${_libname} succeeded."
  94         log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
  95         eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}