summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@gentoo.org>2005-12-15 19:21:33 +0000
committerMichael Hanselmann <hansmi@gentoo.org>2005-12-15 19:21:33 +0000
commit6b7c138787ef4538f1854bae487d79cd0a4fb04c (patch)
tree948dc7059712eec42484f44723272e0d389d2aa8 /www-client
parentAdded to x86 (diff)
downloadhistorical-6b7c138787ef4538f1854bae487d79cd0a4fb04c.tar.gz
historical-6b7c138787ef4538f1854bae487d79cd0a4fb04c.tar.bz2
historical-6b7c138787ef4538f1854bae487d79cd0a4fb04c.zip
Fix a compilation issue using the 32-bit userland with 64-bit kernel on PowerPC.
Package-Manager: portage-2.0.53
Diffstat (limited to 'www-client')
-rw-r--r--www-client/mozilla-firefox/ChangeLog7
-rw-r--r--www-client/mozilla-firefox/Manifest4
-rw-r--r--www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild12
3 files changed, 19 insertions, 4 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 0d9e7e5523a4..6869eb1669d0 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/mozilla-firefox
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.120 2005/12/15 18:53:46 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.121 2005/12/15 19:21:33 hansmi Exp $
+
+ 15 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
+ mozilla-firefox-1.5-r2.ebuild:
+ Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+ PowerPC.
15 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
mozilla-firefox-1.0.7-r4.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index b7105f6764c6..80cf7f470fc7 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,4 +1,4 @@
-MD5 03b26a9a508f766e2e6b87a533dc041c ChangeLog 38825
+MD5 d10acac6dfed772a875a0834f1c1b1a5 ChangeLog 38998
MD5 cc5756b8c7af5c88b248b86c73fc5c8d files/1.5/firefox-1.1-visibility.patch 930
MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446
MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839
@@ -50,5 +50,5 @@ MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564
MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734
MD5 43c4bd3d75cf48ccc123d5f88467096c mozilla-firefox-1.0.7-r4.ebuild 9845
MD5 a3626a3b65708e8afdd44d21c1125b2a mozilla-firefox-1.5-r1.ebuild 8931
-MD5 970bf2ab5547e0d8138fb7c6bbfb7778 mozilla-firefox-1.5-r2.ebuild 8973
+MD5 c537777d26d4cb4a72c2664c461ae0a8 mozilla-firefox-1.5-r2.ebuild 9374
MD5 af83c78f670aa82820729e6065fec316 mozilla-firefox-1.5.ebuild 8847
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild
index a8df71630222..ac8be0e2f3f6 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild,v 1.1 2005/12/09 15:28:58 anarchy Exp ${PV}_rc3-r2.ebuild,v 1.1 2005/11/26 04:20:32 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5-r2.ebuild,v 1.2 2005/12/15 19:21:33 hansmi Exp ${PV}_rc3-r2.ebuild,v 1.1 2005/11/26 04:20:32 anarchy Exp $
unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179
MOZ_FREETYPE2="no" # Need to disable for newer .. remove here and in mozconfig
@@ -107,6 +107,16 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${PV}/${P}-history.patch
epatch ${FILESDIR}/${PV}/${P}-mork.patch
+
+ # Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+ # PowerPC, because with that configuration, it detects a ppc64 system.
+ # -- hansmi, 2005-11-13
+ if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+ sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+ ${S}/configure
+ sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+ ${S}/security/coreconf/arch.mk
+ fi
}
src_compile() {