diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-09-10 10:49:53 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-09-10 10:49:53 +0000 |
| commit | 6b3a15d273a1277ccfd0de7121d5b02fa18a64fd (patch) | |
| tree | b6434d4d3c0dacec90c365863b52e971cb1f36c1 /dev-lang | |
| parent | Add informative message about how to play it. Bug #135066 (diff) | |
| download | gentoo-2-6b3a15d273a1277ccfd0de7121d5b02fa18a64fd.tar.gz gentoo-2-6b3a15d273a1277ccfd0de7121d5b02fa18a64fd.tar.bz2 gentoo-2-6b3a15d273a1277ccfd0de7121d5b02fa18a64fd.zip | |
Ensure PIC and non-PIC code is not mixed on x86.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch | 5 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 5e51d5416a1a..95bc66dc9b85 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.38 2006/09/09 06:28:04 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.39 2006/09/10 10:49:53 keri Exp $ + + 10 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch, + files/mercury-0.13.0_beta-bootstrap.patch: + Ensure PIC and non-PIC code is not mixed on x86. *mercury-0.13.0_beta20060907 (09 Sep 2006) diff --git a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch index 444b80d52294..f8922bb2e0a9 100644 --- a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch +++ b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch @@ -1,6 +1,6 @@ --- mercury-compiler-0.12.2.orig/configure 2006-01-25 17:24:01.000000000 +1300 +++ mercury-compiler-0.12.2/configure 2006-07-24 20:11:45.000000000 +1200 -@@ -8790,34 +8790,33 @@ +@@ -8790,34 +8790,34 @@ if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then if test "$BOOTSTRAP_MC" = ""; then @@ -26,7 +26,8 @@ + profiler deep_profiler \ + -name \*.c -o -name \*.c_date | \ + xargs rm > /dev/null 2>&1 -+ find -name \*.o -o -name \*.a -o -name \*.so | \ ++ find -name \*.o -o -name \*.pic_o -o \ ++ -name \*.a -o -name \*.so | \ + xargs rm > /dev/null 2>&1 + rm -f compiler/mercury_compile profiler/mercury_profile + fi diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch index 6a45260c78ff..8a1c89946d2e 100644 --- a/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch +++ b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch @@ -1,6 +1,6 @@ --- mercury-compiler-0.13.0-beta-2006-08-11.orig/configure 2006-08-11 22:37:07.000000000 +1200 +++ mercury-compiler-0.13.0-beta-2006-08-11/configure 2006-08-12 16:22:17.000000000 +1200 -@@ -8977,34 +8977,34 @@ +@@ -8977,34 +8977,35 @@ if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then if test "$BOOTSTRAP_MC" = ""; then @@ -25,7 +25,8 @@ + profiler deep_profiler \ + -name \*.c -o -name \*.c_date | \ + xargs rm > /dev/null 2>&1 -+ find -name \*.o -o -name \*.a -o -name \*.so | \ ++ find -name \*.o -o -name \*.pic_o -o \ ++ -name \*.a -o -name \*.so | \ + xargs rm > /dev/null 2>&1 + rm -f compiler/mercury_compile profiler/mercury_profile + fi |