Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
OS-2123 multilib: gcc can't install in parallel
OS-2124 multilib: gcc needs to know that /opt/local/lib isn't in the runpath
- Loading branch information
Keith M Wesolowski
committed
Apr 22, 2013
1 parent
72e119d
commit 884461b
Showing
6 changed files
with
127 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff -ur gcc-4.4.4/configure gcc-4.4.4-32strap/configure | ||
--- gcc-4.4.4/configure 2012-12-18 22:07:07.000000000 +0000 | ||
+++ gcc-4.4.4-32strap/configure 2013-04-22 18:05:25.747813505 +0000 | ||
@@ -4542,8 +4542,8 @@ | ||
gmplibs="-L$with_mpfr_lib $gmplibs" | ||
fi | ||
if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then | ||
- gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs" | ||
- gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | ||
+ gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/.libs -L$$r/$(HOST_SUBDIR)/mpfr/src/_libs '"$gmplibs" | ||
+ gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr/src '"$gmpinc" | ||
# Do not test the mpfr version. Assume that it is sufficient, since | ||
# it is in the source tree, and the library has not been built yet | ||
# but it would be included on the link line in the version check below | ||
diff -ur gcc-4.4.4/configure.ac gcc-4.4.4-32strap/configure.ac | ||
--- gcc-4.4.4/configure.ac 2012-12-18 22:07:07.000000000 +0000 | ||
+++ gcc-4.4.4-32strap/configure.ac 2013-04-22 18:05:05.314274252 +0000 | ||
@@ -1216,8 +1216,8 @@ | ||
gmplibs="-L$with_mpfr_lib $gmplibs" | ||
fi | ||
if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then | ||
- gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs" | ||
- gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | ||
+ gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/.libs -L$$r/$(HOST_SUBDIR)/mpfr/src/_libs '"$gmplibs" | ||
+ gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr/src '"$gmpinc" | ||
# Do not test the mpfr version. Assume that it is sufficient, since | ||
# it is in the source tree, and the library has not been built yet | ||
# but it would be included on the link line in the version check below |
Binary file not shown.
Binary file not shown.