toolchain/gcc.patch

   1 --- old-configure       2010-07-11 15:10:39.470057633 +0200
   2 +++ configure   2010-07-11 15:13:36.892556492 +0200
   3 @@ -4492,7 +4492,12 @@
   4  echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6
   5  do_compare="$gcc_cv_prog_cmp_skip"
   6
   7 +lt_cv_objdir=.libs
   8 +objdir=$lt_cv_objdir
   9
  10 +cat >>confdefs.h <<_ACEOF
  11 +#define LT_OBJDIR "$lt_cv_objdir/"
  12 +_ACEOF
  13
  14  # Check for GMP and MPFR
  15  gmplibs="-lmpfr -lgmp"
  16 @@ -4542,7 +4547,7 @@
  17    gmplibs="-L$with_mpfr_lib $gmplibs"
  18  fi
  19  if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
  20 -  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs"
  21 +  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
  22    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
  23    # Do not test the mpfr version.  Assume that it is sufficient, since
  24    # it is in the source tree, and the library has not been built yet
  25 @@ -4594,9 +4599,9 @@
  26    gmplibs="-L$with_gmp_lib $gmplibs"
  27  fi
  28  if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
  29 -  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
  30 +  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
  31    gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
  32 -  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
  33 +  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
  34    # Do not test the gmp version.  Assume that it is sufficient, since
  35    # it is in the source tree, and the library has not been built yet
  36    # but it would be included on the link line in the version check below
  37 @@ -4871,7 +4876,7 @@
  38    LIBS="$ppllibs $LIBS"
  39  fi
  40  if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
  41 -  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
  42 +  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx '
  43    pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
  44    LIBS="$ppllibs $LIBS"
  45  fi
  46 @@ -4990,7 +4995,7 @@
  47    LIBS="$clooglibs $LIBS"
  48  fi
  49  if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then
  50 -  clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog '
  51 +  clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' -lcloog '
  52    clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
  53    LIBS="$clooglibs $LIBS"
  54  fi